From 13e1c85c79cb3ee5f2a6470ab0413ea3f3a67c39 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 7 Sep 2023 09:45:44 +0800 Subject: [PATCH] =?UTF-8?q?1.mq=E6=96=B0=E5=A2=9E=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E7=BB=84=202.=E7=94=A8=E6=88=B7=E7=BB=84=E4=BB=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/common/pojo/constant/ServerInfo.java | 5 +++++ .../src/main/java/com/njcn/mq/message/AppFileMessage.java | 6 +++++- .../java/com/njcn/mq/template/AppFileMessageTemplate.java | 1 + .../main/java/com/njcn/redis/pojo/enums/AppRedisKey.java | 5 +++++ .../java/com/njcn/system/enums/SystemResponseEnum.java | 1 + .../com/njcn/user/service/impl/ComponentServiceImpl.java | 7 +++++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java index a7028fb38..869964497 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java @@ -38,8 +38,13 @@ public interface ServerInfo { String CS_HARMONIC_BOOT = "cs-harmonic-boot"; String CS_REPORT_BOOT = "cs-report-boot"; + + String ACCESS_BOOT = "access-boot"; + String CS_STAT_BOOT = "stat-boot"; + String CS_RT_BOOT = "rt-boot"; + String CS_ZL_EVENT_BOOT = "zl-event-boot"; diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java index 8b2337e50..c05bac26d 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java @@ -11,7 +11,7 @@ import lombok.Data; * @version 1.0.0 * @createTime 2023/9/5 16:38 */ - +@Data public class AppFileMessage extends BaseMessage { @ApiModelProperty("网络设备码") @@ -38,11 +38,15 @@ public class AppFileMessage extends BaseMessage { private AppFileMessage.FileInfo fileInfo; private String data; + + private String name; } @Data public static class FileInfo{ + private String name; + private Long fileTime; private Integer fileSize; diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java index d92042fc3..94d4c9ee2 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java @@ -26,4 +26,5 @@ public class AppFileMessageTemplate extends RocketMQEnhanceTemplate { appFileMessage.setSource(BusinessResource.APP_RESOURCE); return send(BusinessTopic.NJCN_APP_FILE_TOPIC, tag, appFileMessage); } + } diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java index b61bd9486..dad7a7073 100644 --- a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java +++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java @@ -46,4 +46,9 @@ public interface AppRedisKey { */ String RMQ_CONSUME_KEY="rocketMQConsumeKey:"; + /** + * rocketMQ消费文件key + */ + String RMQ_FILE_CONSUME_KEY="rocketMQFileConsumeKey:"; + } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java index 49a4d6ca9..48b09d410 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java @@ -24,6 +24,7 @@ public enum SystemResponseEnum { INTERFERENCE_EMPTY("A00356","查询字典干扰源类型数据为空"), BUSINESS_EMPTY("A00356","查询字典行业类型数据为空"), + SYSTEM_TYPE_EMPTY("A00356","查询字典系统类型数据为空"), DEV_TYPE_EMPTY("A00357","查询字典设备类型数据为空"), MANUFACTURER("A00358","查询字典终端厂家数据为空"), DEV_VARIETY("A00359","查询字典终端类型数据为空"), diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java index 917823ccf..55aa5fcab 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.SystemResponseEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.enums.UserResponseEnum; import com.njcn.user.mapper.ComponentMapper; @@ -103,6 +104,9 @@ public class ComponentServiceImpl extends ServiceImpl> map = list.stream().filter(m->!Objects.isNull(m.getSystemType())).collect(Collectors.groupingBy(ComponentVO::getSystemType)); map.forEach((k,v)->{ DictData dictData = dicDataFeignClient.getDicDataById(k).getData(); + if (Objects.isNull(dictData)){ + throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY); + } ComponentVO componentVO = new ComponentVO(); componentVO.setId(dictData.getId()); componentVO.setName(dictData.getName()); @@ -145,6 +149,9 @@ public class ComponentServiceImpl extends ServiceImpl> map = componentVOList.stream().collect(Collectors.groupingBy(ComponentVO::getSystemType)); map.forEach((k, v)->{ DictData dictData = dicDataFeignClient.getDicDataById(k).getData(); + if (Objects.isNull(dictData)){ + throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY); + } ComponentVO componentVO = new ComponentVO(); componentVO.setName(dictData.getName()); componentVO.setChildren(