From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 25 三月 2025 21:40:05 +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/DataCd10Vo.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java index 46ce7db..eec3712 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java @@ -1,20 +1,27 @@ package com.dy.common.mw.protocol.p206V202404.upVos; +import com.dy.common.mw.protocol.p206V202404.CommonV202404; import lombok.Data; //璁剧疆璁惧缁堢鍦板潃 @Data public class DataCd10Vo { - public String controllerType;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣� + public String controllerType;//鎺у埗鍣ㄧ被鍨� public Integer projectNo ;//椤圭洰缂栧彿: public String rtuNewAddr ;//鎺у埗鍣ㄦ柊鍦板潃 + public String comName ;//鍛戒护鍚嶇О + + public DataCd10Vo(String comName){ + this.comName = comName ; + } + public String toString(){ StringBuffer sb = new StringBuffer() ; - sb.append(" 璁剧疆缁堢鍦板潃搴旂瓟 : \n") ; + 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