From f5658e38d9aaec4fc002f22938646343a7e86c81 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 六月 2024 21:40:27 +0800
Subject: [PATCH] 1、靳总协议功能码调整与增加; 2、实现只有靳总协议中有的整上报数据处理逻辑及数据库设计。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 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 e794d02..67d963e 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
@@ -4,51 +4,68 @@
 	//鍔熻兘鐮佷负瀛楃涓诧紝鍗佸叚杩涘埗鏁版嵁
 	public static final String cd_02 = "02" ;//閬ユ祴绔欓摼璺娴�
 	public static final String cd_10 = "10" ;//璁剧疆閬ユ祴绔欑粓绔湴鍧�
+	public static final String cd_11 = "11" ;//璁剧疆閬ユ祴绔欐椂閽燂紙鏈疄鐜帮級
+	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_35 = "35" ;//璁剧疆鑷姤鍛ㄦ湡
 	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_3E = "3E" ;//璁剧疆榛戝悕鍗曪紙鏈疄鐜帮級
 	public static final String cd_50 = "50" ;//鏌ヨ閬ユ祴绔欑粓绔湴鍧�
+    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_65 = "65" ;//鏌ヨ鑷姤鍛ㄦ湡
 	public static final String cd_66 = "66" ;//鏌ヨIP鍜岀鍙�
-	//public static final String cd_66 = "66" ;//鏌ヨ闃�闂ㄧ姸鎬�(闈虫�绘妸璇ュ懡浠よ璁℃垚鍙祴83鍔熻兘鐮佹暟鎹殑鍛戒护浜嗭紝鍥犱负杩欎釜鍛戒护鍥炴墽娌℃湁闃�闂ㄧ姸鎬佹暟鎹煙锛屾墍浠ヨ繖涓懡浠ゅ彧鑳戒綔涓哄彫娴嬪懡浠ょ敤浜�)
 	public static final String cd_67 = "67" ;//鏌ヨ娴侀噺閲囬泦鍛ㄦ湡
 	public static final String cd_68 = "68" ;//鏌ヨ鐢ㄦ埛浣欓鎶ヨ鍊�
 	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_71 = "71" ;//璁剧疆宸ヤ綔妯″紡锛堟潕澶╄祼鍒跺畾鐨勫崗璁紝褰撳墠鏈疄鐜帮級
+	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_85 = "85" ;//APP寮�闃�宸ヤ綔鎶�
 	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_3C = "3C" ;//璁剧疆姘翠环
-	public static final String cd_6C = "6C" ;//鏌ヨ姘翠环
-	public static final String cd_3D = "3D" ;//璁剧疆榛戝悕鍗�
+	public static final String cd_B0 = "B0" ;//鏌ヨ瀹炴椂鏁版嵁锛堟湭瀹炵幇锛�
 	public static final String cd_C0 = "C0" ;//閬ユ祴绔欒嚜鎶ュ疄鏃舵暟鎹�
 
-	public static String getCodeName(String code) {
+    public static String getCodeName(String code) {
 		String name = (code.equals(cd_02) ? "閾捐矾妫�娴�" :
-			(code.equals(cd_10) ? "璁剧疆閬ユ祴绔欑粓绔湴鍧�" :
+			(code.equals(cd_10) ? "璁剧疆缁堢鍦板潃" :
+			(code.equals(cd_11) ? "璁剧疆缁堢鏃堕挓" :
+			(code.equals(cd_12) ? "璁剧疆缁堢宸ヤ綔妯″紡" :
+			(code.equals(cd_1F) ? "璁剧疆娴侀噺鍙傛暟涓婇檺鍊�" :
 			(code.equals(cd_21) ? "璁剧疆IP鍜岀鍙�" :
-			(code.equals(cd_35) ? "璁剧疆鑷姤鍛ㄦ湡" :
 			(code.equals(cd_36) ? "璁剧疆IP鍜岀鍙�" :
 			(code.equals(cd_37) ? "璁剧疆娴侀噺閲囬泦鍛ㄦ湡" :
 			(code.equals(cd_38) ? "璁剧疆鐢ㄦ埛浣欓鎶ヨ鍊�" :
 			(code.equals(cd_39) ? "璁剧疆鐢垫睜鐢靛帇鎶ヨ鍊�" :
 			(code.equals(cd_3A) ? "璁剧疆闃�闂ㄥ牭杞數娴�" :
 			(code.equals(cd_3B) ? "璁剧疆闃�闂ㄨ秴鏃舵椂闂�" :
-			(code.equals(cd_50) ? "鏌ヨ閬ユ祴绔欑粓绔湴鍧�" :
+            (code.equals(cd_3C) ? "璁剧疆鑷姤鍛ㄦ湡" :
+            (code.equals(cd_3D) ? "璁剧疆姘翠环" :
+            (code.equals(cd_3E) ? "璁剧疆榛戝悕鍗�" :
+			(code.equals(cd_50) ? "鏌ヨ缁堢鍦板潃" :
+			(code.equals(cd_51) ? "鏌ヨ缁堢鏃堕挓" :
+			(code.equals(cd_52) ? "鏌ヨ缁堢宸ヤ綔妯″紡" :
+			(code.equals(cd_53) ? "鏌ヨ鑷姤绉嶇被鍙婃椂闂撮棿闅�" :
+			(code.equals(cd_5E) ? "鏌ヨ缁堢鐘舵�佸拰鎶ヨ鐘舵��" :
 			(code.equals(cd_65) ? "鏌ヨ鑷姤鍛ㄦ湡" :
 			(code.equals(cd_66) ? "鏌ヨIP鍜岀鍙�" :
 			(code.equals(cd_67) ? "鏌ヨ娴侀噺閲囬泦鍛ㄦ湡" :
@@ -56,22 +73,22 @@
 			(code.equals(cd_69) ? "鏌ヨ鐢垫睜鐢靛帇鎶ヨ鍊�" :
 			(code.equals(cd_6A) ? "鏌ヨ闃�闂ㄥ牭杞數娴佸��" :
 			(code.equals(cd_6B) ? "鏌ヨ闃�闂ㄨ秴鏃舵椂闂�" :
-			(code.equals(cd_71) ? "璁剧疆宸ヤ綔妯″紡" :
+            (code.equals(cd_6D) ? "鏌ヨ姘翠环" :
 			(code.equals(cd_81) ? "闅忔満鑷姤" :
 			(code.equals(cd_83) ? "寮�鍏抽榾鑷姤" :
 			(code.equals(cd_84) ? "寮�闃�宸ヤ綔鎶�" :
+			(code.equals(cd_85) ? "APP寮�闃�宸ヤ綔鎶�" :
 			(code.equals(cd_91) ? "娓呯┖鍘嗗彶璁板綍" :
 			(code.equals(cd_92) ? "閬ユ帶鍚姩闃�闂�" :
 			(code.equals(cd_93) ? "閬ユ帶鍏抽棴闃�闂�" :
+			(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_3C) ? "璁剧疆姘翠环" :
-			(code.equals(cd_6C) ? "鏌ヨ姘翠环" :
-			(code.equals(cd_3D) ? "璁剧疆榛戝悕鍗�" :
+			(code.equals(cd_B0) ? "鏌ヨ瀹炴椂鏁版嵁" :
 			(code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" :
-			""))))))))))))))))))))))))))))))))) ;
+			"")))))))))))))))))))))))))))))))))))))))))) ;
 		return name ;
 	}
 

--
Gitblit v1.8.0