From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java
index 4d7c8c7..8ef331f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java
@@ -3,7 +3,7 @@
import lombok.Data;
/**
- * 閬ユ祴绔欒嚜鎶ュ疄鏃舵暟鎹�
+ * 閬ユ祴绔欒嚜鎶�(鏁寸偣)瀹炴椂鏁版嵁
*/
@Data
public class DataCdC0Vo {
@@ -12,7 +12,6 @@
public Double lossAmount; //鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public Double waterPress; //姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa銆�
public Double batteryVolt;//钃勭數姹犵數鍘�:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
- public Double sunVolt ;//澶槼鑳界數鍘�:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
public Integer signalValue; //淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99銆�
public Double waterPrice ;//姘翠环:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆�
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
@@ -20,7 +19,7 @@
public DataStateVo stateVo ;//鐘舵��
public String toString(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" 缁堢鑷姤瀹炴椂鏁版嵁:\n");
+ sb.append(" 缁堢鑷姤(鏁寸偣)瀹炴椂鏁版嵁:\n");
sb.append(" 鐬椂娴侀噺锛�");
sb.append(instantAmount==null?"":instantAmount);
sb.append("\n");
@@ -35,9 +34,6 @@
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);
--
Gitblit v1.8.0