From 267e622c876bea09b61af34fc93cd08b022aa423 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 05 十二月 2024 14:50:40 +0800
Subject: [PATCH] 1、优化代码; 2、实现新功能:查询RTU设备在通信中间件中的状态。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java
index f0e1586..711f28f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java
@@ -7,7 +7,7 @@
 public class DataCd83Vo {
 
 	public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
-	public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+	public Integer projectNo ;//椤圭洰缂栧彿
 	public Double waterTotalAmountYear ;//鏈勾绱娴侀噺
 	public Double waterTotalAmountMeter ;//姘磋〃绱娴侀噺
 	public Double eleTotalAmountYear ;//鏈勾绱鐢甸噺
@@ -16,11 +16,18 @@
 	public Double waterUserTotalAmountDay ;// 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
 	public Double lossTotalAmountDay ;// 婕忔崯姘撮噺
 	public Double batteryVolt ;//鍚庡鐢垫睜鐢靛帇
-	public Double rtuDt ;//涓婃姤鏃堕棿锛坹yyy-mm-dd HH锛�
+	public String dataDt ;//鏁版嵁鏃堕棿锛坹yyy-mm-dd锛�
+	public String rtuDt ;//RTU鏃堕挓锛堜笂鎶ユ椂鍒伙級锛坹yyy-mm-dd HH:00:00锛�
+
+	public String comName ;//鍛戒护鍚嶇О
+
+	public DataCd83Vo(String comName){
+		this.comName = comName ;
+	}
 
 	public String toString(){
 		StringBuffer sb = new StringBuffer() ;
-		sb.append("      鏈轰簳瀹氱偣涓婃姤(姣忓ぉ12鐐逛笂鎶�) : \n") ;
+		sb.append("      " + comName + " : \n") ;
 		sb.append("      鎺у埗鍣ㄧ被鍨� : ") ;
 		sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ;
 		sb.append("\n") ;

--
Gitblit v1.8.0