From 70d7a48cef4ebe004eb2ca411de4667e3d30f1ac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 09 八月 2024 15:38:49 +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 | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 86c3e72..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
@@ -22,17 +22,22 @@
public String alarmContent(){
String txt = "" ;
+ boolean hasTxt = false ;
if(batteryVolt != null && batteryVolt == 1){
- txt += "钃勭數姹犵數鍘嬫姤璀�" ;
+ txt += (hasTxt?"銆�":"") + "钃勭數姹犵數鍘嬫姤璀�" ;
+ hasTxt = true ;
}
if(meter != null && meter == 1){
- txt += "锛屾祦閲忚鏁呴殰鎶ヨ" ;
+ txt += (hasTxt?"銆�":"") + "娴侀噺璁℃晠闅滄姤璀�" ;
+ hasTxt = true ;
}
if(valve != null && valve == 1){
- txt += "锛岄榾闂ㄦ晠闅滄姤璀�" ;
+ txt += (hasTxt?"銆�":"") + "闃�闂ㄦ晠闅滄姤璀�" ;
+ hasTxt = true ;
}
if(loss != null && loss == 1){
- txt += "锛屾紡鎹熸姤璀�" ;
+ txt += (hasTxt?"銆�":"") + "婕忔崯鎶ヨ" ;
+ hasTxt = true ;
}
return txt ;
}
@@ -41,16 +46,16 @@
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