From b529f936702cc62e5cb7f314cc962b17bd16d2e5 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Thu, 24 Apr 2025 15:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E8=A7=86=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/controller/PatrolTaskController.java | 60 ++++++++++++++-----
 1 file changed, 44 insertions(+), 16 deletions(-)

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 93fd84f..9ec4483 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
@@ -2347,7 +2347,7 @@ public class PatrolTaskController extends BaseController {
         PatrolTaskStatus patro = this.patrolTaskStatusService.selectPatrolTaskStatusByLineId(patrolTaskStatus.getLineId());
         ResultAnalysis resultAnalysis = new ResultAnalysis();
         resultAnalysis.setTaskPatrolId(patro.getTaskPatrolledId());
-        resultAnalysis.setResult("0");
+        resultAnalysis.setFilter("1");
         resultAnalysis.setAbnormal(patrolTaskStatus.getAbnormal());
         resultAnalysis.setPosType(patrolTaskStatus.getPosType());
         resultAnalysis.setResultType(patrolTaskStatus.getResultType());
@@ -2361,31 +2361,59 @@ public class PatrolTaskController extends BaseController {
         resultAnalysis.setDesc(patrolTaskStatus.getDesc());
         List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
         List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
-        resultAnalysis.setResult("1");
+        resultAnalysis.setFilter("0");
         List<PatrolData> newList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
         int maxNum = Integer.parseInt(patrolTaskService.selectConfigByKey("MAX_NUM"));
         for (PatrolData item : newList) {
-            item.setAlgName(algInfos.stream().filter((alg) -> alg.getAlgSubtypeCode().equals(item.getAlgType())).findFirst().get().getAlgSubtypeName());
+            item.setAlgName(
+                    algInfos.stream().anyMatch((alg) -> {
+                        return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                    }) ?
+                            algInfos.stream().filter((alg) -> {
+                                return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                            }).findFirst().get().getAlgSubtypeName() : ""
+            );
             if ("0".equals(item.getFilter())) {
-                List<PatrolData> filterDatas = filterList.stream().filter((data) -> data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(item.getAlgType())).collect(Collectors.toList());
+                List<PatrolData> filterDatas = filterList.stream().filter((data) -> {
+                    return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(item.getAlgType());
+                }).collect(Collectors.toList());
                 if (!filterDatas.isEmpty()) {
-                    item.setImg(filterDatas.get(0).getImgAnalyse());
-                    item.setFilterDesc(filterDatas.get(0).getDesc());
-                } else {
-                    item.setImg("--");
+                    item.setImg((filterDatas.get(0)).getImgAnalyse());
+                    item.setFilterDesc((filterDatas.get(0)).getDesc());
+                    filterList.remove(filterDatas.get(0));
                 }
-            } else {
-                item.setImg(item.getImgAnalyse());
-                item.setImgAnalyse("--");
-                item.setFilterDesc(item.getDesc());
-                item.setDesc("--");
             }
 
-            item.setWarnStatus(item.warnStatus(item.getWarnStatus()));
-            if (!"meter".equals(item.getAlgType())) {
-                item.setResValue("--");
+            AlgValue algValue = new AlgValue();
+            if(item.getResValue() != null) {
+                String str = algValue.formatValue(item.getResValue());
+                if ("meter".equals(item.getAlgType())) {
+                    if (str.equals("-1")) {
+                        item.setResValue("空值");
+                    }
+                }
             }
         }
+        for (PatrolData item : filterList) {
+            item.setAlgName(
+                    algInfos.stream().anyMatch((alg) -> {
+                        return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                    }) ?
+                            algInfos.stream().filter((alg) -> {
+                                return alg.getAlgSubtypeCode().equals(item.getAlgType());
+                            }).findFirst().get().getAlgSubtypeName() : ""
+            );
+            AlgValue algValue = new AlgValue();
+            if(item.getResValue() != null) {
+                String str = algValue.formatValue(item.getResValue());
+                if ("meter".equals(item.getAlgType())) {
+                    if (str.equals("-1")) {
+                        item.setResValue("空值");
+                    }
+                }
+            }
+        }
+        newList.addAll(filterList);
 
         if(StringUtils.isNotEmpty(resultAnalysis.getAlgName())) {
             newList = newList.stream().filter((element) -> element.getAlgName().equals(resultAnalysis.getAlgName())).collect(Collectors.toList());