From 50864934bd29f13e6014d566630e14a1e8021f19 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 08 五月 2024 13:54:58 +0800
Subject: [PATCH] 1、全部实现王江海制定的协议,但还未联调; 2、通信中间件软件工程改名称为pipIrr-mw-rtu;

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 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 531d4b7..b6c5695 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
@@ -2,6 +2,58 @@
 
 import lombok.Data;
 
+/**
+ * 閬ユ祴绔欒嚜鎶ュ疄鏃舵暟鎹�
+ */
 @Data
 public class DataCdC0Vo {
+    public Double instantAmount; //鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆�
+    public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+    public Double lossAmount; //鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+    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 signalValue; //淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99銆�
+    public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
+    public DataAlarmVo alarmVo ;//鎶ヨ
+    public DataStateVo stateVo ;//鐘舵��
+    public String toString(){
+        StringBuilder sb = new StringBuilder() ;
+        sb.append("   缁堢鑷姤瀹炴椂鏁版嵁:\n");
+        sb.append("      鐬椂娴侀噺锛�");
+        sb.append(instantAmount==null?"":instantAmount);
+        sb.append("\n");
+        sb.append("      绱娴侀噺锛�");
+        sb.append(totalAmount==null?"":totalAmount);
+        sb.append("\n");
+        sb.append("      鎹熷け娴侀噺锛�");
+        sb.append(lossAmount==null?"":lossAmount);
+        sb.append("\n");
+        sb.append("      姘村帇锛�");
+        sb.append(waterPress==null?"":waterPress);
+        sb.append("\n");
+        sb.append("      钃勭數姹犵數鍘嬶細");
+        sb.append(batteryVolt==null?"":batteryVolt);
+        sb.append("\n");
+        sb.append("      澶槼鑳界數鍘嬶細");
+        sb.append(sunVolt==null?"":sunVolt);
+        sb.append("\n");
+        sb.append("      淇″彿寮哄害锛�");
+        sb.append(signalValue ==null?"": signalValue);
+        sb.append("\n");
+        sb.append("      鎺у埗鍣ㄦ椂閽燂細");
+        sb.append(rtuDt==null?"":rtuDt);
+        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