From b218f31bb202cffa656fa4ee09bdd8d67f8ed0ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 13 五月 2025 17:29:42 +0800
Subject: [PATCH] 1、根据江海调整，功能码92、A2的应答中的日期时间去除； 2、表阀一体机的开关阀上行数据（84、85）处理逻辑进行修改。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd5CVo.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd5CVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd5CVo.java
index a563255..15939ef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd5CVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd5CVo.java
@@ -1,5 +1,6 @@
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;
@@ -16,6 +17,9 @@
public String comName ;//鍛戒护鍚嶇О
+ public DataCd5CVo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_5C) ;
+ }
public DataCd5CVo(String comName){
this.comName = comName ;
}
@@ -44,4 +48,30 @@
return sb.toString() ;
}
+ public String toStr(boolean showBase){
+ StringBuffer sb = new StringBuffer() ;
+ if(showBase){
+ sb.append(comName + " : \n") ;
+ sb.append("鎺у埗鍣ㄧ被鍨� : ") ;
+ sb.append(CommonV202404.ctrlDevType(controllerType)) ;
+ sb.append("\n") ;
+ sb.append("椤圭洰缂栧彿 : ") ;
+ sb.append(projectNo == null?"鏈煡":projectNo) ;
+ sb.append("\n") ;
+ }
+ sb.append("瑙傚療鏃堕棿 : ") ;
+ sb.append(dt == null?"鏈煡":dt) ;
+ sb.append("\n") ;
+ sb.append("褰撴棩姘磋〃鍑�娴侀噺 : ") ;
+ sb.append(meterAmountDay == null?"鏈煡":meterAmountDay) ;
+ sb.append("\n") ;
+ sb.append("褰撴棩鐢ㄦ埛鐢ㄦ按閲� : ") ;
+ sb.append(farmerAmountDay == null?"鏈煡":farmerAmountDay) ;
+ sb.append("\n") ;
+ sb.append("褰撴棩婕忔崯姘撮噺 : ") ;
+ sb.append(lossAmountDay == null?"鏈煡":lossAmountDay) ;
+ sb.append("\n") ;
+ return sb.toString() ;
+ }
+
}
--
Gitblit v1.8.0