From 0639f7feede9614a98f64450792cc83f58f80a84 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 17:00:54 +0800
Subject: [PATCH] 与测控一体阀兼容
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
index 58a83c6..d0d302a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd85Vo.java
@@ -1,5 +1,7 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -25,9 +27,13 @@
public Double thisWater ;//鏈浣跨敤姘撮噺, 鍗曚綅0.01绔嬫柟绫�
public Double thisMoney ;//鏈浣跨敤閲戦, 鍗曚綅0.0001鍏�
public Integer thisDuration;//鏈浣跨敤鏃堕棿闀�, 鍗曚綅锛氬垎閽�
+ public Double price ;//姘翠环
public String comName ;//鍛戒护鍚嶇О
+ public DataCd85Vo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_85) ;
+ }
public DataCd85Vo(String comName){
this.comName = comName ;
}
@@ -43,7 +49,7 @@
sb.append(projectNo == null?"鏈煡":projectNo) ;
sb.append("\n") ;
sb.append(" 鍏虫车/闃�绫诲瀷 : ") ;
- sb.append(CommonV202404.closeValveType(clType)) ;
+ sb.append(CommonV1.openCloseValveType(clType)) ;//鍦ㄨВ鏋愮殑鏃跺�欙紝宸茬粡鍋氫簡鍏煎杞崲
sb.append("\n") ;
sb.append(" IC鍗″湴鍧� : ") ;
sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
@@ -84,6 +90,9 @@
sb.append(" 鏈浣跨敤鏃堕棿闀� : ") ;
sb.append(thisDuration == null?"鏈煡": thisDuration) ;
sb.append("\n") ;
+ sb.append(" 姘翠环 : ") ;
+ sb.append(price == null?"鏈煡":price) ;
+ sb.append("\n") ;
return sb.toString() + super.toString() ;
}
--
Gitblit v1.8.0