diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 451f8b861..1d64edcbe 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -4074,7 +4074,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple private void terminalLogsCat(List logsList,String operateType,List pqsTerminalLogsList,Map nodeMap){ String op; Map subMap = new HashMap<>(); - Map devMap = new HashMap<>(); List temList = logsList.stream().filter(it-> it.getLevel().equals(LINE_LEVEL.getCode()) ||it.getLevel().equals(DEVICE_LEVEL.getCode())).collect(Collectors.toList()); if(CollUtil.isEmpty(temList)){ return; @@ -4083,20 +4082,13 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple case Param.ADD: op = Param.ADD_ZN; List stationIds = temList.stream().map(it->it.getPids().split(StrUtil.COMMA)[SUB_LEVEL.getCode()]).distinct().collect(Collectors.toList()); - List devIds = temList.stream().map(it->it.getPids().split(StrUtil.COMMA)[DEVICE_LEVEL.getCode()]).distinct().collect(Collectors.toList()); List subList = this.listByIds(stationIds); - List devList = this.listByIds(devIds); subMap = subList.stream().collect(Collectors.toMap(Line::getId,Function.identity())); - devMap = devList.stream().collect(Collectors.toMap(Line::getId,Function.identity())); break; case Param.DEL: op = Param.DEL_ZN; List stationList = logsList.stream().filter(it->it.getLevel().equals(SUB_LEVEL.getCode())).collect(Collectors.toList()); - List tempDevIds = temList.stream().map(it->it.getPids().split(StrUtil.COMMA)[DEVICE_LEVEL.getCode()]).distinct().collect(Collectors.toList()); - - List tempDevList = this.listByIds(tempDevIds); subMap = stationList.stream().collect(Collectors.toMap(Line::getId,Function.identity())); - devMap = tempDevList.stream().collect(Collectors.toMap(Line::getId,Function.identity())); break; default: @@ -4116,8 +4108,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple pqsTerminalLogs.setLogsType(devDataDic.getId()); } String subName; - String devName; String levelOperate; + String tem; String nodeName = ""; if(line.getLevel().equals(LINE_LEVEL.getCode())){ levelOperate = LINE_LEVEL.getMessage(); @@ -4129,9 +4121,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple } 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 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.setState(DataStateEnum.ENABLE.getCode()); pqsTerminalLogs.setIsPush(0);