From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java
index c9fc53e..27131f2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java
@@ -62,6 +62,7 @@
* @param intakeId
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public PrCommonIntakes addOrUpdateOftenUseIntake(Long operatorId, Long intakeId) {
PrCommonIntakes po = prCommonIntakesDao.selectByOperatorAndIntake(operatorId, intakeId);
if(po == null) {
@@ -93,4 +94,20 @@
jsonArr.add(jsonObj);
return rmCommandHistoryDao.getUncloseParam(jsonArr.toJSONString(), intakeId);
}
+
+ /**
+ * 鏍规嵁鍙栨按鍙D鑾峰彇璇ュ彇姘村彛鏈叧闃�鍙傛暟锛屽钩鍙伴�夋嫨鍙栨按鍙ｅ叧闃�浣跨敤
+ * @param intakeId
+ * @param rtuAddr
+ * @param code
+ * @return
+ */
+ public VoUnclosedParam selectUncloseParamByCd(Long intakeId, String rtuAddr, String code) {
+ JSONArray jsonArr = new JSONArray();
+ JSONObject jsonObj = new JSONObject();
+ jsonObj.put("rtuAddr", rtuAddr);
+ jsonObj.put("isOnLine", true);
+ jsonArr.add(jsonObj);
+ return rmCommandHistoryDao.getUncloseParamByCd(jsonArr.toJSONString(), intakeId, code);
+ }
}
--
Gitblit v1.8.0