From d2263e86d837ef331d77fd39dccd79f100041e76 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 14 四月 2025 16:28:49 +0800 Subject: [PATCH] 获取轮灌组时,项目ID不为必须条件 --- pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) 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