diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index 79b98963..e9c4fe82 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -2206,32 +2206,32 @@ public class DetectionServiceImpl { switch (dataRule) { case SECTION_VALUE: if (aStandardDev.size() > 2) { - aStandardDev.remove(aIdxs.get(0)); - aStandardDev.remove(aIdxs.get(aIdxs.size() - 1)); + aStandardDev.remove(0); + aStandardDev.remove(aStandardDev.size() - 1); List newArray = DetectionUtil.getNewArray(aDev, aIdxs.subList(1, aIdxs.size() - 1)); aDev.clear(); aDev.addAll(newArray); } if (bStandardDev.size() > 2) { - bStandardDev.remove(bIdxs.get(0)); - bStandardDev.remove(bIdxs.get(bIdxs.size() - 1)); + bStandardDev.remove(0); + bStandardDev.remove(bStandardDev.size() - 1); List newArray = DetectionUtil.getNewArray(bDev, bIdxs.subList(1, bIdxs.size() - 1)); bDev.clear(); bDev.addAll(newArray); } if (cStandardDev.size() > 2) { - cStandardDev.remove(cIdxs.get(0)); - cStandardDev.remove(cIdxs.get(cIdxs.size() - 1)); + cStandardDev.remove(0); + cStandardDev.remove(cStandardDev.size() - 1); List newArray = DetectionUtil.getNewArray(cDev, cIdxs.subList(1, cIdxs.size() - 1)); cDev.clear(); cDev.addAll(newArray); } if (tStandardDev.size() > 2) { - tStandardDev.remove(tIdxs.get(0)); - tStandardDev.remove(tIdxs.get(tIdxs.size() - 1)); + tStandardDev.remove(0); + tStandardDev.remove(tStandardDev.size() - 1); List newArray = DetectionUtil.getNewArray(tDev, tIdxs.subList(1, tIdxs.size() - 1)); tDev.clear(); tDev.addAll(newArray); @@ -2407,8 +2407,8 @@ public class DetectionServiceImpl { switch (dataRule) { case SECTION_VALUE: if (value.size() > 2) { - value.remove(idx.get(0)); - value.remove(idx.get(idx.size() - 1)); + value.remove(0); + value.remove(value.size() - 1); List newArray = DetectionUtil.getNewArray(devMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1)); devMap.get(typeKey).get(key).clear(); devMap.get(typeKey).get(key).addAll(newArray); diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java index e0879c4d..2e8dbc28 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java @@ -336,7 +336,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler { devLineTestResult.setDeviceName(dev.getDevName()); Integer[] resultFlags = dev.getMonitorList().stream() - .map(monitor -> ResultEnum.NETWORK_TIMEOUT) + .map(monitor -> ResultEnum.NETWORK_TIMEOUT.getValue()) .toArray(Integer[]::new); devLineTestResult.setChnResult(resultFlags); 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 85cb200b..4bc28925 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 @@ -146,11 +146,11 @@ public class ResultServiceImpl implements IResultService { formContentVO.setErrorSysId(plan.getErrorSysId()); String scriptId = null; if (ObjectUtil.isNotNull(plan)) { + formContentVO.setDataRule(plan.getDataRule()); scriptId = plan.getScriptId(); adPlanService.visualize(Collections.singletonList(plan)); + formContentVO.setScriptName(plan.getScriptId()); } - formContentVO.setScriptName(plan.getScriptId()); - formContentVO.setDataRule(plan.getDataRule()); formContentVO.setDeviceName(pqDevService.getById(queryParam.getDeviceId()).getName()); List> chnList = new ArrayList<>(); @@ -983,7 +983,7 @@ public class ResultServiceImpl implements IResultService { DictData dictData = dictDataService.getDictDataById(param.getPatternId()); if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) { this.createTempResultTable(param.getCode() + "_temp", true); - this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), param.getChnNum(), param.getDataRuleId()); + this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), false, param.getDataRuleId()); } else { this.createTempResultTable(param.getCode() + "_temp", false); this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId()); @@ -1000,7 +1000,7 @@ public class ResultServiceImpl implements IResultService { public void reCalculate(ResultParam.ChangeErrorSystemParam param) { DictData dictData = dictDataService.getDictDataById(param.getPatternId()); if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) { - this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), param.getChnNum(), param.getDataRuleId()); + this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), true, param.getDataRuleId()); } else { this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId()); } @@ -3141,9 +3141,9 @@ public class ResultServiceImpl implements IResultService { * @param code * @param errorSysId * @param deviceId - * @param chnNum + * @param updateResult */ - private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, String chnNum, String dataRuleId) { + private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, boolean updateResult, String dataRuleId) { String oldCode = code.replace("_temp", ""); Map devIdMapComm = new HashMap<>(); @@ -3193,20 +3193,23 @@ public class ResultServiceImpl implements IResultService { dataRule = DictDataEnum.SECTION_VALUE; } - pqMonitorService.lambdaUpdate().set(PqMonitor::getRecordedResult, null) - .set(PqMonitor::getRealtimeNum, null) - .set(PqMonitor::getRecordedResult, null) - .set(PqMonitor::getRecordedNum, null) - .set(PqMonitor::getStatisticsResult, null) - .set(PqMonitor::getStatisticsNum, null) - .set(PqMonitor::getResultType, null) - .set(PqMonitor::getQualifiedNum, 0) - .eq(PqMonitor::getDevId, deviceId) - .eq(PqMonitor::getNum, Integer.parseInt(chnNum)) - .eq(PqMonitor::getCheckFlag, 1) - .update(); - String monitorId = deviceId + CnSocketUtil.SPLIT_TAG + chnNum; - List adPairList = adPairService.listByDevIds(Arrays.asList(monitorId)); + if (updateResult) { + pqMonitorService.lambdaUpdate().set(PqMonitor::getRecordedResult, null) + .set(PqMonitor::getRealtimeNum, null) + .set(PqMonitor::getRecordedResult, null) + .set(PqMonitor::getRecordedNum, null) + .set(PqMonitor::getStatisticsResult, null) + .set(PqMonitor::getStatisticsNum, null) + .set(PqMonitor::getResultType, null) + .set(PqMonitor::getQualifiedNum, 0) + .eq(PqMonitor::getDevId, deviceId) + //.eq(PqMonitor::getNum, Integer.parseInt(chnNum)) + .eq(PqMonitor::getCheckFlag, 1) + .update(); + } + + //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) -> { @@ -3225,42 +3228,40 @@ public class ResultServiceImpl implements IResultService { numMap.put(devMonitorId, num); numMap.put(adPair.getStdDevMonitorId(), num); devIdMapComm.put(standardDev.getIp(), standardDev.getId()); - }); - List devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, monitorId, null); - List stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, monitorId, null); - List devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, monitorId, null); - List stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, monitorId, null); + List devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, devMonitorId, null); + List stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, devMonitorId, null); + List devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, devMonitorId, null); + List stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, devMonitorId, null); - List devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0); - List standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1); + List devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0); + List standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1); - if (CollUtil.isNotEmpty(devData) && CollUtil.isNotEmpty(standardDevData)) { - detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, code, null, finalNonWaveDataSourceEnum); + if (CollUtil.isNotEmpty(devData) && CollUtil.isNotEmpty(standardDevData)) { + detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, code, null, finalNonWaveDataSourceEnum); - parsId.forEach((devMonitorId, stdDevMonitorId) -> { - String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG); - pqMonitorService.updateMonitorResult(devMonitorId, null, finalNonWaveDataSourceEnum, num, null, oldCode); - pqDevService.updateResult(split[0], null); - }); - } + if (updateResult) { + pqMonitorService.updateMonitorResult(devMonitorId, null, finalNonWaveDataSourceEnum, num, null, oldCode); + pqDevService.updateResult(split1[0], null); + } + } - AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId); - for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) { - devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, monitorId, null); - stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, monitorId, null); - devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, monitorId, null); - stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, monitorId, null); + AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId); + for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) { + devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, devMonitorId, null); + stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, devMonitorId, null); + devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, devMonitorId, null); + stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, devMonitorId, null); - devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0); - standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1); - detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i, DataSourceEnum.WAVE_DATA); - } + devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0); + standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1); + detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i, DataSourceEnum.WAVE_DATA); + } - parsId.forEach((devMonitorId, stdDevMonitorId) -> { - String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG); - pqMonitorService.updateMonitorResult(devMonitorId, null, WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode); - pqDevService.updateResult(split[0], null); + if (updateResult) { + pqMonitorService.updateMonitorResult(devMonitorId, null, WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode); + pqDevService.updateResult(split1[0], null); + } }); }); }