From 2fa69009da77e2f64dbf686c8e00498dc46ff822 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Fri, 20 Mar 2026 16:45:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=8D=E5=85=B4=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=BF=BD=E7=95=A5/=E8=B7=9F=E8=B8=AA/=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=EF=BC=8C=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E7=82=B9=E4=BD=8D=E4=B9=9F=E5=90=8C=E6=AD=A5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=BF=BD=E7=95=A5=E8=B7=9F=E8=B8=AA=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultAnalysisController.java | 17 ++++-- .../analysis/domain/ResultAnalysis.java | 3 ++ .../analysis/mapper/ResultAnalysisMapper.java | 2 + .../service/IResultAnalysisService.java | 2 + .../impl/ResultAnalysisServiceImpl.java | 5 ++ .../task/controller/PatrolTaskController.java | 53 ++++++++++++++++++- .../mapper/task/ResultAnalysisMapper.xml | 29 ++++++++++ 7 files changed, 105 insertions(+), 6 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index 42b44a4..b518489 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java @@ -407,15 +407,22 @@ public class ResultAnalysisController extends BaseController { if (!resultAnalysisList.isEmpty()) { ResultAnalysis analysis = resultAnalysisList.get(0); logger.info("[ANALYSIS] lineId: {}", analysis.getLineId()); - analysis.setResStatus(patrolTaskInfo.getStatus()); + // 告警确认状态 3-已撤销（忽略） 4-跟踪（告警） 5-确认 + analysis.setPointStatus(patrolTaskInfo.getStatus()); analysis.setSuggestion(patrolTaskInfo.getSuggestion()); - if ("1".equals(patrolTaskInfo.getStatus())) { - analysis.setResultType("0");//告警 - } else if ("2".equals(patrolTaskInfo.getStatus())) { + if ("5".equals(patrolTaskInfo.getStatus())) { + // 确认 + analysis.setResultType("0");//缺陷 + } else if ("3".equals(patrolTaskInfo.getStatus())) { + // 忽略 analysis.setResultType("1");//结果正常 + } else if ("4".equals(patrolTaskInfo.getStatus())) { + // 跟踪 + analysis.setResultType("0");//缺陷 } - resultAnalysisService.updateResultAnalysis(analysis); +// resultAnalysisService.updateResultAnalysis(analysis); + resultAnalysisService.updateResultAnalysisByCondition(analysis); } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/ResultAnalysis.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/ResultAnalysis.java index df3a843..a00c831 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/ResultAnalysis.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/ResultAnalysis.java @@ -31,6 +31,9 @@ public class ResultAnalysis extends BaseEntity { ) private String resultContent; private String resStatus; + /** + * 点位状态 0-异常 1-正常 2-待人工确认 3-已撤销（忽略） 4-跟踪（告警） 5-确认（告警） + */ private String pointStatus; private String beginTime; private String endTime; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java index e232891..6ffa9e3 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java @@ -81,4 +81,6 @@ public interface ResultAnalysisMapper { List selectResultAnalysisListByMainIdsNew(@Param("lineIds") List lineIds, @Param("filter") String filter); List selectResultAnalysisListBatch(@Param("list") List taskPatrolIds, @Param("resultType") String resultType); + + void updateResultAnalysisByCondition(ResultAnalysis analysis); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java index 74c1ccf..ef56b19 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java @@ -57,4 +57,6 @@ public interface IResultAnalysisService { List selectResultAnalysisListBatch(List taskPatrolIds, String resultType); Long getDefectCountGroupByPoint(String defectFilter, String defectIsToday, String type); + + void updateResultAnalysisByCondition(ResultAnalysis analysis); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java index b04f0b3..9126711 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java @@ -98,6 +98,11 @@ public class ResultAnalysisServiceImpl implements IResultAnalysisService { return this.resultAnalysisMapper.updateResultAnalysis(resultAnalysis); } + @Override + public void updateResultAnalysisByCondition(ResultAnalysis analysis) { + this.resultAnalysisMapper.updateResultAnalysisByCondition(analysis); + } + public int deleteResultAnalysisByLineIds(Long[] lineIds) { return this.resultAnalysisMapper.deleteResultAnalysisByLineIds(lineIds); } 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 dd9d3d4..81cf5a5 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 @@ -469,7 +469,17 @@ public class PatrolTaskController extends BaseController { newList = new ArrayList<>(keyPatrolData.values()); if ("1".equals(patrolTaskStatus.getAbnormal())) { // 异常置顶 - newList.sort(Comparator.comparing(PatrolData::getPointStatus)); + newList.sort(Comparator.comparingInt(obj -> { + switch (obj.getPointStatus()) { + case "0": return 1; // 异常 + case "5": return 2; // 确认 + case "4": return 3; // 跟踪（告警） + case "1": return 4; // 正常 + case "2": return 5; // 待人工确认 + case "3": return 6; // 已撤销（忽略） + default: return 7; + } + })); } PageDomain pageDomain = TableSupport.buildPageRequest(); @@ -3275,6 +3285,7 @@ public class PatrolTaskController extends BaseController { Map map1 = new HashMap<>(); if (!listPointStatus.contains(item.getPointStatus())) { + // 点位状态 0-异常 1-正常 2-待人工确认 3-已撤销（忽略） 4-跟踪（告警） 5-确认（告警） if (StringUtils.isNotEmpty(item.getPointStatus())) { if (item.getPointStatus().equals("1")) { map1.put("value", "1"); @@ -3286,6 +3297,26 @@ public class PatrolTaskController extends BaseController { map1.put("label", MessageUtils.get("异常")); } + if (item.getPointStatus().equals("2")) { + map1.put("value", "2"); + map1.put("label", MessageUtils.get("待人工确认")); + } + + if (item.getPointStatus().equals("3")) { + map1.put("value", "3"); + map1.put("label", MessageUtils.get("忽略")); + } + + if (item.getPointStatus().equals("4")) { + map1.put("value", "4"); + map1.put("label", MessageUtils.get("跟踪")); + } + + if (item.getPointStatus().equals("5")) { + map1.put("value", "5"); + map1.put("label", MessageUtils.get("确认")); + } + listPointStatus.add(item.getPointStatus()); mapList.add(map1); } else { @@ -3342,6 +3373,26 @@ public class PatrolTaskController extends BaseController { map1.put("label", MessageUtils.get("异常")); } + if (item.getPointStatus().equals("2")) { + map1.put("value", "2"); + map1.put("label", MessageUtils.get("待人工确认")); + } + + if (item.getPointStatus().equals("3")) { + map1.put("value", "3"); + map1.put("label", MessageUtils.get("忽略")); + } + + if (item.getPointStatus().equals("4")) { + map1.put("value", "4"); + map1.put("label", MessageUtils.get("跟踪")); + } + + if (item.getPointStatus().equals("5")) { + map1.put("value", "5"); + map1.put("label", MessageUtils.get("确认")); + } + listPointStatus.add(item.getPointStatus()); mapList.add(map1); } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml index ba92638..6849537 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml @@ -407,6 +407,35 @@ where line_id = #{lineId} + + update result_analysis + + result_type = #{resultType}, + business_id = #{businessId}, + result_content = #{resultContent}, + res_status = #{resStatus}, + point_status = #{pointStatus}, + objectId = #{objectId}, + suggestion = #{suggestion}, + description = #{description}, + request_id = #{requestId}, + task_patrol_id = #{taskPatrolId}, + alg_type = #{algType}, + res_value = #{resValue}, + res_code = #{resCode}, + res_conf = #{resConf}, + res_desc = #{resDesc}, + result = #{result}, + res_img_url = #{resImgUrl}, + image_normal_url_path = #{imageNormalUrlPath}, + res_pos = #{resPos}, + filter = #{filter}, + original_value = #{originalValue}, + + + objectId = #{objectId} and alg_type = #{algType} and task_patrol_id = #{taskPatrolId} + + delete