From d8eb22351c6d0bfe0c9f233edfd593538e6838c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 13:58:49 +0800
Subject: [PATCH] 1、表阀一体机协议开阀类型变化； 2、表阀一体机协议开关阀报中增加水价数据；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 0 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
new file mode 100644
index 0000000..fae4d48
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java
@@ -0,0 +1,159 @@
+package com.dy.common.mw.protocol;
+
+import com.alibaba.fastjson2.JSON;
+
+import java.io.Serial;
+
+/**
+ * 鏁版嵁鏍�
+ *
+ */
+public class Data implements java.io.Serializable{
+ @Serial
+ private static final long serialVersionUID = 20160805192500101L;
+
+ public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
+ 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() ;
+ 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
+ }
+ if(commandId != null){
+ 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) ;
+ }
+ return sb.toString() ;
+ }
+
+
+ /**
+ * 瀵硅薄杞垚json
+ * @return 瀵硅薄
+ */
+ public String toJson(){
+ return JSON.toJSONString(this);
+ }
+ /**
+ * json杞垚瀵硅薄
+ * @param json json
+ * @return Data Date
+ */
+ @SuppressWarnings("unused")
+ public static Data jsonToObject(String json){
+ return JSON.parseObject(json, Data.class) ;
+ }
+
+ /*
+ public static void main(String[] rags) throws Exception{
+ Data d = new Data() ;
+ d.code = "01" ;
+ d.rtuAddr = "123234" ;
+
+ DataV1 subD = new DataV1() ;
+ subD.rtuAddr = "2342345" ;
+
+ d.subData = subD ;
+
+
+ DataCd01Vo cd1Vo = new DataCd01Vo() ;
+ cd1Vo.dt = "345w" ;
+
+ subD.dataCd01Vo = cd1Vo ;
+
+ String json = d.toJson() ;
+
+ System.out.println(json);
+ }
+ */
+
+ public String getRtuAddr() {
+ return rtuAddr;
+ }
+
+ public void setRtuAddr(String rtuAddr) {
+ this.rtuAddr = rtuAddr;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ 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;
+ }
+
+ public void setSubData(Object subData) {
+ this.subData = subData;
+ }
+
+ @SuppressWarnings("unused")
+ public String getHex() {
+ return hex;
+ }
+
+ public void setHex(String hex) {
+ 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;
+ }
+ /**
+ * 寰楀埌涓婅鏁版嵁瀵瑰簲鐨勫懡浠D
+ * 濡傛灉鏄富鍔ㄤ笂鎶ユ暟鎹紝鍒欐ID涓虹┖
+ * @return commandId
+ */
+ public String getCommandId(){
+ return this.commandId ;
+ }
+
+
+
+}
--
Gitblit v1.8.0