From d2fc819dc069c7b8d338ae52a90a7f38704fac08 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:52:17 +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, 11 insertions(+), 5 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 f3142ac..1417879 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,12 +1,16 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
+import lombok.EqualsAndHashCode;
//寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤
@Data
+@EqualsAndHashCode(callSuper=false)
public class DataCdC2Vo extends AlarmVo {
- public String controllerType ;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
+ public String controllerType ;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿:
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
public Byte opType1 ;//鎿嶄綔鏂瑰紡锛�0:鍒峰崱寮�姘存车/闃�闂紱1:杩滅▼寮�姘存车/闃�闂紱2:APP寮�姘存车/闃�闂�
@@ -15,7 +19,9 @@
public String rtuDt;//璁惧鏃堕挓
public String comName ;//鍛戒护鍚嶇О
-
+ public DataCdC2Vo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_C2) ;
+ }
public DataCdC2Vo(String comName){
this.comName = comName ;
}
@@ -24,7 +30,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) ;
@@ -33,10 +39,10 @@
sb.append(orderNo == null?"鏈煡":orderNo) ;
sb.append("\n") ;
sb.append(" 鎿嶄綔鏂瑰紡 : ") ;
- sb.append(opType1 == null?"鏈煡":(opType1.byteValue()==0?"鍒峰崱":(opType1.byteValue()==1?"杩滅▼":(opType1.byteValue()==2?"App":"鏈煡")))) ;
+ sb.append(opType1 == null?"鏈煡":(opType1.byteValue()==1?"鍒峰崱":(opType1.byteValue()==2?"杩滅▼":(opType1.byteValue()==8?"App":"鏈煡")))) ;
sb.append("\n") ;
sb.append(" 寮�鍚叧闂� : ") ;
- sb.append(opType2 == null?"鏈煡":(opType2.byteValue()==0?"寮�鍚按娉�/闃�闂�":(opType2.byteValue()==1?"鍏抽棴姘存车/闃�闂�":"鏈煡"))) ;
+ sb.append(opType2 == null?"鏈煡":(opType2.byteValue()==0?"寮�鍚按娉�/闃�闂�":(opType2.byteValue()==-1?"鍏抽棴姘存车/闃�闂�":"鏈煡"))) ;
sb.append("\n") ;
sb.append(" 璁惧鏃堕挓 : ") ;
sb.append(rtuDt == null?"鏈煡": rtuDt) ;
--
Gitblit v1.8.0