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

修改解析日志模版

Browse Source
This commit is contained in:
hzj
2025-06-25 09:54:13 +08:00
parent 02b8f28de0
commit 5f7414111e
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3676,7 +3676,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
@Override @Override
@Transactional
public List<PreCommandDTO> ledgerChangePush() { public List<PreCommandDTO> ledgerChangePush() {
List<PreCommandDTO> preCommandDTOList = new ArrayList<>(); List<PreCommandDTO> preCommandDTOList = new ArrayList<>();
DictData dataDic = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.PROCESS_PARMETER.getCode(), DicDataTypeEnum.DEV_OPS.getCode()).getData(); DictData dataDic = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.PROCESS_PARMETER.getCode(), DicDataTypeEnum.DEV_OPS.getCode()).getData();
@@ -3700,6 +3699,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
Map<String, Node> nodeNameMap = nodes.stream().collect(Collectors.toMap(Node::getName, Function.identity())); Map<String, Node> nodeNameMap = nodes.stream().collect(Collectors.toMap(Node::getName, Function.identity()));
List<PqsTerminalPushLogDTO> pqsTerminalPushLogDTOList = new ArrayList<>(); List<PqsTerminalPushLogDTO> pqsTerminalPushLogDTOList = new ArrayList<>();
List<String> addAndDelteId = new ArrayList<>();
if(!CollectionUtils.isEmpty(list)){ if(!CollectionUtils.isEmpty(list)){
list.forEach(temp->{ list.forEach(temp->{
PqsTerminalPushLogDTO pqsTerminalPushLogDTO = new PqsTerminalPushLogDTO(); PqsTerminalPushLogDTO pqsTerminalPushLogDTO = new PqsTerminalPushLogDTO();
@@ -3776,7 +3776,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
//设备删除找不到设备名称,重日志截取 //设备删除找不到设备名称,重日志截取
if(Objects.equals(temp.getOperateType(), Param.DEL)){ if(Objects.equals(temp.getOperateType(), Param.DEL)){
String temLos = "%s,详细信息:%s;前置信息:%s"; String temLos = "%s名称:%s;前置信息:%s";
List<String> strings = this.parseTemplateValues(temLos, temp.getTerminalDescribe()); List<String> strings = this.parseTemplateValues(temLos, temp.getTerminalDescribe());
String devName = strings.get(1); // 设备名称 String devName = strings.get(1); // 设备名称
String nodeName = strings.get(2); // 进程名称 String nodeName = strings.get(2); // 进程名称
@@ -3792,9 +3792,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
pqsTerminalPushLogDTO.setDevName("删除设备"); pqsTerminalPushLogDTO.setDevName("删除设备");
} }
String nodeId = deviceMap.get(deviceId).getNodeId(); //如果新增的没有，说明该新增设备在本次也删除了，
pqsTerminalPushLogDTO.setNodeId(nodeId); if(deviceMap.containsKey(deviceId)){
pqsTerminalPushLogDTO.setNodeName(nodeMap.get(nodeId).getName()); String nodeId = deviceMap.get(deviceId).getNodeId();
pqsTerminalPushLogDTO.setNodeId(nodeId);
pqsTerminalPushLogDTO.setNodeName(nodeMap.get(nodeId).getName());
}else{
addAndDelteId.add(deviceId);
return;
}
} }
@@ -3813,7 +3820,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
} }
}); });
Map<String, Map<Integer, List<PqsTerminalPushLogDTO>>> collect2 = pqsTerminalPushLogDTOList.stream().collect(Collectors.groupingBy(PqsTerminalPushLogDTO::getNodeId, Collectors.groupingBy(PqsTerminalPushLogDTO::getProcessNum)));
Map<String, Map<Integer, List<PqsTerminalPushLogDTO>>> collect2 = pqsTerminalPushLogDTOList.stream().filter(temp->!addAndDelteId.contains(temp.getDevId())).collect(Collectors.groupingBy(PqsTerminalPushLogDTO::getNodeId, Collectors.groupingBy(PqsTerminalPushLogDTO::getProcessNum)));
collect2.forEach((nodeId,pqsTerminalPushLogDTOMap)->{ collect2.forEach((nodeId,pqsTerminalPushLogDTOMap)->{
pqsTerminalPushLogDTOMap.forEach((processId,tempPqsTerminalPushLogDTOList)->{ pqsTerminalPushLogDTOMap.forEach((processId,tempPqsTerminalPushLogDTOList)->{