From 8043346013cac57ba9e0b74ec68408a463c84c18 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 31 七月 2024 16:38:03 +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 | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 c4cb401..86c3e72 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
@@ -6,8 +6,36 @@
public class DataAlarmVo {
public Byte batteryVolt ;// 钃勭數姹犵數鍘�
public Byte loss ;//婕忔崯
- public Byte meter ;//浠〃
+ 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 = "" ;
+ if(batteryVolt != null && batteryVolt == 1){
+ txt += "钃勭數姹犵數鍘嬫姤璀�" ;
+ }
+ if(meter != null && meter == 1){
+ txt += "锛屾祦閲忚鏁呴殰鎶ヨ" ;
+ }
+ if(valve != null && valve == 1){
+ txt += "锛岄榾闂ㄦ晠闅滄姤璀�" ;
+ }
+ if(loss != null && loss == 1){
+ txt += "锛屾紡鎹熸姤璀�" ;
+ }
+ return txt ;
+ }
public String toString(){
StringBuilder str = new StringBuilder() ;
@@ -15,13 +43,13 @@
str.append(" 钃勭數姹犵數鍘嬶細");
str.append(batteryVolt==null?"":(batteryVolt==1?"鎶ヨ":"姝ｅ父"));
str.append("\n");
- str.append(" 婕忔崯锛�");
+ str.append(" 婕忔崯锛� ");
str.append(loss==null?"":(loss==1?"鎶ヨ":"姝ｅ父"));
str.append("\n");
- str.append(" 浠〃锛�");
+ str.append(" 娴侀噺璁℃晠闅滐細");
str.append(meter==null?"":(meter==1?"鎶ヨ":"姝ｅ父"));
str.append("\n");
- str.append(" 闃�闂細");
+ str.append(" 闃�闂細 ");
str.append(valve==null?"":(valve==1?"鎶ヨ":"姝ｅ父"));
return str.toString() ;
}
--
Gitblit v1.8.0