From 3878bfa207d6dd0a8a84177a437ec3b3a9a6825d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 14:30:41 +0800
Subject: [PATCH] remote模块远程开关阀逻辑修改
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.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/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
index 464d842..72f672b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.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;
@@ -20,9 +22,13 @@
public Double eleTotalAmount ;//鐢佃〃绱鐢甸噺锛屽崟浣�0.01搴�
public Double moneyRemainUser ;//鐢ㄦ埛鍓╀綑閲戦锛� 鍗曚綅0.01鍏�
public Double waterRemainUser ;//鐢ㄦ埛鍓╀綑姘撮噺锛� 鍗曚綅0.01m3
+ public Double price ;//姘翠环
public String comName ;//鍛戒护鍚嶇О
+ public DataCd84Vo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_84) ;
+ }
public DataCd84Vo(String comName){
this.comName = comName ;
}
@@ -37,7 +43,7 @@
sb.append(projectNo == null?"鏈煡":projectNo) ;
sb.append("\n") ;
sb.append(" 寮�闃�绫诲瀷锛�");
- sb.append(opType==null?"鏈煡": CommonV202404.openValveType(opType));
+ sb.append(opType==null?"鏈煡": CommonV1.openCloseValveType(opType));////鍦ㄨВ鏋愮殑鏃跺�欙紝宸茬粡鍋氫簡鍏煎杞崲
sb.append("\n");
sb.append(" IC鍗″湴鍧� : ") ;
sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
@@ -63,6 +69,9 @@
sb.append(" 鐢ㄦ埛鍓╀綑姘撮噺 : ") ;
sb.append(waterRemainUser == null?"鏈煡":waterRemainUser) ;
sb.append("\n") ;
+ sb.append(" 姘翠环 : ") ;
+ sb.append(price == null?"鏈煡":price) ;
+ sb.append("\n") ;
return sb.toString() + super.toString() ;
}
--
Gitblit v1.8.0