From f4d206d07eaeabad56e2918edf9799af13bb526e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 12 五月 2025 17:38:12 +0800
Subject: [PATCH] 表阀一体机:web后端系统,实现功能码5B、5C、15、16、22、30、31、50、55、56、65、68、97、98、99远程命令。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 102 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
index b41af1a..ab7ab1d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.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;
 import lombok.EqualsAndHashCode;
@@ -52,6 +53,9 @@
 
 	public String comName ;//鍛戒护鍚嶇О
 
+	public DataCd80_5BVo(){
+		this.comName = CodeV202404.getCodeName(CodeV202404.cd_5B) ;
+	}
 	public DataCd80_5BVo(String comName){
 		this.comName = comName ;
 	}
@@ -149,7 +153,104 @@
 		sb.append("      淇″彿寮哄害 : ") ;
 		sb.append(csq == null?"鏈煡":csq) ;
 		sb.append("\n") ;
-		return sb.toString() + super.toString() ;
+		return sb + super.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(useWaterType == null?"鏈煡":(useWaterType.byteValue()==0?"鍒峰崱寮�娉�/闃�":(useWaterType.byteValue()==1?"骞冲彴杩滅▼寮�娉�/闃�":(useWaterType.byteValue()==2?"APP杩滅▼寮�娉�/闃�":(useWaterType.byteValue()==3?"娴嬭瘯鍗″紑娉�/闃�":(useWaterType.byteValue()==4?"鍏朵粬":"鏈煡")))))) ;
+			sb.append("\n") ;
+		}
+		sb.append("璁㈠崟鍙� : ") ;
+		sb.append(orderNo == null?"鏈煡":orderNo) ;
+		sb.append("\n") ;
+		sb.append("IC鍗″湴鍧� : ") ;
+		sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
+		sb.append("\n") ;
+		sb.append("鐢ㄦ埛鍗″簭鍒楀彿 : ") ;
+		sb.append(icCardNo == null?"鏈煡":icCardNo) ;
+		sb.append("\n") ;
+		sb.append("瑙傚療鏃堕棿 : ") ;
+		sb.append(rtuDt == null?"鏈煡":rtuDt) ;
+		sb.append("\n") ;
+		sb.append("姘翠綅 : ") ;
+		sb.append(waterLevel == null?"鏈煡":waterLevel) ;
+		sb.append("\n") ;
+		sb.append("姘村帇 : ") ;
+		sb.append(waterPress == null?"鏈煡":waterPress) ;
+		sb.append("\n") ;
+		sb.append("鐬椂娴侀噺 : ") ;
+		sb.append(waterInstant == null?"鏈煡":waterInstant) ;
+		sb.append("\n") ;
+		sb.append("姘磋〃绱娴侀噺 : ") ;
+		sb.append(waterTotal == null?"鏈煡":waterTotal) ;
+		sb.append("\n") ;
+		sb.append("鐢佃〃绱鐢甸噺 : ") ;
+		sb.append(eleTotal == null?"鏈煡":eleTotal) ;
+		sb.append("\n") ;
+		sb.append("鐢ㄦ埛鍓╀綑閲戦 : ") ;
+		sb.append(moneyRemain == null?"鏈煡":moneyRemain) ;
+		sb.append("\n") ;
+		sb.append("鐢ㄦ埛鍓╀綑姘撮噺 : ") ;
+		sb.append(waterRemain == null?"鏈煡":waterRemain) ;
+		sb.append("\n") ;
+		sb.append("鏈浣跨敤鐢甸噺 : ") ;
+		sb.append(thisEle == null?"鏈煡":thisEle) ;
+		sb.append("\n") ;
+		sb.append("鏈浣跨敤姘撮噺 : ") ;
+		sb.append(thisWater == null?"鏈煡":thisWater) ;
+		sb.append("\n") ;
+		sb.append("鏈浣跨敤閲戦 : ") ;
+		sb.append(thisMoney == null?"鏈煡":thisMoney) ;
+		sb.append("\n") ;
+		sb.append("鏈浣跨敤鏃堕暱 : ") ;
+		sb.append(thisDuration == null?"鏈煡":thisDuration) ;
+		sb.append("\n") ;
+		sb.append("褰撳墠姘撮噺鍗曚环 : ") ;
+		sb.append(waterPrice == null?"鏈煡":waterPrice) ;
+		sb.append("\n") ;
+		sb.append("褰撳墠鐢甸噺鍗曚环 : ") ;
+		sb.append(elePrice == null?"鏈煡":elePrice) ;
+		sb.append("\n") ;
+		sb.append("浜ゆ祦A鐩哥數鍘� : ") ;
+		sb.append(aVolt == null?"鏈煡":aVolt) ;
+		sb.append("\n") ;
+		sb.append("浜ゆ祦B鐩哥數鍘� : ") ;
+		sb.append(bVolt == null?"鏈煡":bVolt) ;
+		sb.append("\n") ;
+		sb.append("浜ゆ祦C鐩哥數鍘� : ") ;
+		sb.append(cVolt == null?"鏈煡":cVolt) ;
+		sb.append("\n") ;
+		sb.append("浜ゆ祦A鐩哥數娴� : ") ;
+		sb.append(aCurrent == null?"鏈煡":aCurrent) ;
+		sb.append("\n") ;
+		sb.append("浜ゆ祦B鐩哥數娴� : ") ;
+		sb.append(bCurrent == null?"鏈煡":bCurrent) ;
+		sb.append("\n") ;
+		sb.append("浜ゆ祦C鐩哥數娴� : ") ;
+		sb.append(cCurrent == null?"鏈煡":cCurrent) ;
+		sb.append("\n") ;
+		sb.append("鍚庡鐢垫睜鐢靛帇 : ") ;
+		sb.append(batteryVolt == null?"鏈煡":batteryVolt) ;
+		sb.append("\n") ;
+		sb.append("姘磋〃杩滀紶鐢靛帇 : ") ;
+		sb.append(waterMeterTransVolt == null?"鏈煡":waterMeterTransVolt) ;
+		sb.append("\n") ;
+		sb.append("姘磋〃宸ヤ綔鐢靛帇 : ") ;
+		sb.append(waterMeterWorkVolt == null?"鏈煡":waterMeterWorkVolt) ;
+		sb.append("\n") ;
+		sb.append("淇″彿寮哄害 : ") ;
+		sb.append(csq == null?"鏈煡":csq) ;
+		sb.append("\n") ;
+		return sb + super.toStr() ;
+	}
 }

--
Gitblit v1.8.0