From d1e380d5bc8d6cda7dc26778dd638b3367483ae7 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 17:27:30 +0800
Subject: [PATCH] 小程序6种开关阀操作失败时重发一次
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java | 15 +++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 27 ++++++++++++++++++++++++---
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index f23d3b8..46a4c3b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -415,6 +415,10 @@
myParam.setOpenType(openType);
BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ result = dealWithCommandResult(myParam);
+ }
Map map = new HashMap<>();
map.put("success", result.isSuccess());
@@ -612,7 +616,13 @@
myParam.setParam(param);
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
+ //BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+
BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ result = dealWithCommandResult(myParam);
+ }
Map map = new HashMap<>();
map.put("success", result.isSuccess());
@@ -783,7 +793,12 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
//return dealWithCommandResult(myParam);
+
BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ result = dealWithCommandResult(myParam);
+ }
Map map = new HashMap<>();
map.put("success", result.isSuccess());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
index 22e08e8..5d63fb2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -424,7 +424,14 @@
myParam.setParam(param);
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
- return dealWithCommandResult(myParam);
+ //return dealWithCommandResult(myParam);
+
+ BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ result = dealWithCommandResult(myParam);
+ }
+ return result;
} else {
return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
@@ -527,7 +534,14 @@
myParam.setParam(param);
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
- return dealWithCommandResult(myParam);
+ //return dealWithCommandResult(myParam);
+
+ BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ result = dealWithCommandResult(myParam);
+ }
+ return result;
} else {
return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
@@ -774,7 +788,14 @@
myParam.setParam(param);
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
- return dealWithCommandResult(myParam);
+ //return dealWithCommandResult(myParam);
+
+ BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ result = dealWithCommandResult(myParam);
+ }
+ return result;
} else {
return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
--
Gitblit v1.8.0