From 2b2a90e952c2c59642c41d8af5759ceb51b9e099 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 五月 2024 16:19:14 +0800
Subject: [PATCH] 根据王江海修改完善的协议(20240510),进行协议实现完善。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)

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 879cf50..91e6a32 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
@@ -4,7 +4,7 @@
 
 //璁惧缁堢宸ヤ綔涓婃姤 + 鏌ヨ璁惧缁堢瀹炴椂鍊�
 @Data
-public class DataCd80_5BVo {
+public class DataCd80_5BVo extends AlarmVo {
 
 	public String controllerType;//鎺у埗鍣ㄧ被鍨�:   01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
 	public Integer projectNo ;//椤圭洰缂栧彿:
@@ -46,24 +46,6 @@
 		CSQ鍊煎ぇ浜�18锛氳兘绋冲畾閫氫俊
 	 */
 	public Integer csq ;//鎵嬫満淇″彿寮哄害 CSQ鍊硷紙锛�
-
-	public Byte statePump ; //娉�/闃�鐘舵��	(1锛氬紑娉�/闃�锛�0锛氬叧娉�/闃�)
-	public Byte alarmWaterRemain ; //鍓╀綑姘撮噺鎶ヨ	(1锛氬皬浜庢姤璀︿笂闄愭姤璀� 0锛氭甯�)
-	public Byte alarm0WaterRemain ; //鍓╀綑姘撮噺涓�0鍏虫车/闃�	(1锛氬墿浣欐按閲忎负0鍏虫车  0锛氭甯�)
-	public Byte alarmExceedYear ; //骞村害瓒呴噰鎶ヨ	(1锛氬勾鐢ㄦ按閲忓ぇ浜庨檺鍒舵按閲忔姤璀� 0锛氭甯�)
-	public Byte alarmWaterMeterFault ; //澶栭儴娴侀噺璁℃晠闅�	(1锛氭祦閲忚鏁呴殰鎶ヨ 0锛氭甯�)
-	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 alarmInnerDoor ; //鎺у埗鍣ㄥ唴闂ㄦ姤璀�	(1锛氬唴闂ㄦ墦寮�鎶ヨ    0锛氭甯�)
-	public Byte alarmOuterDoor ; //鎺у埗鍣ㄥ闂ㄦ姤璀�	(1锛氬闂ㄦ墦寮�鎶ヨ    0锛氭甯�)
-	public Byte alarmEleMiss ; //浜ゆ祦缂洪」鎶ヨ	(1锛氫笁鐩哥己椤规姤璀�    0锛氭甯�)
-	public Byte alarmEleExceed ; //浜ゆ祦杩囨祦鎶ヨ	(1锛氫氦娴佽繃娴佹姤璀�    0锛氭甯�)
-	public Byte alarmEleLowVolt ; //涓夌浉鐢垫瑺鍘嬫姤璀�	(1锛氭瑺鍘嬫姤璀�        0锛氭甯�)
-	public Byte stateIcEnable ; //IC鍗′娇鑳�	(1銆両C鏈夊埛鍗℃敮鎸�    0锛氫笉鏀寔)
-
-
 
 	public String comName ;//鍛戒护鍚嶇О
 

--
Gitblit v1.8.0