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/p206V1_0_0/parse/Cd_02_Down.java | 82 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
index 9a28b35..c3f1aa5 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Down.java
@@ -2,17 +2,16 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd02Vo;
import com.dy.common.util.ByteUtil;
-import com.dy.common.util.ByteUtilUnsigned;
-import com.dy.common.util.CRC8_for_2_0;
-import com.dy.common.util.DateTime;
@AnnotationCodeDown(ifAny={
- CodeV1_0_1.cd_06
+ CodeV1_0_1.cd_02
})
public class Cd_02_Down implements CodeParse {
- //private static Logger log = LogManager.getLogger(Cd_XY_Down.class);
+ //private static Logger log = LogManager.getLogger(Cd_02_Down.class);
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback) throws Exception {
@@ -21,20 +20,19 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
- midRs.rtuAddr = para.rtuAddr ;//IMEI鍙凤紙鐢典俊骞冲彴璁惧IMEI锛�
+ midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downCodeName = CodeV1_0_1.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
- midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
- midRs.maxSendTimes = null ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
- midRs.isCachForOffLine = true ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨锛屼綆鍔熻�楁椂涓簍rue
-
- //瀵筊TU涓婅鏁版嵁鐨勫簲绛�
midRs.hasResponse = false ;//鏄惁鏈夊簲绛�
- midRs.maxSendTimes = 1 ;//瀵筊TU涓婅鏁版嵁搴旂瓟锛屾墍浠ュ彧闇�鍙戜竴娆�
+ midRs.maxSendTimes = 1 ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
+ midRs.isCachForOffLine = false ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨锛屼綆鍔熻�楁椂涓簍rue
+
+ midRs.isSendFirst = true ;//鍛戒护搴旂瓟锛岄鍏堝彂閫侊紝闃叉RTU閲嶆柊涓婃姤
if(isLowPower != null && isLowPower.booleanValue()){
- //浣庡姛鑰楁椂
+ //浣庡姛鑰楁椂锛屽敖蹇彂閫�
midRs.isQuickSend = true ;
}
@@ -42,9 +40,9 @@
}
/**
* 鏋勯�犱笅琛屾暟鎹�
- * @param para
- * @return
- * @throws Exception
+ * @param para 鍙傛暟
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
*/
public byte[] doParse(ParseParamsForDownV1_0_1 para) throws Exception {
CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1() ;
@@ -60,38 +58,50 @@
bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
index++ ;
- bsHead[index] = commonV1_0_1.createCtrl((byte)0) ;
-
- String rtuAddr = para.rtuAddr ;
- String rtuAddr1 = rtuAddr.substring(0, 6) ;
- String rtuAddr2 = rtuAddr.substring(6) ;
+ bsHead[index] = commonV1_0_1.createCtrl((byte)0, (byte)0) ;
index++ ;
- ByteUtil.string2BCD_BE(bsHead, rtuAddr1, index) ;
- index += 3 ;
-
- Integer rtuAddr2Int = Integer.parseInt(rtuAddr2) ;
- ByteUtilUnsigned.short2Bytes_BE(bsHead, rtuAddr2Int.shortValue(), index);
- index += 2 ;
+ GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
+ index += 5 ;
ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
byte[] bs = new byte[7] ;
- bs[0] = (byte)0xF2 ;
- ByteUtil.string2BCD_BE(bs, DateTime.yyMMddhhmmss(), 1) ;
+
+ Integer loginFlag = 0xF2 ;
+ if(para.param != null && para.param instanceof DataCd02Vo){
+ DataCd02Vo vo = (DataCd02Vo)para.param ;
+ if(vo != null && vo.status != null){
+ loginFlag = Integer.parseInt(vo.status, 16);
+ }
+ }
+ bs[0] = loginFlag.byteValue() ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
+ GlCreate.createTp(bs, 1);
bytes = ByteUtil.bytesMerge(bsHead, bs) ;
- int len = bytes.length + ProtocolConstantV206V1_0_0.lenTail;
- bytes[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
- int crc = new CRC8_for_2_0().CRC8(bytes, ProtocolConstantV206V1_0_0.ctrlIndex, bytes.length -1) ;
- bs = new byte[ProtocolConstantV206V1_0_0.lenTail] ;
- bs[0] = (byte)crc ;
- bs[1] = ProtocolConstantV206V1_0_0.P_Tail_Byte ;
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
return bytes ;
}
+ public static void main(String[] args) throws Exception{
+ ParseParamsForDownV1_0_1 p = new ParseParamsForDownV1_0_1() ;
+ p.commandCode = "02" ;
+ p.rtuAddr = "9672950001";
+
+ Cd_02_Down obj = new Cd_02_Down() ;
+ byte[] bs = obj.doParse(p) ;
+
+ String hex1 = ByteUtil.bytes2Hex(bs,true) ;
+ String hex2 = ByteUtil.bytes2Hex(bs,false) ;
+
+ System.out.println(hex1);
+ System.out.println(hex2);
+ }
+
}
--
Gitblit v1.8.0