From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 二月 2025 17:42:45 +0800
Subject: [PATCH] 1、代码完善； 2、江海协议解析不正确处修改，如金额是4位小数； 3、根据江海协议，新建RTU模拟器模块，可以上报心跳、开阀、关阀数据。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java
index 0be4b8b..3bce602 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java
@@ -2,12 +2,10 @@
public class CodeV202404 {
//鍔熻兘鐮佷负瀛楃涓诧紝鍗佸叚杩涘埗鏁版嵁
- public static final String cd_02 = "02" ;//閾捐矾妫�娴�
+ public static final String cd_02 = "02" ;//閾捐矾妫�娴� 涓诲姩涓婃姤
public static final String cd_10 = "10" ;//璁剧疆璁惧缁堢鍦板潃
public static final String cd_8A = "8A" ;//璁惧鐧诲綍
public static final String cd_50 = "50" ; //鏌ヨ璁惧缁堢鍦板潃
- public static final String cd_80 = "80" ; //璁惧缁堢宸ヤ綔涓婃姤
- public static final String cd_81 = "81" ; //璁惧缁堢闅忔満鑷姤
public static final String cd_5B = "5B" ; //鏌ヨ璁惧缁堢瀹炴椂鍊�
public static final String cd_65 = "65" ; //鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍
public static final String cd_97 = "97" ; //娓呴櫎璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍
@@ -26,10 +24,12 @@
public static final String cd_93 = "93" ; //骞冲彴杩滅▼鍏抽棴姘存车/闃�闂�
public static final String cd_A2 = "A2" ; //APP杩滅▼寮�鍚按娉�/闃�闂�
public static final String cd_A3 = "A3" ; //APP杩滅▼鍏抽棴姘存车/闃�闂�
- public static final String cd_83 = "83" ; //閬ユ祴缁堢瀹氱偣涓婃姤
- public static final String cd_84 = "84" ; //鍒峰崱寮�娉�/闃�涓婃姤
- public static final String cd_85 = "85" ; //鍒峰崱鍏虫车/闃�涓婃姤
- public static final String cd_9A = "9A" ; //娓呴櫎骞寸敤姘撮噺鍜屽勾鐢ㄧ數閲�
+ public static final String cd_80 = "80" ; //璁惧缁堢宸ヤ綔涓婃姤 涓诲姩涓婃姤
+ 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" ; //鍒峰崱鍏虫车/闃�涓婃姤 涓诲姩涓婃姤
+ public static final String cd_9A = "9A" ; //鏌ヨ骞寸敤姘撮噺
public static final String cd_26 = "26" ; //璁剧疆璁惧缁堢骞寸敤姘撮噺
public static final String cd_21 = "21" ; //璁剧疆璁惧缁堢IP鍦板潃
public static final String cd_86 = "86" ; //鏌ヨ璁惧缁堢IP鍦板潃
@@ -41,6 +41,14 @@
public static final String cd_9B = "9B" ; //娓呴櫎璁惧缁堢娉ㄥ唽鍙�
public static final String cd_9C = "9C" ; //榛戝悕鍗曡繙绋嬪己鍒跺叧闂按娉�/闃�闂�
public static final String cd_C2 = "C2" ; //寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤
+
+ public static final String cd_1600 = "1600" ;//鍗囩骇澶嶄綅
+ public static final String cd_1601 = "1601" ;//鍗囩骇閰嶇疆
+ public static final String cd_1602 = "1602" ;//鍗囩骇鏁版嵁
+ public static final String cd_1603 = "1603" ;//鍗囩骇鏍￠獙
+ public static final String cd_9601 = "9601" ;//鍗囩骇閰嶇疆
+ public static final String cd_9602 = "9602" ;//鍗囩骇鏁版嵁
+ public static final String cd_9603 = "9603" ;//鍗囩骇鏍￠獙
public static String getCodeName(String code) {
String name = (code.equals(cd_02) ? "閾捐矾妫�娴�" :
@@ -70,7 +78,7 @@
(code.equals(cd_83) ? "閬ユ祴缁堢瀹氱偣涓婃姤" :
(code.equals(cd_84) ? "鍒峰崱寮�娉�/闃�涓婃姤" :
(code.equals(cd_85) ? "鍒峰崱鍏虫车/闃�涓婃姤" :
- (code.equals(cd_9A) ? "娓呴櫎骞寸敤姘撮噺鍜屽勾鐢ㄧ數閲�" :
+ (code.equals(cd_9A) ? "鏌ヨ骞寸敤姘撮噺" :
(code.equals(cd_26) ? "璁剧疆璁惧缁堢骞寸敤姘撮噺" :
(code.equals(cd_21) ? "璁剧疆璁惧缁堢IP鍦板潃" :
(code.equals(cd_86) ? "鏌ヨ璁惧缁堢IP鍦板潃" :
@@ -81,8 +89,18 @@
(code.equals(cd_25) ? "璁剧疆璁惧缁堢閲嶆柊娉ㄥ唽" :
(code.equals(cd_9B) ? "娓呴櫎璁惧缁堢娉ㄥ唽鍙�" :
(code.equals(cd_9C) ? "榛戝悕鍗曡繙绋嬪己鍒跺叧闂按娉�/闃�闂�" :
- (code.equals(cd_C2) ? "寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤" :
- ""))))))))))))))))))))))))))))))))))))))) ;
+ (code.equals(cd_C2) ? "寮�鍏虫按娉�/闃�闂ㄧ粨鏋滀笂鎶�" :
+ (code.equals(cd_1600) ? "鍗囩骇澶嶄綅" :
+ (code.equals(cd_1601) ? "鍗囩骇閰嶇疆" :
+ (code.equals(cd_1602) ? "鍗囩骇鏁版嵁" :
+ (code.equals(cd_1603) ? "鍗囩骇鏍￠獙" :
+ (code.equals(cd_9601) ? "鍗囩骇閰嶇疆" :
+ (code.equals(cd_9602) ? "鍗囩骇鏁版嵁" :
+ (code.equals(cd_9603) ? "鍗囩骇鏍￠獙" :
+ "")))))))))))))))))))))))))))))))))))))))))))))) ;
+ if(name == null || name.equals("")){
+ name = code ;
+ }
return name ;
}
--
Gitblit v1.8.0