From 4848d738fce796818e7a1714367e2815f6f44636 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 一月 2024 19:01: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/DataCdC0Vo.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
index 997792e..f0a7e83 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
@@ -10,7 +10,7 @@
public Double waterPress; //姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa銆�
public Double batteryVolt;//钃勭數姹犵數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
public Double sunVolt ;//澶槼鑳界數鍘�:4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
- public Integer signal; //淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99銆�
+ public Integer signalValue; //淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99銆�
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
public DataAlarmVo alarmVo ;//鎶ヨ
public DataStateVo stateVo ;//鐘舵��
@@ -36,15 +36,19 @@
sb.append(sunVolt==null?"":sunVolt);
sb.append("\n");
sb.append(" 淇″彿寮哄害锛�");
- sb.append(signal==null?"":signal);
+ sb.append(signalValue ==null?"": signalValue);
sb.append("\n");
sb.append(" 鎺у埗鍣ㄦ椂閽燂細");
sb.append(rtuDt==null?"":rtuDt);
sb.append("\n");
- sb.append(alarmVo==null?"":alarmVo.toString());
- sb.append("\n");
- sb.append(stateVo==null?"":stateVo.toString());
- sb.append("\n");
+ if(alarmVo != null){
+ sb.append(alarmVo.toString());
+ sb.append("\n");
+ }
+ if(stateVo != null){
+ sb.append(stateVo.toString());
+ sb.append("\n");
+ }
return sb.toString() ;
}
--
Gitblit v1.8.0