From e2c28bc98587c6edd6a38f06b972ff51d998028f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 27 十一月 2024 08:52:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java
index 1bc29b7..fae4d48 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java
@@ -13,12 +13,13 @@
private static final long serialVersionUID = 20160805192500101L;
public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
- private String commandId ;//鍛戒护ID锛屽彲鑳戒负null
- private String rtuAddr ;//缁堢鍦板潃
- private String protocol ;//鏁版嵁鎵�瀵瑰簲鐨勫崗璁悕绉�
- private String code ;//鏁版嵁鎵�瀵瑰簲鐨勫姛鑳界爜:
- private Object subData ;//瀵瑰簲鍚勪釜鍔熻兘鐮佺殑鍏蜂綋鏁版嵁
- private String hex ;//涓婃姤鏁版嵁鐨勫崄鍏繘鍒�
+ public String commandId ;//鍛戒护ID锛屽彲鑳戒负null
+ public String rtuAddr ;//缁堢鍦板潃
+ public String protocol ;//鏁版嵁鎵�瀵瑰簲鐨勫崗璁悕绉�
+ public Short protocolVer;//鏁版嵁鎵�瀵瑰簲鐨勫崗璁増鏈彿锛�1~255锛�
+ public String code ;//鏁版嵁鎵�瀵瑰簲鐨勫姛鑳界爜:
+ public Object subData ;//瀵瑰簲鍚勪釜鍔熻兘鐮佺殑鍏蜂綋鏁版嵁
+ public String hex ;//涓婃姤鏁版嵁鐨勫崄鍏繘鍒�
public String toString() {
StringBuilder sb = new StringBuilder() ;
@@ -31,6 +32,7 @@
sb.append("鍛戒护ID : ").append(commandId).append("\n") ; //鍛戒护ID
}
sb.append("鍗忚 : ").append((protocol == null?"":protocol)).append("\n") ; //
+ sb.append("鍗忚鐗堟湰鍙� : ").append((protocolVer == null?"":protocolVer)).append("\n") ; //
sb.append((code == null ? "" : ("鍔熻兘鐮�:" + code + "\n"))) ;
if(this.subData != null){
sb.append("涓婅鏁版嵁锛歕n").append(this.subData) ;
@@ -62,7 +64,7 @@
d.code = "01" ;
d.rtuAddr = "123234" ;
- DataV1_0_1 subD = new DataV1_0_1() ;
+ DataV1 subD = new DataV1() ;
subD.rtuAddr = "2342345" ;
d.subData = subD ;
@@ -98,11 +100,19 @@
public String getProtocol() {
return protocol;
}
-
+
public void setProtocol(String protocol) {
this.protocol = protocol;
}
-
+
+ public Short getProtocolVer() {
+ return protocolVer;
+ }
+
+ public void setProtocolVer(Short protocolVer) {
+ this.protocolVer = protocolVer;
+ }
+
public Object getSubData() {
return subData;
}
--
Gitblit v1.8.0