From 823cbaa8e120a6fc2e72a4e62c06d375cc821562 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 15 一月 2024 17:24:02 +0800 Subject: [PATCH] 1、增加流浪控制器实体(和数据库表); 2、修改部分通信协议实现; 3、增加部分通信协议实现; 4、增加通信中间件RTU上行数据处理任务树部分节点。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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 b633bba..1669ec7 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 @@ -6,12 +6,16 @@ public static final String cd_10 = "10" ;//璁剧疆閬ユ祴绔欑粓绔湴鍧� public static final String cd_21 = "21" ;//璁剧疆鏈嶅姟绔疘P鍜岀鍙� public static final String cd_50 = "50" ;//鏌ヨ閬ユ祴绔欑粓绔湴鍧� + public static final String cd_65 = "65" ;//鏌ヨIP鍜岀鍙� public static final String cd_66 = "66" ;//鏌ヨ闃�闂ㄧ姸鎬�(闈虫�绘妸璇ュ懡浠よ璁℃垚鍙祴83鍔熻兘鐮佹暟鎹殑鍛戒护浜嗭紝鍥犱负杩欎釜鍛戒护鍥炴墽娌℃湁闃�闂ㄧ姸鎬佹暟鎹煙锛屾墍浠ヨ繖涓懡浠ゅ彧鑳戒綔涓哄彫娴嬪懡浠ょ敤浜�) public static final String cd_71 = "71" ;//璁剧疆宸ヤ綔妯″紡锛堟潕澶╄祼鍒跺畾鐨勫崗璁紝褰撳墠鏈疄鐜帮級 + 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_92 = "92" ;//閬ユ帶鍚姩闃�闂� public static final String cd_93 = "93" ;//閬ユ帶鍏抽棴闃�闂� + public static final String cd_97 = "97" ;//APP杩滅▼寮�闃� + public static final String cd_98 = "98" ;//APP杩滅▼鍏抽榾 public static final String cd_C0 = "C0" ;//閬ユ祴绔欒嚜鎶ュ疄鏃舵暟鎹� public static String getCodeName(String code) { @@ -19,14 +23,18 @@ (code.equals(cd_10) ? "璁剧疆閬ユ祴绔欑粓绔湴鍧�" : (code.equals(cd_21) ? "璁剧疆IP鍜岀鍙�" : (code.equals(cd_50) ? "鏌ヨ閬ユ祴绔欑粓绔湴鍧�" : + (code.equals(cd_65) ? "鏌ヨIP鍜岀鍙�" : (code.equals(cd_66) ? "鏌ヨ闃�闂ㄧ姸鎬�" : (code.equals(cd_71) ? "璁剧疆宸ヤ綔妯″紡" : + (code.equals(cd_81) ? "闅忔満鑷姤" : (code.equals(cd_83) ? "寮�鍏抽榾鑷姤" : (code.equals(cd_84) ? "寮�闃�宸ヤ綔鎶�" : (code.equals(cd_92) ? "閬ユ帶鍚姩闃�闂�" : (code.equals(cd_93) ? "閬ユ帶鍏抽棴闃�闂�" : + (code.equals(cd_97) ? "APP杩滅▼寮�闃�" : + (code.equals(cd_98) ? "PP杩滅▼鍏抽榾" : (code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" : - ""))))))))))) ; + ""))))))))))))))) ; return name ; } -- Gitblit v1.8.0