From efa19855d33d76f68d22dd4fe978db041dda2f74 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 08:47:37 +0800
Subject: [PATCH] 修改RTU上行数据log4j日志显示方式（首行换行）与内容（上行数据+命令应答数据）
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
index be815e8..9500a15 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_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 ;//鍗忚鍚嶇О
@@ -59,6 +59,7 @@
confirmCommand.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
confirmCommand.commandId = Command.defaultId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
confirmCommand.downCode = confirmComCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ confirmCommand.downCodeName = CodeV202404.getCodeName(confirmComCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
confirmCommand.downBuffer = data ;//涓嬭鍛戒护鏁版嵁
confirmCommand.downBufHex = ByteUtil.bytes2Hex(data, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
confirmCommand.hasResponse = false ;//鏄惁鏈夊簲绛�
@@ -83,7 +84,7 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCd8AVo cdData = new DataCd8AVo() ;
+ DataCd8AVo cdData = new DataCd8AVo(CodeV202404.getCodeName(dataCode)) ;
dV1.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
--
Gitblit v1.8.0