From 4e4bcc8e95fef11e695d476da4e761399d3c7247 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十一月 2024 09:49:52 +0800
Subject: [PATCH] json传输byte[]数组，转换为base64编码

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java |   53 ++++++++++++++++++++++-------------------------------
 1 files changed, 22 insertions(+), 31 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..e923f27 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
@@ -57,34 +56,19 @@
 
     @Override
     public void stop(UnitCallbackInterface callback) throws Exception {
-        stopUpgradeTask() ;
+        overUpgradeTask() ;
     }
 
 
 
     /**
      * 璁剧疆鍗囩骇浠诲姟
-     * @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) ;
         }
     }
 
@@ -92,9 +76,9 @@
      * 鍋滄褰撳墠鍗囩骇浠诲姟
      * @throws Exception
      */
-    public void stopUpgradeTask() throws Exception {
+    public void overUpgradeTask() throws Exception {
         if(manager != null ){
-            manager.stopUpgradeTask() ;
+            manager.overUpgradeTask() ;
         }
     }
 
@@ -118,37 +102,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