From 2e624b0b3df6bf8e8d6e09992941d4a0e9116a96 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 十月 2024 08:41:01 +0800
Subject: [PATCH] 重新定义并优化RTU上行数据接口
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java
index d30dc83..d178dcf 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_66_Up.java
@@ -2,13 +2,15 @@
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.DataCd66Vo;
+import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* @Author liurunyu
- * @Date 2023/12/23 9:48
- * @LastEditTime 2023/12/23 9:48
+ * @Date 2024/01/13 10:40
+ * @LastEditTime 2024/01/13 10:40
* @Description
*/
@AnnotationCodeUp(ifAny={
@@ -32,7 +34,7 @@
para.upCode,
para.data) ;
}
- log.info("鍒嗘瀽鍛戒护搴旂瓟鏁版嵁<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+ log.info("\n鍒嗘瀽鍛戒护搴旂瓟鏁版嵁<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
MidResultFromRtu midRs = new MidResultFromRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
@@ -56,6 +58,19 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
+ DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
+ DataCd66Vo cdData = new DataCd66Vo() ;
+ dV1.subData = cdData ;
+ short index = ProtocolConstantV206V1_0_0.dataIndex ;
+ String ip1 = "" + ByteUtilUnsigned.byte2Byte(bs, index++) ;
+ String ip2 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
+ String ip3 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
+ String ip4 = "" +ByteUtilUnsigned.byte2Byte(bs, index++) ;
+
+ cdData.ip = ip1 + "." + ip2 + "." + ip3 + "." + ip4 ;
+
+ String port = "" +ByteUtilUnsigned.bytes2Short_BE(bs, index++) ;
+ cdData.port = Integer.parseInt(port) ;
}
}
--
Gitblit v1.8.0