From e8937f27fce194d015ce6c27d286e7fc89f5e580 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 23 四月 2025 17:29:47 +0800 Subject: [PATCH] 查询开关阀记录相关修改 --- pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 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..c00d8c6 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,15 @@ myParam.setParam(param); myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx); myParam.setOperator(operator); - return dealWithCommandResult(myParam); + //return dealWithCommandResult(myParam); + + BaseResponse<Boolean> result = dealWithCommandResult(myParam); + // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护 + if(!result.isSuccess()) { + myParam.setComId(new IDLongGenerator().generate()); + result = dealWithCommandResult(myParam); + } + return result; } else { return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); } @@ -527,7 +535,15 @@ myParam.setParam(param); myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx); myParam.setOperator(operator); - return dealWithCommandResult(myParam); + //return dealWithCommandResult(myParam); + + BaseResponse<Boolean> result = dealWithCommandResult(myParam); + // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护 + if(!result.isSuccess()) { + myParam.setComId(new IDLongGenerator().generate()); + result = dealWithCommandResult(myParam); + } + return result; } else { return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); } @@ -774,7 +790,15 @@ myParam.setParam(param); myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx); myParam.setOperator(operator); - return dealWithCommandResult(myParam); + //return dealWithCommandResult(myParam); + + BaseResponse<Boolean> result = dealWithCommandResult(myParam); + // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护 + if(!result.isSuccess()) { + myParam.setComId(new IDLongGenerator().generate()); + result = dealWithCommandResult(myParam); + } + return result; } else { return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); } -- Gitblit v1.8.0