From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 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..79a731d 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
@@ -4,4 +4,53 @@
@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; //鎹熷け娴侀噺锛�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 signal; //淇″彿寮哄害锛�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(signal==null?"":signal);
+ 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