From 3511619ad42e1706b1e798bf846426f1083bc63d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 01 七月 2024 15:44:32 +0800
Subject: [PATCH] 靳总协议与王工协议开关阀报数据库层面统一在一起。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 2c5b7fb..b9f58f6 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
@@ -31,8 +31,8 @@
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(" 鍓╀綑0姘撮噺鍏虫车/闃� : ") ;
+ sb.append(alarm0WaterRemain == null?"鏈煡":(alarm0WaterRemain.byteValue() == 0 ? "姝ｅ父":(alarm0WaterRemain.byteValue() == 1 ? "鍏虫车/闃�":"鏈煡"))) ;
sb.append("\n") ;
sb.append(" 骞村害瓒呴噰 : ") ;
sb.append(alarmExceedYear == null?"鏈煡":(alarmExceedYear.byteValue() == 0 ? "姝ｅ父":(alarmExceedYear.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
@@ -49,8 +49,8 @@
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(" 鍓╀綑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 ? "鎶ヨ":"鏈煡"))) ;
@@ -67,8 +67,8 @@
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(" IC鍗″姛鑳� : ") ;
+ sb.append(stateIcEnable == null?"鏈煡":(stateIcEnable.byteValue() == 0 ? "鏃犳晥":(stateIcEnable.byteValue() == 1 ? "鏈夋晥":"鏈煡"))) ;
sb.append("\n") ;
return sb.toString() ;
--
Gitblit v1.8.0