From db88628e7bb03f334fa65826bd655c27859a9973 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 03 十一月 2024 16:52:04 +0800 Subject: [PATCH] 1、协议版本号增加到协议解析与命令构造中; 2、增加RTU状态记录功能,为RTU远程升级做准备。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java index f8b693b..71cfe87 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLine.java @@ -16,19 +16,18 @@ class OnLineResult{ public int result ;//鍒嗘瀽缁撴灉 public String protocolName ;//鍗忚鍚嶇О - public String rtuAddr ;//IMEI鍙� - public String meterNo ;//姘磋〃鍙� + public Short protocolVersion ;//鍗忚鐗堟湰鍙� + public String rtuAddr ;//Rtu鍦板潃 public byte[] remoteData;//闇�瑕佸悜Rtu鍥炲啓鐨勬暟鎹� public OnLineResult(){ result = OnLineAction_fail ; rtuAddr = null ; - meterNo = null ; remoteData = null ; } } int OnLineAction_fail = 0; //鍒嗘瀽涓婄嚎鏁版嵁澶辫触锛屽鎻愪緵鐨勬暟鎹负null绛夊師鍥� - int OnLineAction_success = 1; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟鑳藉緱鍒癐MEI鍙� + int OnLineAction_success = 1; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟鑳藉緱鍒癛tu鍦板潃 int OnLineAction_success_noMe = 2; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛岃瘑鍒嚭涓嶆槸鏈崗璁暟鎹� int OnLineAction_success_response = 3; //鍒嗘瀽涓婄嚎鏁版嵁鎴愬姛锛屽苟闇�瑕佸悜Rtu鍥炲啓鏁版嵁 -- Gitblit v1.8.0