This commit is contained in:
caozehui
2025-12-30 08:36:09 +08:00
parent fdb4b7060a
commit 0fa7ec91c4

View File

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