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/DataCd92_A2Vo.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/DataCd92_A2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java index 0877502..763a30e 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 @@ -7,15 +7,22 @@ public class DataCd92_A2Vo { public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣� - public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣� + public Integer projectNo ;//椤圭洰缂栧彿 public String icCardNo ;//IC鍗$紪鍙凤紙17浣嶆暟瀛楋級 public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級 + public String opDt ;//寮�娉�/闃�鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛� public Byte opType ;//寮�闃�绫诲瀷: 01:骞冲彴寮�娉�/闃� 02:鐢ㄦ埛寮�娉�/闃� 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("\n") ; @@ -28,11 +35,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