diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 4bc28925..1c25eddb 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -3203,21 +3203,21 @@ public class ResultServiceImpl implements IResultService { .set(PqMonitor::getResultType, null) .set(PqMonitor::getQualifiedNum, 0) .eq(PqMonitor::getDevId, deviceId) - //.eq(PqMonitor::getNum, Integer.parseInt(chnNum)) +// .eq(PqMonitor::getNum, Integer.parseInt(chnNum)) .eq(PqMonitor::getCheckFlag, 1) .update(); } - //String monitorId = deviceId + CnSocketUtil.SPLIT_TAG + chnNum; +// String monitorId = deviceId + CnSocketUtil.SPLIT_TAG + chnNum; List adPairList = adPairService.listByDevIds(Arrays.asList(deviceId)); Map> numAdPairsMap = adPairList.stream().collect(Collectors.groupingBy(AdPair::getNum, Collectors.toList())); numAdPairsMap.forEach((num, pairList) -> { - BiMap parsIp = HashBiMap.create(); - BiMap parsId = HashBiMap.create(); Map numMap = new HashMap<>(); Map> devMonitroIdMap = pairList.stream().collect(Collectors.groupingBy(AdPair::getDevMonitorId, Collectors.toList())); devMonitroIdMap.forEach((devMonitorId, pairList1) -> { + BiMap parsIp = HashBiMap.create(); + BiMap parsId = HashBiMap.create(); String[] split1 = devMonitorId.split(CnSocketUtil.SPLIT_TAG); AdPair adPair = pairList1.get(0); String[] split2 = adPair.getStdDevMonitorId().split(CnSocketUtil.SPLIT_TAG);