From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java， 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java
index 7a7948d..6fe58e9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_21_Up.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd21Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -59,7 +60,7 @@
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
DataCd21Vo cdData = new DataCd21Vo() ;
- dV1.dataCd21Vo = cdData ;
+ dV1.subData = cdData ;
short index = ProtocolConstantV206V1_0_0.dataIndex ;
String ip1 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
String ip2 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
--
Gitblit v1.8.0