From 054f7ae1a4bf38bbb3db00444f13c35ff5ef2162 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 22 十一月 2024 13:38:18 +0800
Subject: [PATCH] 恢复原来配置
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 23a04a4..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,13 +4,13 @@
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.DateTime;
+import com.dy.common.util.ByteUtil;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.voRm.VoRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
+import com.dy.pipIrrGlobal.voUg.VoRtuProgram;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
@@ -142,14 +142,30 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "save", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@SsoAop()
- public BaseResponse<Boolean> save(@RequestBody @Valid VoRtuProgram vo, @Parameter(hidden = true) BindingResult bindingResult){
+ 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());
}
+ 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绋嬪簭鏂囦欢蹇呴』涓婁紶") ;
+ }
+ String fileName = vo.file.getOriginalFilename() ;
+ if(this.sv.existFileName(fileName)){
+ return BaseResponseUtils.buildFail("RTU绋嬪簭鏂囦欢鍚嶅凡瀛樺湪") ;
}
HexFileVo fileVo = null ;
@@ -166,7 +182,7 @@
}
if(fileVo != null){
UgRtuProgram po = new UgRtuProgram();
- po.hexFileName = vo.file.getOriginalFilename() ;
+ po.hexFileName = fileName ;
po.programCalculateBytes = (int)fileVo.calculateBytes ;
po.programCrc16 = fileVo.bytesCrc16 ;
po.programBytes = fileVo.bytes;
--
Gitblit v1.8.0