From 6cf345bc8fe98d393320b89182f9293171aa19ff Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 四月 2025 16:39:55 +0800
Subject: [PATCH] 1、根据江海协议中开阀类型变化,修改相应代码; 2、江海协议RTU模拟器启动参数注释。
---
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