From 4fe7ea4fbdc0c45f14d1d8de77e3424f826ba909 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 28 六月 2024 21:39:12 +0800 Subject: [PATCH] 1、靳总协议上行数据处理修改完善; 2、上行数据处理任务修改完善. --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 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 67d963e..02b993f 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 @@ -14,7 +14,7 @@ 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_3C = "3C" ;//璁剧疆鑷姤鍛ㄦ湡 public static final String cd_3D = "3D" ;//璁剧疆闃舵姘翠环 public static final String cd_3E = "3E" ;//璁剧疆榛戝悕鍗曪紙鏈疄鐜帮級 public static final String cd_50 = "50" ;//鏌ヨ閬ユ祴绔欑粓绔湴鍧� @@ -29,11 +29,10 @@ 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_85 = "85" ;//APP寮�闃�宸ヤ綔鎶� + 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" ;//閬ユ帶鍏抽棴闃�闂� @@ -43,7 +42,7 @@ public static final String cd_99 = "99" ;//瀹氭椂鍏抽榾寮�闃� public static final String cd_A0 = "A0" ;//瀹氶噺鍏抽榾寮�闃� 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) ? "閾捐矾妫�娴�" : @@ -77,7 +76,6 @@ (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) ? "閬ユ帶鍏抽棴闃�闂�" : @@ -88,7 +86,7 @@ (code.equals(cd_A0) ? "瀹氶噺鍏抽榾寮�闃�" : (code.equals(cd_B0) ? "鏌ヨ瀹炴椂鏁版嵁" : (code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" : - "")))))))))))))))))))))))))))))))))))))))))) ; + ""))))))))))))))))))))))))))))))))))))))))) ; return name ; } -- Gitblit v1.8.0