From 2b6cd5a6e64e00b365707468d600085259d2f069 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 十二月 2024 16:13:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 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..c1f02d0 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,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 "閫氫俊涓棿浠跺唴閮ㄩ敊璇�" ;
}
}
@@ -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