From f3cc9ac27cfc6e0d01f3bbb36bcb982bbcac0669 Mon Sep 17 00:00:00 2001
From: weitang <pechji9114@163.com>
Date: Fri, 23 May 2025 11:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95=E6=9B=B2=E7=BA=BF=E9=80=BB=E8=BE=91=E5=92=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=B0=83=E7=94=A8=E5=A4=B1=E8=B4=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedata/controller/SubstationModelController.java   | 7 +++----
 .../patroltask/service/impl/TaskTodoServiceImpl.java     | 9 ++++++++-
 .../resources/mapper/algorithm/AlgorithmDeviceMapper.xml | 4 ----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationModelController.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationModelController.java
index c075fad..48864db 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationModelController.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationModelController.java
@@ -160,14 +160,13 @@ public class SubstationModelController {
         queryWrapper.orderByAsc(TaskResult::getOrderNum);
         List<TaskResult> results = taskResultMapper.selectList(queryWrapper);
         List<Map<String, Object>> listMaps = new ArrayList<>();
-        for (int i = 0; i < results.size(); i++) {
-            TaskResult result = results.get(i);
+        for (TaskResult result : results) {
             LambdaQueryWrapper<SubstationModel> modelWrapper = new LambdaQueryWrapper<>();
             modelWrapper.eq(SubstationModel::getStationId, stationid);
             modelWrapper.eq(SubstationModel::getType, "02");
-            modelWrapper.like(SubstationModel::getObjinfo,result.getDeviceId());
+            modelWrapper.like(SubstationModel::getObjinfo, result.getDeviceId());
             List<Map<String, Object>> list = substationModelService.listMaps(modelWrapper);
-            if(list.size()>0){
+            if (list.size() > 0) {
                 listMaps.add(list.get(0));
             }
         }
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java
index 3d71ce6..542fb30 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/TaskTodoServiceImpl.java
@@ -1747,6 +1747,12 @@ public class TaskTodoServiceImpl extends ServiceImpl<TaskTodoMapper, TaskTodo> i
      ***********************************/
     @Override
     public synchronized void setTaskResultAndTodo(String stationCode, String resultId, Integer deviceSumnum, String taskTodoId) {
+        Integer integer =
+                taskResultMapper.selectCount(new LambdaQueryWrapper<TaskResult>().eq(TaskResult::getResultId,
+                        resultId).eq(TaskResult::getFlag, "2"));
+        if (integer > 0) {
+            return;
+        }
         TaskResult taskResult = new TaskResult();
         taskResult.setResultId(resultId);
         taskResult.setFlag("4");
@@ -1756,7 +1762,8 @@ public class TaskTodoServiceImpl extends ServiceImpl<TaskTodoMapper, TaskTodo> i
         // 赋值执行数量
         List<Map<String, Object>> list = this.getTaskResultById(taskTodo.getTaskTodoId(), null, null, null);
         // 已送检点数
-        long patrolCount = list.stream().filter(t -> !("0").equals(t.get("flag")) && !("1").equals(t.get("flag"))).count();
+        long patrolCount =
+                list.stream().filter(t -> !("0").equals(t.get("flag")) && !("1").equals(t.get("flag"))).count();
         // 失败的数量
         long failCount =
                 list.stream().filter(t -> ("4").equals(t.get("flag")) || ("6").equals(t.get("flag"))).count();
diff --git a/riis-system/src/main/resources/mapper/algorithm/AlgorithmDeviceMapper.xml b/riis-system/src/main/resources/mapper/algorithm/AlgorithmDeviceMapper.xml
index f0d2c6f..2e3be8c 100644
--- a/riis-system/src/main/resources/mapper/algorithm/AlgorithmDeviceMapper.xml
+++ b/riis-system/src/main/resources/mapper/algorithm/AlgorithmDeviceMapper.xml
@@ -29,12 +29,8 @@
             INNER JOIN iis_algorithm_device ad ON ap.id = ad.param_id
         WHERE
             ap.param_fixed = '0'
-        <if test="algorithmId != null and algorithmId != ''">
             AND ad.algorithm_id =#{algorithmId}
-        </if>
-        <if test="componentId != null and componentId != ''">
             AND ad.component_id =#{componentId}
-        </if>
     </select>
     <select id="getReturnDesc" resultType="java.lang.String">
         SELECT