From c7c8554e2b9809bc90ac4a43fdaa39dfe16f4ab0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 五月 2025 14:09:32 +0800
Subject: [PATCH] “远程测控”功能返回数据中增加protocol和protocolVersion属性，以备前端做多协议兼容。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java
index 0877502..1b9e9ab 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java
@@ -1,23 +1,31 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�
@Data
public class DataCd92_A2Vo {
- public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
- public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+ public String controllerType;//鎺у埗鍣ㄧ被鍨�
+ public Integer projectNo ;//椤圭洰缂栧彿
public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- public Byte opType ;//寮�闃�绫诲瀷: 01:骞冲彴寮�娉�/闃� 02:鐢ㄦ埛寮�娉�/闃�
+ public String opDt ;//寮�娉�/闃�鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛�
+ public Byte opType ;//寮�闃�绫诲瀷
public Byte opResult ;//寮�鍚车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
+
+ public String comName ;//鍛戒护鍚嶇О
+
+ public DataCd92_A2Vo(String comName){
+ this.comName = comName ;
+ }
public String toString(){
StringBuffer sb = new StringBuffer() ;
- sb.append(" 骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂� : \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) ;
@@ -28,11 +36,14 @@
sb.append(" 璁㈠崟鍙� : ") ;
sb.append(orderNo == null?"鏈煡":orderNo) ;
sb.append("\n") ;
+ sb.append(" 寮�娉�/闃�鏃堕棿 : ") ;
+ sb.append(opDt == null?"鏈煡":opDt) ;
+ sb.append("\n") ;
sb.append(" 寮�鍚车/闃�绫诲瀷 : ") ;
sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x01 ? "骞冲彴":"鐢ㄦ埛")) ;
sb.append("\n") ;
sb.append(" 寮�鍚车/闃�缁撴灉 : ") ;
- sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x00 ? "鎴愬姛":"澶辫触")) ;
+ sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ;
sb.append("\n") ;
return sb.toString() ;
}
--
Gitblit v1.8.0