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/DataCd65Vo.java |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd65Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd65Vo.java
index 6c107d7..18b0851 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd65Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd65Vo.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;
 
@@ -20,7 +21,9 @@
 	public Byte useWaterType ;//鐢ㄦ按鏂瑰紡锛�0x00:姝e父鍒峰崱寮�娉�/闃�鐢ㄦ按 0x01:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按 0x02:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按 0x03:娴嬭瘯鍗★紝0x04:鍏跺畠锛�
 
 	public String comName ;//鍛戒护鍚嶇О
-
+	public DataCd65Vo(){
+		this.comName = CodeV202404.getCodeName(CodeV202404.cd_65) ;
+	}
 	public DataCd65Vo(String comName){
 		this.comName = comName ;
 	}
@@ -64,4 +67,44 @@
 		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(useWaterType == null?"鏈煡":(useWaterType.byteValue()==0?"鍒峰崱寮�娉�/闃�":(useWaterType.byteValue()==1?"骞冲彴杩滅▼寮�娉�/闃�":(useWaterType.byteValue()==2?"APP杩滅▼寮�娉�/闃�":(useWaterType.byteValue()==3?"娴嬭瘯鍗″紑娉�/闃�":(useWaterType.byteValue()==4?"鍏朵粬":"鏈煡")))))) ;
+		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(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(rtuStartDt == null?"鏈煡":rtuStartDt) ;
+		sb.append("\n") ;
+		sb.append("鏈缁撴潫鏃堕棿 : ") ;
+		sb.append(rtuEndDt == null?"鏈煡":rtuEndDt) ;
+		sb.append("\n") ;
+		return sb.toString() ;
+	}
 }

--
Gitblit v1.8.0