From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java |   64 ++++++++++++++-----------------
 1 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
index 9308d9d..3abc7b6 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
@@ -3,9 +3,8 @@
 import com.dy.common.mw.UnitAdapterInterface;
 import com.dy.common.mw.UnitCallbackInterface;
 import com.dy.common.mw.UnitInterface;
+import com.dy.common.softUpgrade.state.UpgradeTaskVo;
 import com.dy.common.util.Callback;
-
-import java.util.List;
 
 /**
  * @Author: liurunyu
@@ -40,7 +39,7 @@
     }
 
     /**
-     * 鍒濆鍖栦笂琛屾暟鎹鐞嗕换鍔℃睜
+     * 鍒濆鍖�
      */
     @Override
     public void start(UnitCallbackInterface callback) throws Exception {
@@ -57,44 +56,32 @@
 
     @Override
     public void stop(UnitCallbackInterface callback) throws Exception {
-        stopUpgradeTask() ;
+        forceOverUpgradeTask() ;
     }
 
 
 
     /**
      * 璁剧疆鍗囩骇浠诲姟
-     * @param softFileName 鍗囩骇绋嬪簭鏂囦欢鍚�
-     * @param softStoreAddr 鍗囩骇绋嬪簭瀛樻斁鍦板潃
-     * @param softStartAddr 绋嬪簭瑕嗙洊璧峰鍦板潃
-     * @param softFileData 鍗囩骇绋嬪簭瀛楄妭鏁扮粍
-     * @param softBytesCalculate 鍗囩骇绋嬪簭瀛楄妭鏁�(鎸夊叕寮忚绠�)
-    * @param rtuAddrList 鍗囩骇RTU
+     * @param vo UpgradeTaskVo 鍗囩骇浠诲姟瀵硅薄
      * @throws Exception
      */
-    public void setUpgradeTask(String softFileName,
-                               String softStoreAddr,
-                               String softStartAddr,
-                               byte[] softFileData,
-                               Integer softBytesCalculate,
-                               List<String> rtuAddrList) throws Exception {
+    public void setUpgradeTask(UpgradeTaskVo vo) throws Exception {
         if(manager != null ){
-            manager.setUpgradeTask(softFileName,
-                    softStoreAddr,
-                    softStartAddr,
-                    softFileData,
-                    softBytesCalculate,
-                    rtuAddrList) ;
+            manager.setUpgradeTask(vo) ;
         }
     }
 
     /**
-     * 鍋滄褰撳墠鍗囩骇浠诲姟
+     * 缁撴潫褰撳墠鍗囩骇浠诲姟
      * @throws Exception
+     * @return null锛氱粨鏉熶换鍔℃垚鍔燂紝鍚﹀垯杩斿洖澶辫触鍘熷洜
      */
-    public void stopUpgradeTask() throws Exception {
+    public String forceOverUpgradeTask() throws Exception {
         if(manager != null ){
-            manager.stopUpgradeTask() ;
+            return manager.forceOverUpgradeTask() ;
+        }else{
+            return "閫氫俊涓棿浠跺唴閮ㄩ敊璇�" ;
         }
     }
 
@@ -104,9 +91,9 @@
      * @param code
      * @param callback
      */
-    public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback){
+    public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback, Object ...objects){
         if(manager != null ){
-            manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback);
+            manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback, objects);
         }
     }
 
@@ -118,37 +105,44 @@
     /**
      * 褰撳墠鍗囩骇鐘舵��
      * @return
-     */
     public UpgradeState currentUpgradeState() {
         if(manager != null ){
             return manager.currentUpgradeState();
         }
         return null ;
-    }
+    }*/
 
     /**
      * Rtu鍗囩骇淇℃伅
      * @param rtuAddr
      * @return
-     */
-    public UpgradeRtu upgradeInfos(String rtuAddr){
+    public UpgradeRtuDev upgradeRtuInfo(String rtuAddr){
         if(manager != null ){
             return manager.upgradeInfos(rtuAddr);
         }
         return null ;
-    }
+    }*/
 
     /**
      * Rtu鍗囩骇淇℃伅
      * @param rtuAddrList
      * @return
-     */
-    public List<UpgradeRtu> upgradeInfos(List<String> rtuAddrList){
+    public List<UpgradeRtuDev> upgradeRtuInfos(List<String> rtuAddrList){
         if(manager != null ){
             return manager.upgradeInfos(rtuAddrList);
         }
         return null ;
-    }
+    }*/
+
+    /**
+     * Rtu鍗囩骇淇℃伅
+     * @return
+    public List<UpgradeRtuDev> upgradeRtuInfoAll(){
+        if(manager != null ){
+            return manager.upgradeInfoAll();
+        }
+        return null ;
+    }*/
 
 }
 

--
Gitblit v1.8.0