From 267e622c876bea09b61af34fc93cd08b022aa423 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 05 十二月 2024 14:50:40 +0800
Subject: [PATCH] 1、优化代码； 2、实现新功能：查询RTU设备在通信中间件中的状态。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
index 4cc96f8..4b503e9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java
@@ -1,26 +1,38 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
import lombok.Data;
+import lombok.EqualsAndHashCode;
//寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤
@Data
+@EqualsAndHashCode(callSuper=false)
public class DataCdC2Vo extends AlarmVo {
public String controllerType ;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
public Integer projectNo ;//椤圭洰缂栧彿:
+ public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
public Byte opType1 ;//鎿嶄綔鏂瑰紡锛�0:鍒峰崱寮�姘存车/闃�闂紱1:杩滅▼寮�姘存车/闃�闂紱2:APP寮�姘存车/闃�闂�
public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴
public Boolean success ;//鎵ц缁撴灉锛坱rue鎴愬姛, false澶辫触锛�
- public String rutDt ;//璁惧鏃堕挓
+ public String rtuDt;//璁惧鏃堕挓
+
+ public String comName ;//鍛戒护鍚嶇О
+
+ public DataCdC2Vo(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("\n") ;
sb.append(" 椤圭洰缂栧彿 : ") ;
sb.append(projectNo == null?"鏈煡":projectNo) ;
+ sb.append("\n") ;
+ sb.append(" 璁㈠崟鍙� : ") ;
+ sb.append(orderNo == null?"鏈煡":orderNo) ;
sb.append("\n") ;
sb.append(" 鎿嶄綔鏂瑰紡 : ") ;
sb.append(opType1 == null?"鏈煡":(opType1.byteValue()==0?"鍒峰崱":(opType1.byteValue()==1?"杩滅▼":(opType1.byteValue()==2?"App":"鏈煡")))) ;
@@ -29,12 +41,12 @@
sb.append(opType2 == null?"鏈煡":(opType2.byteValue()==0?"寮�鍚按娉�/闃�闂�":(opType2.byteValue()==1?"鍏抽棴姘存车/闃�闂�":"鏈煡"))) ;
sb.append("\n") ;
sb.append(" 璁惧鏃堕挓 : ") ;
- sb.append(rutDt == null?"鏈煡":rutDt) ;
+ sb.append(rtuDt == null?"鏈煡": rtuDt) ;
sb.append("\n") ;
sb.append(" 鎵ц缁撴灉 : ") ;
sb.append(success == null?"鏈煡":(success?"鎴愬姛":"澶辫触")) ;
sb.append("\n") ;
- return sb.toString() ;
+ return sb.toString() + super.toString() ;
}
}
--
Gitblit v1.8.0