From 23fd053ec297e0ceae3a01fa3a205af05d3aea54 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 11 二月 2025 11:54:47 +0800
Subject: [PATCH] 优化代码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 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..9cadf12 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;
@@ -74,7 +75,7 @@
             }
             return BaseResponseUtils.buildSuccess(po);
         }else{
-            return BaseResponseUtils.buildException("鏈煡璇㈠埌瀵瑰簲鐨勮褰�") ;
+            return BaseResponseUtils.buildErrorMsg("鏈煡璇㈠埌瀵瑰簲鐨勮褰�") ;
         }
     }
     /**
@@ -98,7 +99,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇绋嬪簭寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -123,7 +124,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇绋嬪簭寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -145,14 +146,26 @@
     @SsoAop()
     public BaseResponse<Boolean> save(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid VoRtuProgram vo,  @Parameter(hidden = true) BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        if(vo.storeRamAddr == null
+                || vo.storeRamAddr.trim().equals("")
+                || vo.storeRamAddr.length() != 8
+                || !HexUtil.isHexNumber(vo.storeRamAddr)){
+            return BaseResponseUtils.buildErrorMsg("鍗囩骇绋嬪簭瀛樻斁鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
+        }
+        if(vo.startRamAddr == null
+                || vo.startRamAddr.trim().equals("")
+                || vo.startRamAddr.length() != 8
+                || !HexUtil.isHexNumber(vo.startRamAddr)){
+            return BaseResponseUtils.buildErrorMsg("绋嬪簭瑕嗙洊璧峰鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
         }
         if(vo.file == null){
-            return BaseResponseUtils.buildFail("RTU绋嬪簭鏂囦欢蹇呴』涓婁紶") ;
+            return BaseResponseUtils.buildErrorMsg("RTU绋嬪簭鏂囦欢蹇呴』涓婁紶") ;
         }
         String fileName = vo.file.getOriginalFilename() ;
         if(this.sv.existFileName(fileName)){
-            return BaseResponseUtils.buildFail("RTU绋嬪簭鏂囦欢鍚嶅凡瀛樺湪") ;
+            return BaseResponseUtils.buildErrorMsg("RTU绋嬪簭鏂囦欢鍚嶅凡瀛樺湪") ;
         }
 
         HexFileVo fileVo = null ;
@@ -165,7 +178,7 @@
             }
         }catch (Exception e){
             fileVo = null ;
-            return BaseResponseUtils.buildFail("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父锛�" + e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父锛�" + e.getMessage()) ;
         }
         if(fileVo != null){
             UgRtuProgram po = new UgRtuProgram();
@@ -184,15 +197,15 @@
                 count = this.sv.save(po);
             } catch (Exception e) {
                 log.error("淇濆瓨RTU鍗囩骇绋嬪簭寮傚父", e);
-                return BaseResponseUtils.buildException(e.getMessage()) ;
+                return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
             }
             if(count <= 0){
-                return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+                return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
             }else{
                 return BaseResponseUtils.buildSuccess(true) ;
             }
         }else{
-            return BaseResponseUtils.buildFail("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父") ;
+            return BaseResponseUtils.buildErrorMsg("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父") ;
         }
     }
     /**
@@ -232,17 +245,17 @@
     @SsoAop()
     public BaseResponse<Boolean> delete(Long id){
         if(id == null){
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
         }
         int count;
         try {
             count = this.sv.delete(id);
         } catch (Exception e) {
             log.error("鍒犻櫎RTU鍗囩骇绋嬪簭寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
         if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
         }else{
             return BaseResponseUtils.buildSuccess(true) ;
         }

--
Gitblit v1.8.0