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/CodeV1_0_1.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
index 4f8929b..9f3feaf 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
@@ -8,20 +8,20 @@
public static final String cd_12 = "12" ;//璁剧疆宸ヤ綔妯″紡锛堟湭瀹炵幇锛�
public static final String cd_1F = "1F" ;//璁剧疆娴侀噺鍙傛暟涓婇檺鍊硷紙鏈疄鐜帮級
public static final String cd_21 = "21" ;//璁剧疆鏈嶅姟绔疘P鍜岀鍙�
- public static final String cd_36 = "36" ;//璁剧疆涓讳俊閬揑P鍜岀鍙�
+ public static final String cd_36 = "36" ;//璁剧疆涓讳俊閬揑P鍜岀鍙�(鏃犳鍛戒护)
public static final String cd_37 = "37" ;//璁剧疆娴侀噺閲囬泦鍛ㄦ湡
public static final String cd_38 = "38" ;//璁剧疆鐢ㄦ埛浣欓鎶ヨ鍊�
public static final String cd_39 = "39" ;//璁剧疆鐢垫睜鐢靛帇鎶ヨ鍊�
public static final String cd_3A = "3A" ;//璁剧疆闃�闂ㄥ牭杞數娴�
public static final String cd_3B = "3B" ;//璁剧疆闃�闂ㄨ秴鏃舵椂闂�
public static final String cd_3C = "3C" ;//璁剧疆鑷姤鍛ㄦ湡
- public static final String cd_3D = "3D" ;//璁剧疆闃舵姘翠环
+ public static final String cd_3D = "3D" ;//璁剧疆闃舵姘翠环锛圧TU鏈疄鐜帮級
public static final String cd_3E = "3E" ;//璁剧疆榛戝悕鍗曪紙鏈疄鐜帮級
public static final String cd_50 = "50" ;//鏌ヨ閬ユ祴绔欑粓绔湴鍧�
- public static final String cd_51 = "51" ;//鏌ヨ鏃堕挓锛堟湭瀹炵幇锛�
+ public static final String cd_51 = "51" ;//鏌ヨ鏃堕挓
public static final String cd_52 = "52" ;//鏌ヨ宸ヤ綔妯″紡锛堟湭瀹炵幇锛�
public static final String cd_53 = "53" ;//鏌ヨ鑷姤绉嶇被鍙婃椂闂撮棿闅旓紙鏈疄鐜帮級
- public static final String cd_5E = "5E" ;//鏌ヨ缁堢鐘舵�佸拰鎶ヨ鐘舵�侊紙鏈疄鐜帮級
+ public static final String cd_5E = "5E" ;//鏌ヨ缁堢鐘舵�佸拰鎶ヨ鐘舵��
public static final String cd_65 = "65" ;//鏌ヨ鑷姤鍛ㄦ湡
public static final String cd_66 = "66" ;//鏌ヨIP鍜岀鍙�
public static final String cd_67 = "67" ;//鏌ヨ娴侀噺閲囬泦鍛ㄦ湡
@@ -29,20 +29,22 @@
public static final String cd_69 = "69" ;//鏌ヨ鐢垫睜鐢靛帇鎶ヨ鍊�
public static final String cd_6A = "6A" ;//鏌ヨ闃�闂ㄥ牭杞數娴佸��
public static final String cd_6B = "6B" ;//鏌ヨ闃�闂ㄨ秴鏃舵椂闂�
- public static final String cd_6D = "6D" ;//鏌ヨ闃舵姘翠环锛堟湭瀹炵幇锛�
- public static final String cd_81 = "81" ;//闅忔満鑷姤鎶�
- public static final String cd_83 = "83" ;//閬ユ祴绔欏紑鍏抽榾鑷姤
- public static final String cd_84 = "84" ;//寮�闃�宸ヤ綔鎶�
+ public static final String cd_6D = "6D" ;//鏌ヨ闃舵姘翠环
+ public static final String cd_81 = "81" ;//闅忔満鑷姤鎶� ok
+ public static final String cd_83 = "83" ;//閬ユ祴绔欏紑鍏抽榾鑷姤 ok
+ public static final String cd_84 = "84" ;//寮�闃�宸ヤ綔鎶� ok
public static final String cd_91 = "91" ;//娓呯┖鍘嗗彶璁板綍
public static final String cd_92 = "92" ;//閬ユ帶鍚姩闃�闂�
public static final String cd_93 = "93" ;//閬ユ帶鍏抽棴闃�闂�
public static final String cd_95 = "95" ;//澶嶄綅缁堢鍙傛暟鍜岀姸鎬侊紙鏈疄鐜帮級
public static final String cd_97 = "97" ;//APP杩滅▼寮�闃�
public static final String cd_98 = "98" ;//APP杩滅▼鍏抽榾
- public static final String cd_99 = "99" ;//瀹氭椂鍏抽榾寮�闃�
- public static final String cd_A0 = "A0" ;//瀹氶噺鍏抽榾寮�闃�
+ public static final String cd_99 = "99" ;//瀹氭椂鍏抽榾寮忓紑闃�
+ public static final String cd_A0 = "A0" ;//瀹氶噺鍏抽榾寮忓紑闃�
+ public static final String cd_A1 = "A1" ;//瀹氭椂鍏抽榾寮忚鍒掑紑闃�
+ public static final String cd_A2 = "A2" ;//瀹氶噺鍏抽榾寮忚鍒掑紑闃�
public static final String cd_B0 = "B0" ;//鏌ヨ瀹炴椂鏁版嵁锛堟湭瀹炵幇锛�
- public static final String cd_C0 = "C0" ;//閬ユ祴绔欐暣鐐逛笂鎶ュ疄鏃舵暟鎹�
+ public static final String cd_C0 = "C0" ;//閬ユ祴绔欐暣鐐逛笂鎶ュ疄鏃舵暟鎹� ok
public static String getCodeName(String code) {
String name = (code.equals(cd_02) ? "閾捐矾妫�娴�" :
@@ -82,11 +84,16 @@
(code.equals(cd_95) ? "澶嶄綅缁堢鍙傛暟鍜岀姸鎬�" :
(code.equals(cd_97) ? "APP杩滅▼寮�闃�" :
(code.equals(cd_98) ? "APP杩滅▼鍏抽榾" :
- (code.equals(cd_99) ? "瀹氭椂鍏抽榾寮�闃�" :
- (code.equals(cd_A0) ? "瀹氶噺鍏抽榾寮�闃�" :
+ (code.equals(cd_99) ? "瀹氭椂鍏抽榾寮忓紑闃�" :
+ (code.equals(cd_A0) ? "瀹氶噺鍏抽榾寮忓紑闃�" :
+ (code.equals(cd_A1) ? "瀹氭椂鍏抽榾寮忚鍒掑紑闃�" :
+ (code.equals(cd_A2) ? "瀹氶噺鍏抽榾寮忚鍒掑紑闃�" :
(code.equals(cd_B0) ? "鏌ヨ瀹炴椂鏁版嵁" :
- (code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" :
- ""))))))))))))))))))))))))))))))))))))))))) ;
+ (code.equals(cd_C0) ? "鑷姤(鏁寸偣)瀹炴椂鏁版嵁" :
+ ""))))))))))))))))))))))))))))))))))))))))))) ;
+ if(name == null || name.equals("")){
+ name = code ;
+ }
return name ;
}
--
Gitblit v1.8.0