From 44180ee779c038ad628fcd847a0b8e2ca9b6f4ee Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 22 十一月 2024 10:46:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
index 4d8fa14..21098a9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
@@ -4,6 +4,7 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.softUpgrade.parse.HexFileParse;
import com.dy.common.softUpgrade.parse.HexFileVo;
+import com.dy.common.util.ByteUtil;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
@@ -147,6 +148,18 @@
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ if(vo.storeRamAddr == null
+ || vo.storeRamAddr.trim().equals("")
+ || vo.storeRamAddr.length() != 8
+ || !HexUtil.isHexNumber(vo.storeRamAddr)){
+ return BaseResponseUtils.buildFail("鍗囩骇绋嬪簭瀛樻斁鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
+ }
+ if(vo.startRamAddr == null
+ || vo.startRamAddr.trim().equals("")
+ || vo.startRamAddr.length() != 8
+ || !HexUtil.isHexNumber(vo.startRamAddr)){
+ return BaseResponseUtils.buildFail("绋嬪簭瑕嗙洊璧峰鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
+ }
if(vo.file == null){
return BaseResponseUtils.buildFail("RTU绋嬪簭鏂囦欢蹇呴』涓婁紶") ;
}
--
Gitblit v1.8.0