From 6bc46afb107bfa9dd6b3b3f5bd21d8fb2e5ac831 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 15 五月 2024 14:33:09 +0800
Subject: [PATCH] 完善王江海制定协议的实现代码。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java |    2 
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java       |   53 +++++++++++++++++
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java    |    2 
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java    |   47 ---------------
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java    |    2 
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java |   46 ---------------
 6 files changed, 57 insertions(+), 95 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
index 2b69dcf..2c5b7fb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
@@ -15,7 +15,7 @@
     public Byte alarmSteal ; //鍋锋按鎶ヨ	(1锛氱粫寮�鎺у埗鍣ㄧ敤姘存姤璀� 0锛氭甯�)
     public Byte alarmWaterMeterBreak ; //娴侀噺璁℃崯鍧忔姤璀�	(1锛氭甯搁�氳浣嗙灛鏃朵负0鎶ヨ 0锛氭甯�)
     public Byte alarmEleMeterFault ; //鐢佃〃鏁呴殰鎶ヨ	(1锛氬拰鐢佃〃閫氳鏂垨鏁版嵁涓嶆甯� 0锛氭甯�)
-    public Byte alarm0MoneyRemain ; //鍓╀綑閲戦涓�0鍏虫车/闃�	(1锛氬墿浣欓噾棰濅负0鎶ヨ  0锛氭甯�)
+    public Byte alarm0MoneyRemain ; //鍓╀綑閲戦涓�0	(1锛氬墿浣欓噾棰濅负0鎶ヨ  0锛氭甯�)
     public Byte alarmInnerDoor ; //鎺у埗鍣ㄥ唴闂ㄦ姤璀�	(1锛氬唴闂ㄦ墦寮�鎶ヨ    0锛氭甯�)
     public Byte alarmOuterDoor ; //鎺у埗鍣ㄥ闂ㄦ姤璀�	(1锛氬闂ㄦ墦寮�鎶ヨ    0锛氭甯�)
     public Byte alarmEleMiss ; //浜ゆ祦缂洪」鎶ヨ	(1锛氫笁鐩哥己椤规姤璀�    0锛氭甯�)
@@ -23,4 +23,55 @@
     public Byte alarmEleLowVolt ; //涓夌浉鐢垫瑺鍘嬫姤璀�	(1锛氭瑺鍘嬫姤璀�        0锛氭甯�)
     public Byte stateIcEnable ; //IC鍗′娇鑳�	(1銆両C鏈夊埛鍗℃敮鎸�    0锛氫笉鏀寔)
 
+    public String toString(){
+        StringBuffer sb = new StringBuffer() ;
+        sb.append("      娉�/闃�鐘舵�� : ") ;
+        sb.append(statePump == null?"鏈煡":(statePump.byteValue()==1?"娉�/闃�寮�":(statePump.byteValue()==0?"娉�/闃�鍏�":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      鍓╀綑姘撮噺鎶ヨ : ") ;
+        sb.append(alarmWaterRemain == null?"鏈煡":(alarmWaterRemain.byteValue() == 0 ? "姝ｅ父":(alarmWaterRemain.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      鍓╀綑姘撮噺涓�0鍏虫车/闃� : ") ;
+        sb.append(alarm0WaterRemain == null?"鏈煡":(alarm0WaterRemain.byteValue() == 0 ? "姝ｅ父":(alarm0WaterRemain.byteValue() == 1 ? "鍓╀綑姘撮噺涓�0鍏虫车/闃�":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      骞村害瓒呴噰 : ") ;
+        sb.append(alarmExceedYear == null?"鏈煡":(alarmExceedYear.byteValue() == 0 ? "姝ｅ父":(alarmExceedYear.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      娴侀噺璁℃晠闅� : ") ;
+        sb.append(alarmWaterMeterFault == null?"鏈煡":(alarmWaterMeterFault.byteValue() == 0 ? "姝ｅ父":(alarmWaterMeterFault.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      鍋锋按 : ") ;
+        sb.append(alarmSteal == null?"鏈煡":(alarmSteal.byteValue() == 0 ? "姝ｅ父":(alarmSteal.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      娴侀噺璁℃崯鍧� : ") ;
+        sb.append(alarmWaterMeterBreak == null?"鏈煡":(alarmWaterMeterBreak.byteValue() == 0 ? "姝ｅ父":(alarmWaterMeterBreak.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      鐢佃〃鏁呴殰 : ") ;
+        sb.append(alarmEleMeterFault == null?"鏈煡":(alarmEleMeterFault.byteValue() == 0 ? "姝ｅ父":(alarmEleMeterFault.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      鍓╀綑0閲戦 : ") ;
+        sb.append(alarm0MoneyRemain == null?"鏈煡":(alarm0MoneyRemain.byteValue() == 0 ? "姝ｅ父":(alarm0MoneyRemain.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      鎺у埗鍣ㄥ唴闂� : ") ;
+        sb.append(alarmInnerDoor == null?"鏈煡":(alarmInnerDoor.byteValue() == 0 ? "姝ｅ父":(alarmInnerDoor.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      鎺у埗鍣ㄥ闂� : ") ;
+        sb.append(alarmOuterDoor == null?"鏈煡":(alarmOuterDoor.byteValue() == 0 ? "姝ｅ父":(alarmOuterDoor.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      浜ゆ祦缂洪」 : ") ;
+        sb.append(alarmEleMiss == null?"鏈煡":(alarmEleMiss.byteValue() == 0 ? "姝ｅ父":(alarmEleMiss.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      浜ゆ祦杩囨祦 : ") ;
+        sb.append(alarmEleExceed == null?"鏈煡":(alarmEleExceed.byteValue() == 0 ? "姝ｅ父":(alarmEleExceed.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      涓夌浉鐢垫瑺鍘� : ") ;
+        sb.append(alarmEleLowVolt == null?"鏈煡":(alarmEleLowVolt.byteValue() == 0 ? "姝ｅ父":(alarmEleLowVolt.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
+        sb.append("\n") ;
+        sb.append("      IC鍗′娇鑳� : ") ;
+        sb.append(stateIcEnable == null?"鏈煡":(stateIcEnable.byteValue() == 0 ? "鏀寔":(stateIcEnable.byteValue() == 1 ? "涓嶆敮鎸�":"鏈煡"))) ;
+        sb.append("\n") ;
+
+        return sb.toString() ;
+    }
+
 }
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
index 91e6a32..06f782a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
@@ -143,51 +143,7 @@
 		sb.append("      姘磋〃宸ヤ綔鐢靛帇 : ") ;
 		sb.append(waterMeterWorkVolt == null?"鏈煡":waterMeterWorkVolt) ;
 		sb.append("\n") ;
-		sb.append("      娉电姸鎬� : ") ;
-		sb.append(statePump == null?"鏈煡":(statePump.byteValue()==1?"娉�/闃�寮�":(statePump.byteValue()==0?"娉�/闃�鍏�":"鏈煡"))) ;
-		sb.append("      鍓╀綑姘撮噺鎶ヨ : ") ;
-		sb.append(alarmWaterRemain == null?"鏈煡":(alarmWaterRemain.byteValue()==1?"灏忎簬鎶ヨ涓婇檺":(alarmWaterRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鍓╀綑姘撮噺涓�0鍏虫车/闃� : ") ;
-		sb.append(alarm0WaterRemain == null?"鏈煡":(alarm0WaterRemain.byteValue()==1?"褰掗浂鍏虫车/闃�":(alarm0WaterRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      骞村害瓒呴噰 : ") ;
-		sb.append(alarmExceedYear == null?"鏈煡":(alarmExceedYear.byteValue()==1?"鎶ヨ":(alarmExceedYear.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      澶栭儴娴侀噺璁℃晠闅� : ") ;
-		sb.append(alarmWaterMeterFault == null?"鏈煡":(alarmWaterMeterFault.byteValue()==1?"鎶ヨ":(alarmWaterMeterFault.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鍋锋按 : ") ;
-		sb.append(alarmSteal == null?"鏈煡":(alarmSteal.byteValue()==1?"鎶ヨ":(alarmSteal.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      娴侀噺璁℃崯鍧� : ") ;
-		sb.append(alarmWaterMeterBreak == null?"鏈煡":(alarmWaterMeterBreak.byteValue()==1?"鎶ヨ":(alarmWaterMeterBreak.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鐢佃〃鏁呴殰 : ") ;
-		sb.append(alarmEleMeterFault == null?"鏈煡":(alarmEleMeterFault.byteValue()==1?"鎶ヨ":(alarmEleMeterFault.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鍓╀綑閲戦涓�0鍏虫车/闃� : ") ;
-		sb.append(alarm0MoneyRemain == null?"鏈煡":(alarm0MoneyRemain.byteValue()==1?"鎶ヨ":(alarm0MoneyRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鎺у埗鍣ㄥ唴闂� : ") ;
-		sb.append(alarmInnerDoor == null?"鏈煡":(alarmInnerDoor.byteValue()==1?"鎶ヨ":(alarmInnerDoor.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鎺у埗鍣ㄥ闂� : ") ;
-		sb.append(alarmOuterDoor == null?"鏈煡":(alarmOuterDoor.byteValue()==1?"鎶ヨ":(alarmOuterDoor.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      浜ゆ祦缂洪」 : ") ;
-		sb.append(alarmEleMiss == null?"鏈煡":(alarmEleMiss.byteValue()==1?"鎶ヨ":(alarmEleMiss.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      浜ゆ祦杩囨祦 : ") ;
-		sb.append(alarmEleExceed == null?"鏈煡":(alarmEleExceed.byteValue()==1?"鎶ヨ":(alarmEleExceed.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      涓夌浉鐢垫瑺鍘� : ") ;
-		sb.append(alarmEleLowVolt == null?"鏈煡":(alarmEleLowVolt.byteValue()==1?"鎶ヨ":(alarmEleLowVolt.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      IC鍗′娇鑳� : ") ;
-		sb.append(stateIcEnable == null?"鏈煡":(stateIcEnable.byteValue()==1?"鏀寔":(stateIcEnable.byteValue()==0?"涓嶆敮鎸�":"鏈煡"))) ;
-		sb.append("\n") ;
-		return sb.toString() ;
+		return sb.toString() + super.toString() ;
 	}
 
 }
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
index e66bf02..f85a148 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
@@ -50,52 +50,7 @@
 		sb.append("      鐢ㄦ埛鍓╀綑姘撮噺 : ") ;
 		sb.append(waterRemainUser == null?"鏈煡":waterRemainUser) ;
 		sb.append("\n") ;
-		sb.append("      娉电姸鎬� : ") ;
-		sb.append(statePump == null?"鏈煡":(statePump.byteValue()==1?"娉�/闃�寮�":(statePump.byteValue()==0?"娉�/闃�鍏�":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鍓╀綑姘撮噺鎶ヨ : ") ;
-		sb.append(alarmWaterRemain == null?"鏈煡":(alarmWaterRemain.byteValue()==1?"灏忎簬鎶ヨ涓婇檺":(alarmWaterRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鍓╀綑姘撮噺涓�0鍏虫车/闃� : ") ;
-		sb.append(alarm0WaterRemain == null?"鏈煡":(alarm0WaterRemain.byteValue()==1?"褰掗浂鍏虫车/闃�":(alarm0WaterRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      骞村害瓒呴噰 : ") ;
-		sb.append(alarmExceedYear == null?"鏈煡":(alarmExceedYear.byteValue()==1?"鎶ヨ":(alarmExceedYear.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      澶栭儴娴侀噺璁℃晠闅� : ") ;
-		sb.append(alarmWaterMeterFault == null?"鏈煡":(alarmWaterMeterFault.byteValue()==1?"鎶ヨ":(alarmWaterMeterFault.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鍋锋按 : ") ;
-		sb.append(alarmSteal == null?"鏈煡":(alarmSteal.byteValue()==1?"鎶ヨ":(alarmSteal.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      娴侀噺璁℃崯鍧� : ") ;
-		sb.append(alarmWaterMeterBreak == null?"鏈煡":(alarmWaterMeterBreak.byteValue()==1?"鎶ヨ":(alarmWaterMeterBreak.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鐢佃〃鏁呴殰 : ") ;
-		sb.append(alarmEleMeterFault == null?"鏈煡":(alarmEleMeterFault.byteValue()==1?"鎶ヨ":(alarmEleMeterFault.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鍓╀綑閲戦涓�0鍏虫车/闃� : ") ;
-		sb.append(alarm0MoneyRemain == null?"鏈煡":(alarm0MoneyRemain.byteValue()==1?"鎶ヨ":(alarm0MoneyRemain.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鎺у埗鍣ㄥ唴闂� : ") ;
-		sb.append(alarmInnerDoor == null?"鏈煡":(alarmInnerDoor.byteValue()==1?"鎶ヨ":(alarmInnerDoor.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      鎺у埗鍣ㄥ闂� : ") ;
-		sb.append(alarmOuterDoor == null?"鏈煡":(alarmOuterDoor.byteValue()==1?"鎶ヨ":(alarmOuterDoor.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      浜ゆ祦缂洪」 : ") ;
-		sb.append(alarmEleMiss == null?"鏈煡":(alarmEleMiss.byteValue()==1?"鎶ヨ":(alarmEleMiss.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      浜ゆ祦杩囨祦 : ") ;
-		sb.append(alarmEleExceed == null?"鏈煡":(alarmEleExceed.byteValue()==1?"鎶ヨ":(alarmEleExceed.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      涓夌浉鐢垫瑺鍘� : ") ;
-		sb.append(alarmEleLowVolt == null?"鏈煡":(alarmEleLowVolt.byteValue()==1?"鎶ヨ":(alarmEleLowVolt.byteValue()==0?"姝ｅ父":"鏈煡"))) ;
-		sb.append("\n") ;
-		sb.append("      IC鍗′娇鑳� : ") ;
-		sb.append(stateIcEnable == null?"鏈煡":(stateIcEnable.byteValue()==1?"鏀寔":(stateIcEnable.byteValue()==0?"涓嶆敮鎸�":"鏈煡"))) ;
-		sb.append("\n") ;
-		return sb.toString() ;
+		return sb.toString() + super.toString() ;
 	}
 
 }
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
index ac1369a..a9d3d1b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
@@ -81,7 +81,7 @@
 		sb.append("      鏈浣跨敤鏃堕棿闀� : ") ;
 		sb.append(thisDuration == null?"鏈煡": thisDuration) ;
 		sb.append("\n") ;
-		return sb.toString() ;
+		return sb.toString() + super.toString() ;
 	}
 
 }
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
index 404d522..f765e31 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd93_A3Vo.java
@@ -85,7 +85,7 @@
 		sb.append("      鏈浣跨敤鏃堕棿闀� : ") ;
 		sb.append(thisDuration == null?"鏈煡": thisDuration) ;
 		sb.append("\n") ;
-		return sb.toString() ;
+		return sb.toString() + super.toString() ;
 	}
 
 }
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
index 4cc96f8..a872100 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
@@ -34,7 +34,7 @@
 		sb.append("      鎵ц缁撴灉 : ") ;
 		sb.append(success == null?"鏈煡":(success?"鎴愬姛":"澶辫触")) ;
 		sb.append("\n") ;
-		return sb.toString() ;
+		return sb.toString() + super.toString() ;
 	}
 
 }

--
Gitblit v1.8.0