From 282bd328fb7cc5368d60a216fff3eff1768b90be Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Mon, 11 May 2026 15:21:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8C=85=E8=A3=85=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E7=BA=A0=E5=81=8F=E7=AE=97=E6=B3=95=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/analysis/utils/ResultAnalysisUtils.java | 9 +++++++-- .../task/controller/PatrolTaskController.java | 13 +++++++++++-- .../service/impl/PatrolTaskStatusServiceImpl.java | 7 +++---- .../mapper/task/PatrolTaskStatusMapper.xml | 5 ++++- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index ae0cd48..67669c9 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -58,8 +58,10 @@ public class ResultAnalysisUtils { resultAnalysis.setPointStatus("0"); resultAnalysis.setResultType("2"); resultAnalysis.setResStatus("0"); - resultAnalysis.setResValue(""); resultAnalysis.setCreateTime(new Date()); + if(!Arrays.asList(AlgConstants.CORRECTION, AlgConstants.GIS_METER_2).contains(resultAnalysis.getAlgType())) { + resultAnalysis.setResValue(""); + } return false; } @@ -305,6 +307,7 @@ public class ResultAnalysisUtils { defaultDesc = "未检测到刀闸"; } } else if (algType.equals("correction")) { + log.info("correction correction, {}", resultAnalysis.getResValue()); log.info("parseAlg algType correction 2000 resCode: {}, correctionValue: {}", resultAnalysis.getResCode(), correctionValue); if ("2000".equals(resultAnalysis.getResCode())) { ObjectMapper mapper = new ObjectMapper(); @@ -339,7 +342,6 @@ public class ResultAnalysisUtils { log.info("2000 correction need value0: {}, value1: {}, value2: {}, value3: {}", value0, value1, value2, value3); resultAnalysis.setPointStatus("1"); resultAnalysis.setResultType("1"); - //resultAnalysis.setResStatus("3"); //defaultDesc = "请进行纠偏"; resultAnalysis.setResStatus("2"); resultAnalysis.setResValue(""); @@ -413,6 +415,9 @@ public class ResultAnalysisUtils { defaultDesc = messageUtils.get("未知异常"); resultAnalysis.setResDesc(defaultDesc); } + // 纠偏分析结果均为正常 + resultAnalysis.setResultType(ResultTypeEnum.NORMAL.getCode()); + resultAnalysis.setPointStatus(PointStatusEnum.NORMAL.getCode()); } else { log.info("parseAlg algType: {}", algType); if (value.equals("0")) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 3688460..039db8b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -12,7 +12,6 @@ import com.inspect.base.core.constant.RedisConst; import com.inspect.base.core.domain.DataMsg; import com.inspect.base.core.enums.PointStatusEnum; import com.inspect.base.core.enums.ResStatusEnum; -import com.inspect.base.core.enums.ResultTypeEnum; import com.inspect.base.core.enums.TaskStatus; import com.inspect.base.core.service.SyncDataToUpstreamService; import com.inspect.base.core.sftp.SftpClient; @@ -358,6 +357,17 @@ public class PatrolTaskController extends BaseController { } } + // 6.1 纠偏算法的状态处理 + for (PatrolData item : newList) { + if (AlgConstants.CORRECTION.equals(item.getAlgType())) { + // 纠偏状态包装：异常→点位异常，需要纠偏→点位缺陷，其他→点位正常（无需处理） + if (ResStatusEnum.UNCONFIRM.getCode().equals(item.getResStatus())) { + item.setPointStatus(PointStatusEnum.ABNORMAL.getCode()); + } else if (ResStatusEnum.CORRECT.getCode().equals(item.getResStatus())) { + item.setPointStatus(PointStatusEnum.DEFECT.getCode()); } + } + } + // 7. 所有过滤条件合并为一个 stream（避免多次 filter + collect） newList = newList.stream() .filter(element -> StringUtils.isEmpty(patrolTaskStatus.getAlgName()) @@ -490,7 +500,6 @@ public class PatrolTaskController extends BaseController { return AjaxResult.success(patrolTask); } - /** * 信息 * diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java index 2e4e57f..ab61cd1 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java @@ -45,9 +45,6 @@ public class PatrolTaskStatusServiceImpl implements IPatrolTaskStatusService { @Resource private IPatrolTaskResultMainService patrolTaskResultMainService; - @Resource - private PatrolResultMapper patrolResultMapper; - @Resource private IPatrolResultService patrolResultService; @@ -281,9 +278,11 @@ public class PatrolTaskStatusServiceImpl implements IPatrolTaskStatusService { private String getTaskPointsSummary(String taskCode, String taskPatrolledId, String specifiedAlg) { // 任务总点位和算法 List> totalPointList = patrolTaskStatusMapper.selectTotalPointsAndAlgs(taskCode); + // 任务指定算法类型 if (StringUtils.isNotEmpty(specifiedAlg)) { - totalPointList.stream().forEach(item -> item.put("alg_subtype_ids", specifiedAlg)); + Map algorithmInfo = patrolResultService.selectAlgorithmInfo(specifiedAlg); + totalPointList.stream().forEach(item -> item.put("alg_subtype_ids", algorithmInfo.get("alg_subtype_id"))); } // 任务已巡检点位和算法 List> executedPointList = patrolTaskStatusMapper.selectExecutedPointsAndAlgs(taskPatrolledId); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml index 78e6ed7..9878b9c 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml @@ -24,6 +24,7 @@ + +