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-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java | 4 ++++ 1 files changed, 4 insertions(+), 0 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 46a4c3b..9b390ec 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 @@ -417,6 +417,7 @@ BaseResponse<Boolean> result = dealWithCommandResult(myParam); // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护 if(!result.isSuccess()) { + myParam.setComId(new IDLongGenerator().generate()); result = dealWithCommandResult(myParam); } @@ -621,6 +622,7 @@ BaseResponse<Boolean> result = dealWithCommandResult(myParam); // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护 if(!result.isSuccess()) { + myParam.setComId(new IDLongGenerator().generate()); result = dealWithCommandResult(myParam); } @@ -716,6 +718,7 @@ irIntakeOperate.setOperateType(operatetype); irIntakeOperate.setCommandId(comId); irIntakeOperate.setIntakeId(intakeId); + irIntakeOperate.setCommandResult((byte)1); Long id = addIntakeOperate(irIntakeOperate); if(id == null) { @@ -797,6 +800,7 @@ BaseResponse<Boolean> result = dealWithCommandResult(myParam); // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护 if(!result.isSuccess()) { + myParam.setComId(new IDLongGenerator().generate()); result = dealWithCommandResult(myParam); } -- Gitblit v1.8.0