From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
index b4d0d16..e6ea9c8 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
@@ -15,6 +15,7 @@
public String softFileName ;//鍗囩骇绋嬪簭鏂囦欢鍚�
public String softStoreAddr ;//鍗囩骇绋嬪簭瀛樻斁鍦板潃
public String softStartAddr ;//绋嬪簭瑕嗙洊璧峰鍦板潃
+ public String softFileData64 ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁扮粍
public byte[] softFileData ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁扮粍
public Integer softBytesCalculate ;//鏍规嵁鍏紡璁＄畻寰楀埌鐨勬湁鏁堝崌绾х▼搴忓瓧鑺傛暟
public Integer softByteSrc16 ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁癈RC16鏍￠獙鍊�
@@ -27,7 +28,7 @@
" 鍗囩骇绋嬪簭鏂囦欢鍚�=" + softFileName + "\n" +
" 鍗囩骇绋嬪簭瀛樻斁鍦板潃=" + softStoreAddr + "\n" +
" 绋嬪簭瑕嗙洊璧峰鍦板潃=" + softStartAddr + "\n" +
- " 鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁�=" + softFileData.length + "\n" +
+ " 鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁�(base64)=" + softFileData64 + "\n" +
" 鍏紡璁＄畻绋嬪簭瀛楄妭鏁�=" + softBytesCalculate +
" 绋嬪簭CRC16鏍￠獙鍊�=" + softByteSrc16 + "\n" +
" 鍗囩骇鎺у埗鍣ㄦ暟閲�=" + rtuAddrList.size() + "\n" +
--
Gitblit v1.8.0