From 2376e2d4b76470973d1de29b661ff6f10d883ccd Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 29 八月 2024 10:03:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
index 983a152..9dbf290 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
@@ -9,20 +9,53 @@
public Byte meter ;//娴侀噺璁℃晠闅�
public Byte valve ;//闃�闂�
+ public boolean hasAlarm(){
+ boolean flag = false ;
+ if((batteryVolt != null && batteryVolt == 1) ||
+ (loss != null && loss == 1) ||
+ (meter != null && meter == 1) ||
+ (valve != null && valve == 1)){
+ flag = true ;
+ }
+ return flag ;
+ }
+
+ public String alarmContent(){
+ String txt = "" ;
+ boolean hasTxt = false ;
+ if(batteryVolt != null && batteryVolt == 1){
+ txt += (hasTxt?"銆�":"") + "钃勭數姹犵數鍘嬫姤璀�" ;
+ hasTxt = true ;
+ }
+ if(meter != null && meter == 1){
+ txt += (hasTxt?"銆�":"") + "娴侀噺璁℃晠闅滄姤璀�" ;
+ hasTxt = true ;
+ }
+ if(valve != null && valve == 1){
+ txt += (hasTxt?"銆�":"") + "闃�闂ㄦ晠闅滄姤璀�" ;
+ hasTxt = true ;
+ }
+ if(loss != null && loss == 1){
+ txt += (hasTxt?"銆�":"") + "婕忔崯鎶ヨ" ;
+ hasTxt = true ;
+ }
+ return txt ;
+ }
+
public String toString(){
StringBuilder str = new StringBuilder() ;
str.append(" 鎶ヨ:\n");
str.append(" 钃勭數姹犵數鍘嬶細");
- str.append(batteryVolt==null?"":(batteryVolt==1?"鎶ヨ":"姝ｅ父"));
+ str.append(batteryVolt==null?"":(batteryVolt==1?"鎶ヨ(1)":"姝ｅ父(0)"));
str.append("\n");
- str.append(" 婕忔崯锛�");
- str.append(loss==null?"":(loss==1?"鎶ヨ":"姝ｅ父"));
+ str.append(" 婕忔崯锛� ");
+ str.append(loss==null?"":(loss==1?"鎶ヨ(1)":"姝ｅ父(0)"));
str.append("\n");
str.append(" 娴侀噺璁℃晠闅滐細");
- str.append(meter==null?"":(meter==1?"鎶ヨ":"姝ｅ父"));
+ str.append(meter==null?"":(meter==1?"鎶ヨ(1)":"姝ｅ父(0)"));
str.append("\n");
- str.append(" 闃�闂細");
- str.append(valve==null?"":(valve==1?"鎶ヨ":"姝ｅ父"));
+ str.append(" 闃�闂細 ");
+ str.append(valve==null?"":(valve==1?"鎶ヨ(1)":"姝ｅ父(0)"));
return str.toString() ;
}
}
--
Gitblit v1.8.0