From 67be727c779e1af1058a70232a6bdd8db0bd59c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 25 二月 2025 08:33:14 +0800
Subject: [PATCH] 表阀一体机(王江海制定)通信协议:1、完善关阀类型;2、完善注释。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd68Vo.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd68Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd68Vo.java
index 22705f8..f8e39ca 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd68Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd68Vo.java
@@ -1,13 +1,14 @@
 package com.dy.common.mw.protocol.p206V202404.upVos;
 
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
 import lombok.Data;
 
 //鏌ヨ鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄�
 @Data
 public class DataCd68Vo {
 
-	public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
-	public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+	public String controllerType;//鎺у埗鍣ㄧ被鍨�
+	public Integer projectNo ;//椤圭洰缂栧彿
 	public Integer maxAmountYear ;//鏈轰簳骞存渶澶х敤姘撮噺  鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999
 	public Double limitLevel ;//姘翠綅涓嬮檺 鍗曚綅锛歮 鍙栧�艰寖鍥�:0~9999.99
 
@@ -21,7 +22,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) ;

--
Gitblit v1.8.0