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/parse/HexFileVo.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileVo.java index ff9c96b..47e576b 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileVo.java @@ -19,6 +19,7 @@ public byte[] bytes ; public List<byte[]> listByte512 ; public long totalBytes512 ; + public Integer bytesCrc16 ; public List<String> errors ; public HexFileVo() { @@ -27,6 +28,7 @@ bytes = new byte[0] ; listByte512 = new ArrayList<>() ; totalBytes512 = 0 ; + bytesCrc16 = 0 ; errors = new ArrayList<>() ; } @@ -35,6 +37,7 @@ + "\ncalculateBytes:" + calculateBytes + "\nrealBytes:" + realBytes + "\ntotalBytes512:" + totalBytes512 + + "\nbytesCrc16:" + bytesCrc16 + "\nerrors:" + errors ; if(listByte512.size() > 0){ int counter = 0 ; -- Gitblit v1.8.0