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/DataCd5CVo.java |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 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 d7659d8..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,12 +1,14 @@
 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;
 
 //鏌ヨ璁惧缁堢鐨勫巻鍙叉棩璁板綍
 @Data
 public class DataCd5CVo {
 
-	public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
+	public String controllerType;//鎺у埗鍣ㄧ被鍨�
 	public Integer projectNo ;//椤圭洰缂栧彿
 	public String dt ;//瑙傚療鏃堕棿锛坹yyy-mm-dd HH锛�
 	public Double meterAmountDay ;//褰撴棩姘磋〃鍑�娴侀噺锛�2涓皬鏁扮偣
@@ -15,6 +17,9 @@
 
 	public String comName ;//鍛戒护鍚嶇О
 
+	public DataCd5CVo(){
+		this.comName = CodeV202404.getCodeName(CodeV202404.cd_5C) ;
+	}
 	public DataCd5CVo(String comName){
 		this.comName = comName ;
 	}
@@ -23,7 +28,7 @@
 		StringBuffer sb = new StringBuffer() ;
 		sb.append("      " + comName + " : \n") ;
 		sb.append("      鎺у埗鍣ㄧ被鍨� : ") ;
-		sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ;
+		sb.append(CommonV202404.ctrlDevType(controllerType)) ;
 		sb.append("\n") ;
 		sb.append("      椤圭洰缂栧彿 : ") ;
 		sb.append(projectNo == null?"鏈煡":projectNo) ;
@@ -43,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