From 1e567af8bbdda31ce3342cd41bb40157168b3da9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCdC2Vo.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 6efe833..8cebaa7 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
@@ -4,17 +4,24 @@
//寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤
@Data
-public class DataCdC2Vo {
+public class DataCdC2Vo extends AlarmVo {
public String controllerType ;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
public Integer projectNo ;//椤圭洰缂栧彿:
public Byte opType1 ;//鎿嶄綔鏂瑰紡锛�0:鍒峰崱寮�姘存车/闃�闂紱1:杩滅▼寮�姘存车/闃�闂紱2:APP寮�姘存车/闃�闂�
public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴
public Boolean success ;//鎵ц缁撴灉锛坱rue鎴愬姛, false澶辫触锛�
+ 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") ;
@@ -27,10 +34,13 @@
sb.append(" 寮�鍚叧闂� : ") ;
sb.append(opType2 == null?"鏈煡":(opType2.byteValue()==0?"寮�鍚按娉�/闃�闂�":(opType2.byteValue()==1?"鍏抽棴姘存车/闃�闂�":"鏈煡"))) ;
sb.append("\n") ;
+ sb.append(" 璁惧鏃堕挓 : ") ;
+ 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