From 4dd54a206d8c08823d640dfbc26dcd3e56b3898b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 03 八月 2024 11:35:53 +0800
Subject: [PATCH] 1、完善代码； 2、增加查询系统CPU、内存、JVM、系统、磁盘等信息的工具类。
---
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 fcae238..25bd859 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,48 @@
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() ;
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(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(valve==null?"":(valve==1?"鎶ヨ(1)":"姝ｅ父(0)"));
return str.toString() ;
}
}
--
Gitblit v1.8.0