From 9ad6b0179be4d351105f1507779d4f41a3a41953 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 07 九月 2024 16:57:40 +0800
Subject: [PATCH] 1、完善代码； 2、江海协议时标（tp）实现中的bug修改。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java | 79 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 37 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 53ffb2c..5335fb6 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
@@ -2,37 +2,38 @@
import com.alibaba.fastjson2.JSON;
+import java.io.Serial;
+
/**
* 鏁版嵁鏍�
- * @author Administrator
*
*/
public class Data implements java.io.Serializable{
-
+ @Serial
private static final long serialVersionUID = 20160805192500101L;
-
- public static String ALIAS = Data.class.getName() ;
-
- private String commandId ;//鍛戒护ID锛屽彲鑳戒负null
- private String rtuAddr ;//缁堢鍦板潃
- private String meterNo ;//姘磋〃鍙�
- private String protocol ;//鏁版嵁鎵�瀵瑰簲鐨勫崗璁悕绉�
- private String code ;//鏁版嵁鎵�瀵瑰簲鐨勫姛鑳界爜:
- private Object subData ;//瀵瑰簲鍚勪釜鍔熻兘鐮佺殑鍏蜂綋鏁版嵁
- private String hex ;//涓婃姤鏁版嵁鐨勫崄鍏繘鍒�
+
+ public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
+ public String commandId ;//鍛戒护ID锛屽彲鑳戒负null
+ public String rtuAddr ;//缁堢鍦板潃
+ public String protocol ;//鏁版嵁鎵�瀵瑰簲鐨勫崗璁悕绉�
+ public String code ;//鏁版嵁鎵�瀵瑰簲鐨勫姛鑳界爜:
+ public Object subData ;//瀵瑰簲鍚勪釜鍔熻兘鐮佺殑鍏蜂綋鏁版嵁
+ public String hex ;//涓婃姤鏁版嵁鐨勫崄鍏繘鍒�
public String toString() {
- StringBuffer sb = new StringBuffer() ;
- sb.append("涓婅鎶ユ枃(鍗佸叚杩涘埗): " + (hex == null?"":hex) + "\n") ; //
- sb.append("IMEI鍙� : " + (rtuAddr==null?"":rtuAddr) + "\n") ;
- sb.append("姘磋〃鍙� : " + (meterNo==null?"":meterNo) + "\n") ;
- if(commandId != null){
- sb.append("鍛戒护ID : " + commandId + "\n") ; //鍛戒护ID
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("涓婅鎶ユ枃(鍗佸叚杩涘埗): ").append((hex == null?"":hex)).append("\n") ; //
+ sb.append("Rtu鍦板潃 : ").append((rtuAddr==null?"":rtuAddr)).append("\n") ;
+ if(rtuResultSendWebUrl != null){
+ sb.append("鍛戒护缁撴灉鍙戝線 : ").append(rtuResultSendWebUrl).append("\n") ; //rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
}
- sb.append("鍗忚 : " + (protocol == null?"":protocol) + "\n") ; //
+ if(commandId != null){
+ sb.append("鍛戒护ID : ").append(commandId).append("\n") ; //鍛戒护ID
+ }
+ sb.append("鍗忚 : ").append((protocol == null?"":protocol)).append("\n") ; //
sb.append((code == null ? "" : ("鍔熻兘鐮�:" + code + "\n"))) ;
if(this.subData != null){
- sb.append("涓婅鏁版嵁锛歕n" + this.subData.toString()) ;
+ sb.append("涓婅鏁版嵁锛歕n").append(this.subData) ;
}
return sb.toString() ;
}
@@ -40,19 +41,18 @@
/**
* 瀵硅薄杞垚json
- * @return json
- * @throws Exception
+ * @return 瀵硅薄
*/
- public String toJson()throws Exception{
+ public String toJson(){
return JSON.toJSONString(this);
}
/**
* json杞垚瀵硅薄
- * @param json
- * @return Data
- * @throws Exception
+ * @param json json
+ * @return Data Date
*/
- public static Data jsonToObject(String json)throws Exception{
+ @SuppressWarnings("unused")
+ public static Data jsonToObject(String json){
return JSON.parseObject(json, Data.class) ;
}
@@ -61,12 +61,10 @@
Data d = new Data() ;
d.code = "01" ;
d.rtuAddr = "123234" ;
- d.meterNo = "1234567890123456" ;
DataV1_0_1 subD = new DataV1_0_1() ;
subD.rtuAddr = "2342345" ;
- subD.meterNo = "1234567890123456" ;
-
+
d.subData = subD ;
@@ -88,13 +86,7 @@
public void setRtuAddr(String rtuAddr) {
this.rtuAddr = rtuAddr;
}
-
- public String getMeterNo() {
- return meterNo;
- }
- public void setMeterNo(String meterNo) {
- this.meterNo = meterNo;
- }
+
public String getCode() {
return code;
}
@@ -119,6 +111,7 @@
this.subData = subData;
}
+ @SuppressWarnings("unused")
public String getHex() {
return hex;
}
@@ -127,6 +120,18 @@
this.hex = hex;
}
+ public String getRtuResultSendWebUrl() {
+ return rtuResultSendWebUrl;
+ }
+ /**
+ * 寰楀埌rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
+ * 濡傛灉鏄富鍔ㄤ笂鎶ユ暟鎹紝鍒欐web URL涓虹┖
+ * @return rtuResultSendWebUrl
+ */
+ public void setRtuResultSendWebUrl(String rtuResultSendWebUrl) {
+ this.rtuResultSendWebUrl = rtuResultSendWebUrl;
+ }
+
public void setCommandId(String commandId) {
this.commandId = commandId;
}
--
Gitblit v1.8.0