From 77045a39774243aa8c02609894d6e421d1bdcab2 Mon Sep 17 00:00:00 2001 From: dongxiaodong <13970843+dxdwork@user.noreply.gitee.com> Date: Sun, 31 Mar 2024 15:01:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?3/28Dxd=E6=8F=90=E4=BA=A42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/PageResult.java | 34 ++++++++++++++ .../common/core/web/domain/BaseEntity.java | 1 + .../couplet/common/system/domain/SysDept.java | 5 +++ couplet-modules/couplet-msg/pom.xml | 20 +++++++++ .../src/test/java/com/couplet/msg/Msg.java | 44 +++++++++++++++++++ .../test/java/com/couplet/msg/ParsingMsg.java | 36 +++++++++++++++ .../controller/SysTroubleController.java | 42 ++++++++++++------ ...oubleCode.java => CoupletTroubleCode.java} | 9 ++-- ...bleGrade.java => CoupletTroubleGrade.java} | 2 +- ...oubleType.java => CoupletTroubleType.java} | 2 +- .../trouble/domain/resp/TroubleResp.java | 26 +++++++++++ .../trouble/mapper/SysTroubleMapper.java | 15 ++++--- .../trouble/service/SysTroubleService.java | 16 ++++--- .../service/impl/SysTroubleServiceImpl.java | 31 ++++++++++--- .../mapper/trouble/SysTroubleMapper.xml | 19 +++++--- couplet-modules/pom.xml | 1 + 16 files changed, 260 insertions(+), 43 deletions(-) create mode 100644 couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/PageResult.java create mode 100644 couplet-modules/couplet-msg/pom.xml create mode 100644 couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java create mode 100644 couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java rename couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/{coupletTroubleCode.java => CoupletTroubleCode.java} (86%) rename couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/{coupletTroubleGrade.java => CoupletTroubleGrade.java} (85%) rename couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/{coupletTroubleType.java => CoupletTroubleType.java} (86%) create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java diff --git a/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/PageResult.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/PageResult.java new file mode 100644 index 0000000..e96db7f --- /dev/null +++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/PageResult.java @@ -0,0 +1,34 @@ +package com.couplet.common.core.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author DongZl + * @description: 列表返回结果集 + */ +@Data +public class PageResult implements Serializable { + /** + * 总条数 + */ + private long total; + /** + * 结果集合 + */ + private List list; + public PageResult() { + } + public PageResult(long total, List list) { + this.total = total; + this.list = list; + } + public static PageResult toPageResult(long total, List list){ + return new PageResult(total , list); + } + public static Result> toResult(long total, List list){ + return Result.success(PageResult.toPageResult(total,list)); + } +} diff --git a/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java index 89f2da1..d3422d4 100644 --- a/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java +++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java @@ -58,6 +58,7 @@ public class BaseEntity implements Serializable { /** * 备注 */ + @TableField(exist = false) private String remark; /** diff --git a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java index 85f67b2..50b7ff0 100644 --- a/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java +++ b/couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java @@ -1,5 +1,8 @@ package com.couplet.common.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.couplet.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; @@ -82,11 +85,13 @@ public class SysDept extends BaseEntity { /** * 父部门名称 */ + @TableField(exist = false) private String parentName; /** * 子部门 */ + @TableField(exist = false) private List children = new ArrayList(); public Long getDeptId () { diff --git a/couplet-modules/couplet-msg/pom.xml b/couplet-modules/couplet-msg/pom.xml new file mode 100644 index 0000000..43d94b1 --- /dev/null +++ b/couplet-modules/couplet-msg/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-msg + + + 17 + 17 + UTF-8 + + + diff --git a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java new file mode 100644 index 0000000..7abfc7d --- /dev/null +++ b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java @@ -0,0 +1,44 @@ +package com.couplet.msg; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/30 14:40 + * @description + */ +public class Msg { + private static final List hexDataList = new ArrayList() {{ + add("56 49 4e 31 32 33 34 35 36 37 38 39 44 49 4a 45 34 31 37 31 31 37 36 34 31 30 34 35 30 36 31 31 36 2e 36 36 34 33 38 30 30 33 39 2e 35 33 31 39 39 30 30 37 32 2e 30 30 30 33 31 2e 33 37 36 30 30 30 30 30 32 32 30 30 30 30 32 32 30 30 30 38 35 32 30 30 30 30 30 30 44 30 30 38 30 39 2e 36 30 30 39 34 30 30 30 30 35 38 39 30 36 36 37 39 30 39 33 30 30 30 30 32 30 33 30 30 32 30 33 30 30 30 30 30 34 34 32 38 32 2e 35 35 30 30 30 30 31 34 30 30 30 30 38 30 37 30 30 30 30 37 34 34 30 30 30 33 30 30 30 34 30 30 30 39 35 30 30 30 30 35 38 30 30 30 30 35 34 30 30 30 30 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 24"); + }}; + + public static void main(String[] args) { + for (String hexData : hexDataList) { + int checksum = calculateChecksum(hexData); + System.out.println("Checksum: " + Integer.toHexString(checksum & 0xFF).toUpperCase()); + } + } + + private static int calculateChecksum(String hexData) { + // 将空格删除并将字符串转换为字符数组 + String[] hexArray = hexData.replaceAll("\\s", "").split(""); + + // 将十六进制字符转换为字节数组 + byte[] bytes = new byte[hexArray.length / 2]; + for (int i = 0; i < hexArray.length; i += 2) { + String hex = hexArray[i] + hexArray[i + 1]; + bytes[i / 2] = (byte) Integer.parseInt(hex, 16); + } + + // 计算校验和 + int sum = 0; + for (byte b : bytes) { + sum += b; + } + + // 取低位字节 + return sum & 0xFF; + } +} diff --git a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java new file mode 100644 index 0000000..c933c5c --- /dev/null +++ b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java @@ -0,0 +1,36 @@ +package com.couplet.msg; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/30 11:39 + * @description + */ +public class ParsingMsg { + private static final List msgList = new ArrayList<>(){{ + add("7E 56 49 4e 31 32 33 34 35 36 37 38 39 44 49 4a 45 34 31 37 31 31 37 36 34 31 30 34 35 30 36 31 31 36 2e 36 36 34 33 38 30 30 33 39 2e 35 33 31 39 39 30 30 37 32 2e 30 30 30 33 31 2e 33 37 36 30 30 30 30 30 32 32 30 30 30 30 32 32 30 30 30 38 35 32 30 30 30 30 30 30 44 30 30 38 30 39 2e 36 30 30 39 34 30 30 30 30 35 38 39 30 36 36 37 39 30 39 33 30 30 30 30 32 30 33 30 30 32 30 33 30 30 30 30 30 34 34 32 38 32 2e 35 35 30 30 30 30 31 34 30 30 30 30 38 30 37 30 30 30 30 37 34 34 30 30 30 33 30 30 30 34 30 30 30 39 35 30 30 30 30 35 38 30 30 30 30 35 34 30 30 30 30 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 24 7E"); + }}; + + public static void main(String[] args) { + for (String string : msgList) { + String substring = string.substring(2, string.length() - 2); + System.out.println(substring); + } + } + +// private static String decodeHexString(String hexString) { +// //将第一个和最后一个字符删除 +// hexString = hexString.substring(2, hexString.length() - 2); +// +// //将十六进制字符转换为字节数组 +//// byte[] bytes = new byte[hexArray.length / 2]; +//// for (int i = 0; i < hexArray.length; i +=2) { +//// String hex = hexArray[i] + hexArray[i + 1]; +//// bytes[i / 2] = (byte) Integer.parseInt(hex, 16); +//// } +// return new String(hexString); +// } +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java index 766a579..af53d0c 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java @@ -1,18 +1,19 @@ package com.couplet.trouble.controller; +import com.couplet.common.core.domain.PageResult; import com.couplet.common.core.domain.Result; import com.couplet.common.core.web.controller.BaseController; -import com.couplet.common.core.web.page.TableDataInfo; import com.couplet.common.log.annotation.Log; import com.couplet.common.log.enums.BusinessType; -import com.couplet.trouble.domain.coupletTroubleCode; -import com.couplet.trouble.domain.req.TroubleUpdReq; +import com.couplet.trouble.domain.CoupletTroubleCode; +import com.couplet.trouble.domain.CoupletTroubleGrade; +import com.couplet.trouble.domain.CoupletTroubleType; +import com.couplet.trouble.domain.resp.TroubleResp; import com.couplet.trouble.service.SysTroubleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import java.util.List; /** @@ -28,13 +29,28 @@ public class SysTroubleController extends BaseController { private SysTroubleService troubleService; /** - * 故障管理列表 + * 故障码管理列表 */ @GetMapping("/troubleList") - public Result> list(@RequestBody coupletTroubleCode trouble) { - startPage(); - List list = troubleService.selectTroubleList(trouble); - return getDataTable(list); + public Result> list(TroubleResp troubleReq) { + PageResult result = troubleService.selectTroubleList(troubleReq); + return Result.success(result); + } + + /** + * 故障类型信息 + */ + @GetMapping("/troubleTypeList") + public List listType() { + return troubleService.selectTroubleListByType(); + } + + /** + * 故障等级信息 + */ + @GetMapping("/troubleGradeList") + public List listGrade() { + return troubleService.selectTroubleListByGrade(); } /** @@ -42,16 +58,16 @@ public class SysTroubleController extends BaseController { */ @Log(title = "新增故障码数据", businessType = BusinessType.INSERT) @PostMapping("insertTrouble") - public Result insert(@Validated @RequestBody coupletTroubleCode troubleAddReq) { + public Result insert(@Validated @RequestBody CoupletTroubleCode troubleAddReq) { return toAjax(troubleService.save(troubleAddReq)); } /** - * 修改保存故障码数据 + * 修改故障码数据 */ @Log(title = "修改故障码数据",businessType = BusinessType.UPDATE) @PostMapping("updateTrouble") - public Result edit(@Validated @RequestBody coupletTroubleCode troubleUpdReq) { + public Result edit(@Validated @RequestBody CoupletTroubleCode troubleUpdReq) { return toAjax(troubleService.updateById(troubleUpdReq)); } @@ -60,7 +76,7 @@ public class SysTroubleController extends BaseController { */ @Log(title = "删除故障码",businessType = BusinessType.DELETE) @GetMapping("/remove/{troubleId}") - public Result remove(@PathVariable Long troubleId) { + public Result remove(@PathVariable Integer troubleId) { troubleService.removeById(troubleId); return success(); } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleCode.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleCode.java similarity index 86% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleCode.java rename to couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleCode.java index 9745629..22e5fc5 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleCode.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleCode.java @@ -3,7 +3,6 @@ package com.couplet.trouble.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.couplet.common.core.annotation.Excel; -import com.couplet.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; @@ -18,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -public class coupletTroubleCode { +public class CoupletTroubleCode { /** * 主键id */ @@ -53,10 +52,12 @@ public class coupletTroubleCode { /** * 故障类型Id */ - private Integer troubleTypeId; + @Excel(name = "故障类型Id") + private Integer typeId; /** * 故障等级Id */ - private Integer troubleGradeId; + @Excel(name = "故障等级Id") + private Integer gradeId; } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleGrade.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleGrade.java similarity index 85% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleGrade.java rename to couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleGrade.java index 0d9ecc3..a4eef19 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleGrade.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleGrade.java @@ -9,7 +9,7 @@ import lombok.Data; * @description */ @Data -public class coupletTroubleGrade { +public class CoupletTroubleGrade { private Integer gradeId; private String gradeName; } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleType.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleType.java similarity index 86% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleType.java rename to couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleType.java index 408bfcc..aedb004 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleType.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleType.java @@ -9,7 +9,7 @@ import lombok.Data; * @description */ @Data -public class coupletTroubleType { +public class CoupletTroubleType { private Integer typeId; private String typeName; } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java new file mode 100644 index 0000000..5394d62 --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java @@ -0,0 +1,26 @@ +package com.couplet.trouble.domain.resp; + +import com.couplet.trouble.domain.CoupletTroubleCode; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/30 19:22 + * @description + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class TroubleResp extends CoupletTroubleCode implements Serializable { + private Integer pageNum=1; + private Integer pageSize=5; + private String troubleCode; + private String troublePosition; +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java index fc06c16..e447574 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java @@ -1,9 +1,10 @@ package com.couplet.trouble.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.couplet.trouble.domain.coupletTroubleCode; -import com.couplet.trouble.domain.req.TroubleAddReq; -import com.couplet.trouble.domain.req.TroubleUpdReq; +import com.couplet.trouble.domain.CoupletTroubleCode; +import com.couplet.trouble.domain.CoupletTroubleGrade; +import com.couplet.trouble.domain.CoupletTroubleType; +import com.couplet.trouble.domain.resp.TroubleResp; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,8 +16,12 @@ import java.util.List; * @description */ @Mapper -public interface SysTroubleMapper extends BaseMapper { - List selectTroubleList(coupletTroubleCode trouble); +public interface SysTroubleMapper extends BaseMapper { + List selectTroubleList(TroubleResp troubleReq); + + List selectTroubleListByType(); + + List selectTroubleListByGrade(); // int addTrouble(TroubleAddReq troubleAddReq); diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java index 2a66cde..abf803f 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java @@ -1,9 +1,11 @@ package com.couplet.trouble.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.couplet.trouble.domain.coupletTroubleCode; -import com.couplet.trouble.domain.req.TroubleAddReq; -import com.couplet.trouble.domain.req.TroubleUpdReq; +import com.couplet.common.core.domain.PageResult; +import com.couplet.trouble.domain.CoupletTroubleCode; +import com.couplet.trouble.domain.CoupletTroubleGrade; +import com.couplet.trouble.domain.CoupletTroubleType; +import com.couplet.trouble.domain.resp.TroubleResp; import java.util.List; @@ -13,8 +15,12 @@ import java.util.List; * @date 2024/3/26 22:38 * @description */ -public interface SysTroubleService extends IService { - List selectTroubleList(coupletTroubleCode trouble); +public interface SysTroubleService extends IService { + PageResult selectTroubleList(TroubleResp troubleReq); + + List selectTroubleListByType(); + + List selectTroubleListByGrade(); // int addTrouble (TroubleAddReq troubleAddReq); diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java index 8855cc8..5fc5d79 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java @@ -1,11 +1,15 @@ package com.couplet.trouble.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.couplet.trouble.domain.coupletTroubleCode; -import com.couplet.trouble.domain.req.TroubleAddReq; -import com.couplet.trouble.domain.req.TroubleUpdReq; +import com.couplet.common.core.domain.PageResult; +import com.couplet.trouble.domain.CoupletTroubleCode; +import com.couplet.trouble.domain.CoupletTroubleGrade; +import com.couplet.trouble.domain.CoupletTroubleType; +import com.couplet.trouble.domain.resp.TroubleResp; import com.couplet.trouble.mapper.SysTroubleMapper; import com.couplet.trouble.service.SysTroubleService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,19 +22,32 @@ import java.util.List; * @description */ @Service -public class SysTroubleServiceImpl extends ServiceImpl implements SysTroubleService{ +public class SysTroubleServiceImpl extends ServiceImpl implements SysTroubleService{ @Autowired private SysTroubleMapper sysTroubleMapper; /** * 查询故障码列表 - * @param trouble + * @param troubleReq * @return */ @Override - public List selectTroubleList(coupletTroubleCode trouble) { - return sysTroubleMapper.selectTroubleList(trouble); + public PageResult selectTroubleList(TroubleResp troubleReq) { + PageHelper.startPage(troubleReq.getPageNum(), troubleReq.getPageSize()); + List troubleList = sysTroubleMapper.selectTroubleList(troubleReq); + PageInfo info = new PageInfo<>(troubleList); + return PageResult.toPageResult(info.getTotal(),troubleList); + } + + @Override + public List selectTroubleListByType() { + return sysTroubleMapper.selectTroubleListByType(); + } + + @Override + public List selectTroubleListByGrade() { + return sysTroubleMapper.selectTroubleListByGrade(); } /** diff --git a/couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml b/couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml index 24417e5..3f5189f 100644 --- a/couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml +++ b/couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml @@ -4,20 +4,20 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + - - + + select t.*,g.grade_name,y.type_name from couplet_trouble_code t - LEFT JOIN couplet_trouble_grade g on t.trouble_grade_id = g.grade_id - LEFT JOIN couplet_trouble_type y on t.trouble_type_id= y.type_id + LEFT JOIN couplet_trouble_grade g on t.grade_id = g.grade_id + LEFT JOIN couplet_trouble_type y on t.type_id= y.type_id @@ -56,7 +56,12 @@ AND trouble_position like concat('%', #{troublePosition}, '%') - order by trouble_position desc + + + diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 6594626..082ecd2 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -18,6 +18,7 @@ couplet-modules-vehicle couplet-modules-mqtt couplet-enterprisemanagement + couplet-msg couplet-modules From a20dc82049485a954afa6beb2bdd95a4509610b1 Mon Sep 17 00:00:00 2001 From: dongxiaodong <13970843+dxdwork@user.noreply.gitee.com> Date: Sun, 31 Mar 2024 22:28:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=8A=A5=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- couplet-modules/couplet-msg/pom.xml | 64 +++ .../java/com/couplet/msg/domain/MsgData.java | 382 ++++++++++++++++++ .../com/couplet/msg/domain/TroubleLog.java | 51 +++ .../src/test/java/com/couplet/msg/Main.java | 28 ++ .../src/test/java/com/couplet/msg/Msg.java | 44 -- .../test/java/com/couplet/msg/ParsingMsg.java | 59 ++- .../src/main/resources/bootstrap.yml | 2 + .../controller/SysTroubleController.java | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 14 files changed, 587 insertions(+), 67 deletions(-) create mode 100644 couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/MsgData.java create mode 100644 couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java create mode 100644 couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Main.java delete mode 100644 couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 3853815..e04e62a 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,5 +24,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 main: allow-bean-definition-overriding: true diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 091e68a..42c2152 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,6 +24,7 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 sentinel: # 取消控制台懒加载 eager: true diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index 8681657..be8cc08 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index b1f7d75..bb9907f 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index 147fbc9..2bfb6f5 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-msg/pom.xml b/couplet-modules/couplet-msg/pom.xml index 43d94b1..d826790 100644 --- a/couplet-modules/couplet-msg/pom.xml +++ b/couplet-modules/couplet-msg/pom.xml @@ -17,4 +17,68 @@ UTF-8 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + diff --git a/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/MsgData.java b/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/MsgData.java new file mode 100644 index 0000000..750b5f0 --- /dev/null +++ b/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/MsgData.java @@ -0,0 +1,382 @@ +package com.couplet.msg.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/31 16:01 + * @description + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MsgData { + /** + * VIN + */ + private String vin; + /** + * 行驶路线 + */ + private String drivingRoute; + + /** + * 经度 + */ + private String longitude; + + /** + * 维度 + */ + private String latitude; + + /** + * 速度 + */ + private String speed; + + /** + * 里程 + */ + private BigDecimal mileage; + + /** + * 总电压 + */ + private String voltage; + + /** + * 总电流 + */ + private String current; + + /** + * 绝缘电阻 + */ + private String resistance; + + /** + * 档位 + */ + private String gear = "P"; + + /** + * 加速踏板行程值 + */ + private String accelerationPedal; + + /** + * 制动踏板行程值 + */ + private String brakePedal; + + /** + * 燃料消耗率 + */ + private String fuelConsumptionRate; + + /** + * 电机控制器温度 + */ + private String motorControllerTemperature; + + /** + * 电机转速 + */ + private String motorSpeed; + + /** + * 电机转矩 + */ + private String motorTorque; + + /** + * 电机温度 + */ + private String motorTemperature; + + /** + * 电机电压 + */ + private String motorVoltage; + + /** + * 电机电流 + */ + private String motorCurrent; + + /** + * 动力电池剩余电量SOC + */ + private BigDecimal remainingBattery; + + /** + * 电池总容量 + */ + private BigDecimal batteryLevel; + + /** + * 当前状态允许的最大反馈功率 + */ + private String maximumFeedbackPower; + + /** + * 当前状态允许最大放电功率 + */ + private String maximumDischargePower; + + /** + * BMS自检计数器 + */ + private String selfCheckCounter; + + /** + * 动力电池充放电电流 + */ + private String totalBatteryCurrent; + + /** + * 动力电池负载端总电压V3 + */ + private String totalBatteryVoltage; + + /** + * 单次最大电压 + */ + private String singleBatteryMaxVoltage; + + /** + * 单体电池最低电压 + */ + private String singleBatteryMinVoltage; + + /** + * 单体电池最高温度 + */ + private String singleBatteryMaxTemperature; + + /** + * 单体电池最低温度 + */ + private String singleBatteryMinTemperature; + + /** + * 动力电池可用容量 + */ + private String availableBatteryCapacity; + + /** + * 车辆状态 + */ + private int vehicleStatus = 1; + + /** + * 充电状态 + */ + private int chargingStatus = 1; + + /** + * 运行状态 + */ + private int operatingStatus = 1; + + /** + * SOC + */ + private int socStatus = 1; + + /** + * 可充电储能装置工作状态 + */ + private int chargingEnergyStorageStatus = 1; + + /** + * 驱动电机状态 + */ + private int driveMotorStatus = 1; + + /** + * 定位是否有效 + */ + private int positionStatus = 1; + + /** + * EAS(汽车防盗系统)状态 + */ + private int easStatus = 1; + + /** + * PTC(电动加热器)状态 + */ + private int ptcStatus = 1; + + /** + * EPS(电动助力系统)状态 + */ + private int epsStatus = 1; + + /** + * ABS(防抱死)状态 + */ + private int absStatus = 1; + + /** + * MCU(电机/逆变器)状态 + */ + private int mcuStatus = 1; + + /** + * 动力电池加热状态 + */ + private int heatingStatus = 1; + + /** + * 动力电池当前状态 + */ + private int batteryStatus = 1; + + /** + * 动力电池保温状态 + */ + private int batteryInsulationStatus = 1; + + /** + * DCDC(电力交换系统)状态 + */ + private int dcdcStatus = 1; + + /** + * CHG(充电机)状态 + */ + private int chgStatus = 1; + + /** + * 车辆状态 报文 + */ + private String vehicleStatusMsg; + /** + * 智能硬件 报文 + */ + private String smartHardwareMsg; + /** + * 电池报文 + */ + private String batteryMsg; + + public String getMsg(){ + //第一位VIN + return vin + + // 当前时间戳 + System.currentTimeMillis() + + //第二位经度 longitude latitude + getValue(longitude, 11) + + //第三位维度 longitude latitude + getValue(latitude, 10) + + //车速 + getValue(speed, 6) + + //总里程 + getValue(mileage == null ? "" : mileage.toString(), 11) + + // 总电压 + getValue(voltage, 6) + + //总电流 + getValue(current, 5) + + //绝缘电阻 79 - 87 + getValue(resistance, 9) + + //档位 + (gear == null ? "D" : gear) + + // 加速踏板行程值 + getValue(accelerationPedal, 2) + + // 制动踏板行程值 + getValue(brakePedal, 2) + + // 燃料消耗率 + getValue(fuelConsumptionRate, 5) + + //电机控制器温度 + getValue(motorControllerTemperature, 6) + + //电机转速 + getValue(motorSpeed, 5) + + //点击转矩 + getValue(motorTorque, 4) + + //电机温度 + getValue(motorTemperature, 6) + + //电机电压 + getValue(motorVoltage, 5) + + //电机电流 + getValue(motorCurrent, 8) + + //动力电池剩余电量SOC + getValue(remainingBattery == null ? "" : remainingBattery.toString(), 6) + + //当前状态允许的最大反馈功率 + getValue(maximumFeedbackPower, 6) + + //当前状态允许最大放电功率 + getValue(maximumDischargePower, 6) + + //BMS自检计数器 + getValue(selfCheckCounter, 2) + + //动力电池充放电电流 + getValue(totalBatteryCurrent, 5) + + //动力电池负载端总电压V3 + getValue(totalBatteryVoltage, 6) + + //单次最大电压 + getValue(singleBatteryMaxVoltage, 4) + + //单体电池最低电压 + getValue(singleBatteryMinVoltage, 4) + + //单体电池最高温度 + getValue(singleBatteryMaxTemperature, 6) + + //单体电池最低温度 + getValue(singleBatteryMinTemperature, 6) + + //动力电池可用容量 + getValue(availableBatteryCapacity, 6) + + //车辆状态 + vehicleStatus + + //充电状态 + chargingStatus + + //运行状态 + operatingStatus + + //SOC + socStatus + + //可充电储能装置工作状态 + chargingEnergyStorageStatus + + //驱动电机状态 + driveMotorStatus + + //定位是否有效 + positionStatus + + //EAS + easStatus + + //PTC + ptcStatus + + //EPS + epsStatus + + //ABS + absStatus + + //MCU + mcuStatus + + //动力电池加热状态 + heatingStatus + + //动力电池当前状态 + batteryStatus + + //动力电池保温状态 + batteryInsulationStatus + + //DCDC + dcdcStatus + + //CHG + chgStatus; + } + + public String getValue(String val , int valLength){ + if(val == null){ + val = ""; + } + int length = val.length(); + if (length > valLength){ + return val.substring( 0 , valLength); + } + val = val + "0".repeat(valLength - length); + return val; + } + +} diff --git a/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java b/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java new file mode 100644 index 0000000..1821061 --- /dev/null +++ b/couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java @@ -0,0 +1,51 @@ +package com.couplet.msg.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/31 21:18 + * @description + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TroubleLog { + /** + * 故障记录Id + */ + private Integer troubleLogId; + + /** + * 故障码 + */ + private String troubleLogCode; + + /** + * 故障记录车辆VIN + */ + private String troubleLogVin; + + /** + * 开始预警时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date troubleLogStartTime; + + /** + * 结束预警时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date troubleLogEndTime; +} diff --git a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Main.java b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Main.java new file mode 100644 index 0000000..77a6a21 --- /dev/null +++ b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Main.java @@ -0,0 +1,28 @@ +package com.couplet.msg; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/31 16:57 + * @description + */ +public class Main { + public static void main(String[] args) { + String msgString = "VIN123456789DIJE41711764104506116.664380039.531990072.00031.3760000022000022000852000000D00809.600940000589066790930000203002030000044282.55000014000080700007440003000400095000058000054000011111111111111111"; + + //使用正则表达式匹配需要的部分 + String pattern = "(.{17})(.{10})(.{4})(.{2})(.{2})"; + Pattern compile = Pattern.compile(pattern); + Matcher matcher = compile.matcher(msgString); + + if (matcher.find()) { + for (int i = 1; i <= matcher.groupCount(); i++) { + System.out.println("Group "+ i + ":" + matcher.group(i)); + } + } + + } +} diff --git a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java deleted file mode 100644 index 7abfc7d..0000000 --- a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Msg.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.couplet.msg; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author DongXiaoDong - * @version 1.0 - * @date 2024/3/30 14:40 - * @description - */ -public class Msg { - private static final List hexDataList = new ArrayList() {{ - add("56 49 4e 31 32 33 34 35 36 37 38 39 44 49 4a 45 34 31 37 31 31 37 36 34 31 30 34 35 30 36 31 31 36 2e 36 36 34 33 38 30 30 33 39 2e 35 33 31 39 39 30 30 37 32 2e 30 30 30 33 31 2e 33 37 36 30 30 30 30 30 32 32 30 30 30 30 32 32 30 30 30 38 35 32 30 30 30 30 30 30 44 30 30 38 30 39 2e 36 30 30 39 34 30 30 30 30 35 38 39 30 36 36 37 39 30 39 33 30 30 30 30 32 30 33 30 30 32 30 33 30 30 30 30 30 34 34 32 38 32 2e 35 35 30 30 30 30 31 34 30 30 30 30 38 30 37 30 30 30 30 37 34 34 30 30 30 33 30 30 30 34 30 30 30 39 35 30 30 30 30 35 38 30 30 30 30 35 34 30 30 30 30 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 24"); - }}; - - public static void main(String[] args) { - for (String hexData : hexDataList) { - int checksum = calculateChecksum(hexData); - System.out.println("Checksum: " + Integer.toHexString(checksum & 0xFF).toUpperCase()); - } - } - - private static int calculateChecksum(String hexData) { - // 将空格删除并将字符串转换为字符数组 - String[] hexArray = hexData.replaceAll("\\s", "").split(""); - - // 将十六进制字符转换为字节数组 - byte[] bytes = new byte[hexArray.length / 2]; - for (int i = 0; i < hexArray.length; i += 2) { - String hex = hexArray[i] + hexArray[i + 1]; - bytes[i / 2] = (byte) Integer.parseInt(hex, 16); - } - - // 计算校验和 - int sum = 0; - for (byte b : bytes) { - sum += b; - } - - // 取低位字节 - return sum & 0xFF; - } -} diff --git a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java index c933c5c..527a27f 100644 --- a/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java +++ b/couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java @@ -2,6 +2,8 @@ package com.couplet.msg; import java.util.ArrayList; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author DongXiaoDong @@ -15,22 +17,53 @@ public class ParsingMsg { }}; public static void main(String[] args) { + // 去头去尾 for (String string : msgList) { String substring = string.substring(2, string.length() - 2); - System.out.println(substring); + System.out.println("去头去尾字符串："+ substring); + + String hexStringWithoutSpaces = substring.replaceAll("\\s+", ""); + String asciiString = hexToString(hexStringWithoutSpaces); + System.out.println("16进制解析后的数据："+asciiString); +// //截取前17位 +// String substring1 = asciiString.substring(0, 17); +// System.out.println("VIN："+substring1); +// String substring2 = asciiString.substring(17, 30); +// System.out.println("时间戳："+substring2); +// String substring3 = asciiString.substring(30, 40); +// System.out.println("经度：" +substring3); +// String substring4 = asciiString.substring(41, 50); +// System.out.println("纬度："+ substring4); +// String substring5 = asciiString.substring(51, 56); +// System.out.println("车速："+ substring5); +// String substring6 = asciiString.substring(57, 67); +// System.out.println("总里程："+ substring6); +// String substring7 = asciiString.substring(68, 73); +// System.out.println("总电压："+ substring7); + String pattern = "(.{17})(.{10})(.{9})(.{8})(.{2})"; + Pattern compile = Pattern.compile(pattern); + Matcher matcher = compile.matcher(asciiString); + if (matcher.find()) { + for (int i = 1; i < matcher.groupCount(); i++) { + System.out.println("Group "+ i + ":" + matcher.group(i)); + } + } } } -// private static String decodeHexString(String hexString) { -// //将第一个和最后一个字符删除 -// hexString = hexString.substring(2, hexString.length() - 2); -// -// //将十六进制字符转换为字节数组 -//// byte[] bytes = new byte[hexArray.length / 2]; -//// for (int i = 0; i < hexArray.length; i +=2) { -//// String hex = hexArray[i] + hexArray[i + 1]; -//// bytes[i / 2] = (byte) Integer.parseInt(hex, 16); -//// } -// return new String(hexString); -// } + + /** + * 将16进制字符串转换为ASCII字符串 + * @param hexString 16进制字符串 + * @return ASCII字符串 + */ + public static String hexToString(String hexString) { + StringBuilder asciiString = new StringBuilder(); + for (int i = 0; i < hexString.length(); i += 2) { + String hex = hexString.substring(i, i + 2); + int decimal = Integer.parseInt(hex, 16); + asciiString.append((char) decimal); + } + return asciiString.toString(); + } } diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index d9315bd..476c9aa 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,6 +24,7 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 main: allow-bean-definition-overriding: true logging: diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java index af53d0c..9db2dc2 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java @@ -31,8 +31,8 @@ public class SysTroubleController extends BaseController { /** * 故障码管理列表 */ - @GetMapping("/troubleList") - public Result> list(TroubleResp troubleReq) { + @PostMapping("/troubleList") + public Result> list(@RequestBody TroubleResp troubleReq) { PageResult result = troubleService.selectTroubleList(troubleReq); return Result.success(result); } diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index fe8cc0a..9d73f5a 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 # 配置文件格式 file-extension: yml # 共享配置