From 035595960558208f47e605ba532544521742f2db Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 15 十月 2024 17:58:46 +0800
Subject: [PATCH] 修改通信中间件内部命令LCD0002,查询统计在线RTU数量,和曾上线但当前离线的RTU数量。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_86_Up.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_86_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_86_Up.java
index 8702fde..f07d675 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_86_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_86_Up.java
@@ -29,7 +29,7 @@
                     para.upCode,
                     para.data) ;
         }
-        log.info("鍒嗘瀽涓婅鏁版嵁<" + CodeV202404.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+        log.info("\n鍒嗘瀽鍛戒护搴旂瓟鏁版嵁<" + CodeV202404.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
 
         MidResultFromRtu midRs = new MidResultFromRtu() ;
         midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
@@ -54,7 +54,7 @@
      */
     protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
         DataV202404 dV1 = (DataV202404)data.getSubData() ;
-        DataCd86Vo cdData = new DataCd86Vo() ;
+        DataCd86Vo cdData = new DataCd86Vo(CodeV202404.getCodeName(dataCode)) ;
         dV1.subData = cdData ;
         int index = ProtocolConstantV206V202404.dataIndex ;
         cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -74,7 +74,7 @@
         cdData.ip = ByteUtil.bytes2String_BE(bs, index, index + ipLen - 1) ;
 
         index += ipLen ;
-        cdData.port = Integer.parseInt(ByteUtil.bytes2String_LE(bs, index, index + portLen - 1)) ;
+        cdData.port = Integer.parseInt(ByteUtil.bytes2String_BE(bs, index, index + portLen - 1)) ;
     }
 
 }

--
Gitblit v1.8.0