From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 15 五月 2024 16:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 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() ;
+ }
+
}
--
Gitblit v1.8.0