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 20:19:41 +08:00
parent d52ea52e4c
commit 7d0e85f6fc
1 changed files with 9 additions and 11 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

@@ -4074,7 +4074,6 @@ 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;
@@ -4083,20 +4082,13 @@ 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:
@@ -4116,8 +4108,8 @@ 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 tem;
String nodeName = ""; String nodeName = "";
if(line.getLevel().equals(LINE_LEVEL.getCode())){ if(line.getLevel().equals(LINE_LEVEL.getCode())){
levelOperate = LINE_LEVEL.getMessage(); levelOperate = LINE_LEVEL.getMessage();
@@ -4129,9 +4121,15 @@ 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+"->"+devName+"->"+line.getName()+nodeName); if(line.getLevel().equals(LINE_LEVEL.getCode())){
String devName = this.getById(line.getPids().split(StrUtil.COMMA)[DEVICE_LEVEL.getCode()]).getName();
tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"->"+devName+"->"+line.getName()+nodeName);
}else{
tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"->"+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);