From 4e4bcc8e95fef11e695d476da4e761399d3c7247 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十一月 2024 09:49:52 +0800
Subject: [PATCH] json传输byte[]数组，转换为base64编码
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
index a8a05fc..5ac27f0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeTask.java
@@ -76,7 +76,7 @@
if(taskVo.softStartAddr == null || taskVo.softStartAddr.trim().length() != 8){
throw new Exception("绋嬪簭瑕嗙洊璧峰鍦板潃涓嶅悎娉曪紝蹇呴』鏄�8瀛楃锛堝崄鍏繘鍒讹級鐨勫瓧绗︿覆") ;
}
- if(taskVo.softFileData == null || taskVo.softFileData.length <= 0){
+ if(taskVo.softFileData64 == null || taskVo.softFileData64.trim().length() == 0){
throw new Exception("鍗囩骇绋嬪簭鍐呭蹇呴』鎻愪緵") ;
}
if(taskVo.softBytesCalculate == null){
@@ -96,7 +96,8 @@
this.taskVo = taskVo ;
this.upgradeRtus = new HashMap<>();
- if(taskVo.softFileData != null && taskVo.softFileData.length >0){
+ if(taskVo.softFileData64 != null && taskVo.softFileData64.trim().equals("")){
+ taskVo.softFileData = Base64.getDecoder().decode(taskVo.softFileData64);
List<byte[]> listBytes = new HexFileParse().splitBytesByUnit512(taskVo.softFileData);
this.softFileDataGrp = listBytes.toArray(new byte[0][]);
for(String rtuAddr : this.taskVo.rtuAddrList){
--
Gitblit v1.8.0