From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_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_93_A3_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
index 04d371d..bcdd33a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
@@ -30,7 +30,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 ;//鍗忚鍚嶇О
@@ -55,10 +55,10 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCd93_A3Vo cdData = new DataCd93_A3Vo() ;
+ DataCd93_A3Vo cdData = new DataCd93_A3Vo(CodeV202404.getCodeName(dataCode)) ;
dV1.subData = cdData ;
- GlParse.parseCd93A3And85(bs, cdData) ;
+ GlParse.parseCd93A3(bs, cdData) ;
}
}
--
Gitblit v1.8.0