From 276ce2ba5e91523f3c202cce0b0a8bae43630a5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 六月 2025 10:37:21 +0800
Subject: [PATCH] 表阀一体协议与测控一体阀协议进行兼容时，阀门状态位判断未做兼容修改，本次进行修改并进行必要注释。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java | 11 ++++++++---
1 files changed, 8 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 711f28f..9dc7572 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
@@ -1,12 +1,14 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
//鏈轰簳瀹氱偣涓婃姤, 姣忓ぉ12鐐逛笂鎶ユ暟鎹�
@Data
public class DataCd83Vo {
- public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
+ public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿
public Double waterTotalAmountYear ;//鏈勾绱娴侀噺
public Double waterTotalAmountMeter ;//姘磋〃绱娴侀噺
@@ -16,11 +18,14 @@
public Double waterUserTotalAmountDay ;// 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
public Double lossTotalAmountDay ;// 婕忔崯姘撮噺
public Double batteryVolt ;//鍚庡鐢垫睜鐢靛帇
- public String dataDt ;//鏁版嵁鏃堕棿锛坹yyy-mm-dd锛�
+ public String dataDt ;//鏁版嵁鏃堕棿锛坹yyy-mm-dd HH:00:00锛�
public String rtuDt ;//RTU鏃堕挓锛堜笂鎶ユ椂鍒伙級锛坹yyy-mm-dd HH:00:00锛�
public String comName ;//鍛戒护鍚嶇О
+ public DataCd83Vo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_83) ;
+ }
public DataCd83Vo(String comName){
this.comName = comName ;
}
@@ -29,7 +34,7 @@
StringBuffer sb = new StringBuffer() ;
sb.append(" " + comName + " : \n") ;
sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ;
- sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ;
+ sb.append(CommonV202404.ctrlDevType(controllerType)) ;
sb.append("\n") ;
sb.append(" 椤圭洰缂栧彿 : ") ;
sb.append(projectNo == null?"鏈煡":projectNo) ;
--
Gitblit v1.8.0