From c3443fcc91c7b149fd49590fc83caf1521c500c0 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 10 Dec 2025 11:15:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=8E=9F=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/service/impl/AdPlanServiceImpl.java | 1 + .../gather/result/pojo/param/ResultParam.java | 5 ++++ .../service/impl/ResultServiceImpl.java | 27 +++++++++---------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index f80ac667..49f655d0 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -554,6 +554,7 @@ public class AdPlanServiceImpl extends ServiceImpl impleme child.put("pid", adPlan.getFatherPlanId()); child.put("name", adPlan.getName()); child.put("timeCheck", adPlan.getTimeCheck()); + child.put("dataRule", adPlan.getDataRule()); List pqStandardDevs = adPlanStandardDevMapper.listByPlanId(Collections.singletonList(adPlan.getId())); List devTypeIdList = pqStandardDevs.stream().map(PqStandardDev::getDevType).collect(Collectors.toList()); diff --git a/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java b/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java index 61ec56ca..21ae73bd 100644 --- a/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java +++ b/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java @@ -75,6 +75,8 @@ public class ResultParam { // 模式id private String patternId; + + private String code; } @Data @@ -104,5 +106,8 @@ public class ResultParam { @ApiModelProperty(value = "通道号", required = true) private String chnNum; + + @ApiModelProperty(value = "数据处理原则", required = true) + private String dataRuleId; } } 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 d13af77c..85cb200b 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 @@ -983,10 +983,10 @@ 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()); + this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), param.getChnNum(), param.getDataRuleId()); } else { this.createTempResultTable(param.getCode() + "_temp", false); - this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId()); + this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId()); } } @@ -1000,9 +1000,9 @@ 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()); + this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), param.getChnNum(), param.getDataRuleId()); } else { - this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode(), param.getErrorSysId(), param.getDeviceId()); + this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId()); } } @@ -1533,8 +1533,7 @@ public class ResultServiceImpl implements IResultService { AdPlan plan = adPlanService.getById(queryParam.getPlanId()); PqDev dev = pqDevService.getById(queryParam.getDeviceId()); - DictData dictData = dictDataService.getById(plan.getDataRule()); - formContentVO.setDataRule(dictData.getName()); + formContentVO.setDataRule(plan.getDataRule()); formContentVO.setDeviceName(dev.getName()); formContentVO.setErrorSysId(plan.getErrorSysId()); @@ -1581,8 +1580,6 @@ public class ResultServiceImpl implements IResultService { public ContrastResultVO getContrastResult(ResultParam.QueryParam queryParam) { ContrastResultVO contrastResultVO = new ContrastResultVO(); - AdPlan plan = adPlanService.getById(queryParam.getPlanId()); - List dictTreeList = dictTreeService.getDictTreeById(Collections.singletonList(queryParam.getScriptType())); List fatherIdList = dictTreeList.stream().map(DictTree::getId).collect(Collectors.toList()); @@ -1604,8 +1601,8 @@ public class ResultServiceImpl implements IResultService { } } - contrastResultVO.setResultMap(this.getResultMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), String.valueOf(plan.getCode()))); - contrastResultVO.setRawDataMap(this.getRawDataMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), String.valueOf(plan.getCode()), contrastResultVO.getResultMap().keySet().stream().collect(Collectors.toList()))); + contrastResultVO.setResultMap(this.getResultMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), queryParam.getCode())); + contrastResultVO.setRawDataMap(this.getRawDataMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), queryParam.getCode(), contrastResultVO.getResultMap().keySet().stream().collect(Collectors.toList()))); return contrastResultVO; } @@ -3067,7 +3064,7 @@ public class ResultServiceImpl implements IResultService { * @param errorSysId * @param devId */ - private void simAndDigCalculateResult(String planId, String scriptId, String code, String errorSysId, String devId) { + private void simAndDigCalculateResult(String planId, String scriptId, String code, String errorSysId, String devId, String dataRuleId) { String oldCode = code.replace("_temp", ""); PreDetectionParam param = new PreDetectionParam(); param.setCode(code); @@ -3085,8 +3082,8 @@ public class ResultServiceImpl implements IResultService { // } else { // dataRule = DictDataEnum.SECTION_VALUE; // } - AdPlan plan = adPlanService.getById(planId); - DictData dictData = dictDataService.getDictDataById(plan.getDataRule()); +// AdPlan plan = adPlanService.getById(planId); + DictData dictData = dictDataService.getDictDataById(dataRuleId); if (ObjectUtil.isNotNull(dictData)) { dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode()); } else { @@ -3146,7 +3143,7 @@ public class ResultServiceImpl implements IResultService { * @param deviceId * @param chnNum */ - private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, String chnNum) { + private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, String chnNum, String dataRuleId) { String oldCode = code.replace("_temp", ""); Map devIdMapComm = new HashMap<>(); @@ -3189,7 +3186,7 @@ public class ResultServiceImpl implements IResultService { } DictDataEnum dataRule; - DictData dictData = dictDataService.getDictDataById(plan.getDataRule()); + DictData dictData = dictDataService.getDictDataById(dataRuleId); if (ObjectUtil.isNotNull(dictData)) { dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode()); } else {