From 12e9ce64c364deb7ea08ba82f8d72abf6e561fc2 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 27 五月 2024 16:53:50 +0800
Subject: [PATCH] 田间灌溉项目管理 灌溉制度模块 修改查询流浪灌溉单元和已绑定灌溉单元接口返回id类型 作物分页查询增加返回备注字段
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
index 2449b3b..c979a5d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
import com.alibaba.fastjson2.JSON ;
+import com.alibaba.fastjson2.JSONObject;
public class Command implements Serializable{
@@ -24,7 +25,7 @@
public String id;
/**
- * 姘磋〃鍗忚鍚嶇О锛岃繖涓彲浠ヤ负绌猴紝鍥犱负姘磋〃涓婅鏁版嵁瑙ｆ瀽鍑哄崗璁悕绉帮紝鐒跺悗绯荤粺鎶婂崗璁悕绉颁繚瀛樺湪姘磋〃鏁版嵁璁板綍涓紝浠庢鍗忚鍚嶇О灏变笉鍐嶇┖浜�
+ * RTU鍗忚鍚嶇О锛岃繖涓彲浠ヤ负绌猴紝鍥犱负RTU涓婅鏁版嵁瑙ｆ瀽鍑哄崗璁悕绉帮紝鐒跺悗绯荤粺鎶婂崗璁悕绉颁繚瀛樺湪RTU鏁版嵁璁板綍涓紝浠庢鍗忚鍚嶇О灏变笉鍐嶇┖浜�
*/
public String protocol;
@@ -43,11 +44,11 @@
* 鍔熻兘鐮�
*/
public String code ;
-
+
/**
- * 涓嶈繑鍥炰腑闂翠欢瀵瑰懡浠ゅ鐞嗙粨鏋滐紙true锛氫笉杩斿洖澶勭悊缁撴灉锛宖alse鎴杗ull锛氳繑鍥炲鐞嗙粨鏋滐級
+ * rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
*/
- public Boolean noRtMwDealRes ;
+ public String rtuResultSendWebUrl ;
/**
* 鍏蜂綋鍙傛暟鏁版嵁
@@ -63,9 +64,9 @@
String s = "鍛戒护id=" + id + "\n" ;
s += (protocol == null ? "" : ("鍗忚=" + protocol + "\n"));
s += (rtuAddr == null ? "" : ("Rtu鍦板潃=" + rtuAddr + "\n"));
- s += "鍛戒护绫诲瀷=" + (type.equals(CommandType.innerCommand)?"鍐呴儴鍛戒护":"缁堢鍛戒护") + "\n" ;
+ s += "鍛戒护绫诲瀷=" + (type.equals(CommandType.innerCommand)?"鍐呴儴鍛戒护":"RTU鍛戒护") + "\n" ;
s += (code == null ? "" : ("鍔熻兘鐮�=" + code + "\n")) ;
- s += "杩斿洖涓棿浠跺鍛戒护澶勭悊缁撴灉=" + (noRtMwDealRes == null?"杩斿洖":(noRtMwDealRes?"涓嶈繑鍥�":"杩斿洖") + "\n") ;
+ s += (rtuResultSendWebUrl == null ? "" : ("鍥炶皟缃戝潃=" + rtuResultSendWebUrl + "\n"));
if(param != null){
s += "鍙傛暟:" + param ;
}
@@ -82,7 +83,8 @@
@SuppressWarnings("unused")
public String toJson()throws Exception{
try{
- return JSON.toJSONString(this) ;
+ String json = JSON.toJSONString(this) ;
+ return json ;
}catch(Exception e){
throw new Exception(e.getMessage() , e ) ;
}
@@ -96,7 +98,10 @@
@SuppressWarnings("unused")
public static Command jsonToObject(String json)throws Exception{
try{
- return JSON.parseObject(json, Command.class) ;
+ JSONObject jsonObject = JSON.parseObject(json);
+ Command command = jsonObject.to(Command.class) ;
+ //command.param = jsonObject.getObject("param", class);
+ return command ;
}catch(Exception e){
throw new Exception(e.getMessage() , e ) ;
}
@@ -167,7 +172,15 @@
this.rtuAddr = rtuAddr;
return this ;
}
-
+
+ public String getRtuResultSendWebUrl() {
+ return rtuResultSendWebUrl;
+ }
+
+ public void setRtuResultSendWebUrl(String rtuResultSendWebUrl) {
+ this.rtuResultSendWebUrl = rtuResultSendWebUrl;
+ }
+
public String getProtocol() {
return protocol;
}
@@ -187,14 +200,6 @@
public Command setCode(String code) {
this.code = code;
return this ;
- }
- @SuppressWarnings("unused")
- public Boolean getNoRtMwDealRes() {
- return noRtMwDealRes;
- }
- @SuppressWarnings("unused")
- public void setNoRtMwDealRes(Boolean noRtMwDealRes) {
- this.noRtMwDealRes = noRtMwDealRes;
}
public Object getParam() {
return param;
--
Gitblit v1.8.0