From 847c9a21a5056884a77443c9d5f1f08919db0a79 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 17:16:03 +0800
Subject: [PATCH] 修改升级协议中的bug，程序存储内存在址增量由0x20改为0x200
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
index a618170..146c7c0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
@@ -144,7 +144,12 @@
BaseResponse res = sendGetRequest2Mw(restTemplate, rqUrl) ;
if(res != null){
if(res.isSuccess()){
- return BaseResponseUtils.buildSuccess(true) ;
+ RtuUpgradeStateReceiverCtrl.afterMwForceOverCurUgTask();
+ String msg = res.getContent()==null?null:(String)res.getContent() ;
+ if(msg == null){
+ msg = res.getMsg() ;
+ }
+ return BaseResponseUtils.buildResult(ResultCodeMsg.RsCode.SUCCESS_CODE, msg, msg) ;
}else{
String msg = res.getContent()==null?null:(String)res.getContent() ;
if(msg == null){
--
Gitblit v1.8.0