Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.mq新增消费组

Browse Source 
2.用户组件功能调整
This commit is contained in:
xuyang
2023-09-07 09:45:44 +08:00
parent a44659ce98
commit 13e1c85c79
6 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java
View File

@@ -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";

6
pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java
View File

@@ -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;

1
pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java
View File

@@ -26,4 +26,5 @@ public class AppFileMessageTemplate extends RocketMQEnhanceTemplate {
appFileMessage.setSource(BusinessResource.APP_RESOURCE);
return send(BusinessTopic.NJCN_APP_FILE_TOPIC, tag, appFileMessage);
}
}

5
pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
View File

@@ -46,4 +46,9 @@ public interface AppRedisKey {
*/
String RMQ_CONSUME_KEY="rocketMQConsumeKey:";
/**
* rocketMQ消费文件key
*/
String RMQ_FILE_CONSUME_KEY="rocketMQFileConsumeKey:";
}

1
pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java
View File

@@ -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","查询字典终端类型数据为空"),

7
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java
View File

@@ -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<ComponentMapper, Component
Map<String,List<ComponentVO>> 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<ComponentMapper, Component
Map<String,List<ComponentVO>> 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(