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

修改bug

Browse Source
This commit is contained in:
hzj
2025-08-26 19:54:03 +08:00
parent 9caf1724a6
commit 45797ad60b
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -3724,11 +3724,26 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
PqsTerminalPushLogDTO pqsTerminalPushLogDTO = new PqsTerminalPushLogDTO(); PqsTerminalPushLogDTO pqsTerminalPushLogDTO = new PqsTerminalPushLogDTO();
if(Objects.equals(temp.getTerminalType(),6)){ if(Objects.equals(temp.getTerminalType(),6)){
pqsTerminalPushLogDTO.setId(temp.getId()); pqsTerminalPushLogDTO.setId(temp.getId());
//如果不存在该设备id,说明设备也被删除，直接走下边的设备删除此处不做处理 String deviceId;
//如果不存在该设备id,说明监测点删除
if(!lineDeviceMap.containsKey(temp.getObjIndex())){ if(!lineDeviceMap.containsKey(temp.getObjIndex())){
String temLos = "%s监测点名称: %s";
List<String> strings = this.parseTemplateValues(temLos, temp.getTerminalDescribe());
String[] lineName = strings.get(1).split("->");
List<Line> devList = lineById.stream().filter(line -> Objects.equals(line.getName(), lineName[1])).collect(Collectors.toList());
if(CollectionUtils.isEmpty(devList)){
//如果不存在该设备说明设备也被删除，直接走下边删除设备逻辑;
return; return;
}else {
Line sub = lineById.stream().filter(line -> Objects.equals(line.getName(), lineName[0])).collect(Collectors.toList()).get(0);
Line tempDev = devList.stream().filter(dev->dev.getPid().equals(sub.getId())).collect(Collectors.toList()).get(0);
deviceId = tempDev.getId();
}
}else {
deviceId = lineDeviceMap.get(temp.getObjIndex());
} }
String deviceId = lineDeviceMap.get(temp.getObjIndex());
pqsTerminalPushLogDTO.setDevId(deviceId); pqsTerminalPushLogDTO.setDevId(deviceId);
pqsTerminalPushLogDTO.setDevName(lineMap.get(deviceId).getName()); pqsTerminalPushLogDTO.setDevName(lineMap.get(deviceId).getName());
@@ -3776,7 +3791,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
pqsTerminalPushLogDTO1.setNodeName(nodeMap.get(nodeId).getName()); pqsTerminalPushLogDTO1.setNodeName(nodeMap.get(nodeId).getName());
pqsTerminalPushLogDTO1.setProcessUpdateFlag(true); pqsTerminalPushLogDTO1.setProcessUpdateFlag(true);
pqsTerminalPushLogDTO1.setProcessNum(processId2); pqsTerminalPushLogDTO1.setProcessNum(processId2);
pqsTerminalPushLogDTOList.add(pqsTerminalPushLogDTO); pqsTerminalPushLogDTOList.add(pqsTerminalPushLogDTO1);
}else { }else {
pqsTerminalPushLogDTO.setId(temp.getId()); pqsTerminalPushLogDTO.setId(temp.getId());
@@ -4059,6 +4074,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
private void terminalLogsCat(List<Line> logsList,String operateType,List<PqsTerminalLogs> pqsTerminalLogsList,Map<String,Node> nodeMap){ private void terminalLogsCat(List<Line> logsList,String operateType,List<PqsTerminalLogs> pqsTerminalLogsList,Map<String,Node> nodeMap){
String op; String op;
Map<String,Line> subMap = new HashMap<>(); Map<String,Line> subMap = new HashMap<>();
Map<String,Line> devMap = new HashMap<>();
List<Line> temList = logsList.stream().filter(it-> it.getLevel().equals(LINE_LEVEL.getCode()) ||it.getLevel().equals(DEVICE_LEVEL.getCode())).collect(Collectors.toList()); List<Line> temList = logsList.stream().filter(it-> it.getLevel().equals(LINE_LEVEL.getCode()) ||it.getLevel().equals(DEVICE_LEVEL.getCode())).collect(Collectors.toList());
if(CollUtil.isEmpty(temList)){ if(CollUtil.isEmpty(temList)){
return; return;
@@ -4067,13 +4083,21 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
case Param.ADD: case Param.ADD:
op = Param.ADD_ZN; op = Param.ADD_ZN;
List<String> stationIds = temList.stream().map(it->it.getPids().split(StrUtil.COMMA)[SUB_LEVEL.getCode()]).distinct().collect(Collectors.toList()); List<String> stationIds = temList.stream().map(it->it.getPids().split(StrUtil.COMMA)[SUB_LEVEL.getCode()]).distinct().collect(Collectors.toList());
List<String> devIds = temList.stream().map(it->it.getPids().split(StrUtil.COMMA)[DEVICE_LEVEL.getCode()]).distinct().collect(Collectors.toList());
List<Line> subList = this.listByIds(stationIds); List<Line> subList = this.listByIds(stationIds);
List<Line> devList = this.listByIds(devIds);
subMap = subList.stream().collect(Collectors.toMap(Line::getId,Function.identity())); subMap = subList.stream().collect(Collectors.toMap(Line::getId,Function.identity()));
devMap = devList.stream().collect(Collectors.toMap(Line::getId,Function.identity()));
break; break;
case Param.DEL: case Param.DEL:
op = Param.DEL_ZN; op = Param.DEL_ZN;
List<Line> stationList = logsList.stream().filter(it->it.getLevel().equals(SUB_LEVEL.getCode())).collect(Collectors.toList()); List<Line> stationList = logsList.stream().filter(it->it.getLevel().equals(SUB_LEVEL.getCode())).collect(Collectors.toList());
List<String> tempDevIds = temList.stream().map(it->it.getPids().split(StrUtil.COMMA)[DEVICE_LEVEL.getCode()]).distinct().collect(Collectors.toList());
List<Line> tempDevList = this.listByIds(tempDevIds);
subMap = stationList.stream().collect(Collectors.toMap(Line::getId,Function.identity())); subMap = stationList.stream().collect(Collectors.toMap(Line::getId,Function.identity()));
devMap = tempDevList.stream().collect(Collectors.toMap(Line::getId,Function.identity()));
break; break;
default: default:
op=Param.UNKONOW; op=Param.UNKONOW;
@@ -4092,6 +4116,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
pqsTerminalLogs.setLogsType(devDataDic.getId()); pqsTerminalLogs.setLogsType(devDataDic.getId());
} }
String subName; String subName;
String devName;
String levelOperate; String levelOperate;
String nodeName = ""; String nodeName = "";
if(line.getLevel().equals(LINE_LEVEL.getCode())){ if(line.getLevel().equals(LINE_LEVEL.getCode())){
@@ -4104,8 +4129,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
subName = subMap.get(line.getPids().split(StrUtil.COMMA)[SUB_LEVEL.getCode()]).getName(); subName = subMap.get(line.getPids().split(StrUtil.COMMA)[SUB_LEVEL.getCode()]).getName();
devName = devMap.get(line.getPids().split(StrUtil.COMMA)[DEVICE_LEVEL.getCode()]).getName();
String temLos = "%s进行%s%s操作;详细信息: %s名称: %s"; String temLos = "%s进行%s%s操作;详细信息: %s名称: %s";
String tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"_"+line.getName()+nodeName); String tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"->"+devName+"->"+line.getName()+nodeName);
pqsTerminalLogs.setTerminalDescribe(tem); pqsTerminalLogs.setTerminalDescribe(tem);
pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode()); pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode());
pqsTerminalLogs.setIsPush(0); pqsTerminalLogs.setIsPush(0);