From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 二月 2025 14:33:15 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 1770eee..b41af1a 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.CommonV202404;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -8,7 +9,7 @@
@EqualsAndHashCode(callSuper=false)
public class DataCd80_5BVo extends AlarmVo {
- public String controllerType;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
+ public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿:
public Byte useWaterType ;//鐢ㄦ按鏂瑰紡锛�0x00:姝ｅ父鍒峰崱寮�娉�/闃�鐢ㄦ按 0x01:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按 0x02:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按 0x03:娴嬭瘯鍗★紝0x04:鍏跺畠锛�
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
@@ -59,7 +60,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