From 90baa6a076b7c7ea036d2adac3a032a1a473b309 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 十二月 2024 09:28:51 +0800
Subject: [PATCH] 在“远程测控”增加查询一个取水口报警状态的功能,实现后端逻辑

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java |   67 +++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
index 626af0e..018f0dc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
@@ -4,9 +4,9 @@
 import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
 import com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper;
 import com.dy.pipIrrGlobal.daoRm.UgRtuTaskMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
-import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
+import com.dy.pipIrrGlobal.voUg.VoUpgradeDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,24 +58,6 @@
     }
 
     /**
-     * 鏌ヨ涓�涓崌绾т换鍔℃湁鍏充俊鎭�
-     * @return 鍗囩骇浠诲姟鏈夊叧淇℃伅
-     */
-    public List<VoUpgradeDetail> selectTaskDetail(String taskId){
-        return this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
-    }
-
-
-    /**
-     * 淇濆瓨鍗囩骇浠诲姟涓烘墽琛岀姸鎬�
-     * @param taskId 浠诲姟ID
-     */
-    public void setUpgradeTaskExecuted(String taskId){
-        this.tdao.executeById(Long.valueOf(taskId)) ;
-    }
-
-
-    /**
      * 淇濆瓨RTU鍗囩骇缁撴潫鐘舵��
      * @param taskId
      * @param rtu
@@ -87,17 +69,46 @@
         cdao.updateRtuUpgradeState(params) ;
     }
 
-    /////////////////////////////////////////////////////
-    //
-    // 浠ヤ笅妯℃嫙鏁版嵁
-    //
-    /////////////////////////////////////////////////////
     /**
-     * 閫氫俊涓婚敭鏌ヨ涓�涓崌绾т换鍔�
+     * 鏌ヨ涓�涓崌绾т换鍔℃湁鍏充俊鎭�
+     * @return 鍗囩骇浠诲姟鏈夊叧淇℃伅
+     */
+    public VoUpgradeDetail selectTaskDetail(String taskId){
+        List<VoUpgradeDetail> list = this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
+        if(list != null && list.size() > 0){
+            return list.get(0) ;
+        }
+        return null ;
+    }
+
+    /**
+     * 淇濆瓨鍗囩骇浠诲姟涓烘墽琛岀姸鎬�
+     * @param taskId 浠诲姟ID
+     */
+    public void setUpgradeTaskExecuted(String taskId){
+        this.tdao.executeById(Long.valueOf(taskId)) ;
+    }
+
+
+    /**
+     * 璁剧疆鍗囩骇浠诲姟宸茬粡瀹屾垚
+     * @param taskId
+     */
+    public void updateTaskOver(String taskId){
+        tdao.overById(Long.valueOf(taskId)) ;
+    }
+
+    /////////////////////////////////////////////////////
+    //
+    // 浠ヤ笅婕旂ず鍗囩骇鍔熻兘鐢ㄥ埌
+    //
+    /////////////////////////////////////////////////////
+
+    /**
+     * 鏌ヨ鏈�鏂颁竴涓崌绾т换鍔�
      * @return
      */
     public UgRtuTask selectLastTask(){
         return tdao.selectLastTask();
     }
-
 }

--
Gitblit v1.8.0