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-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
index 77706f0..64770f0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
@@ -541,6 +541,26 @@
     }
 
     /**
+     * 鑾峰彇椤圭洰涓嬭疆鐏岀粍
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/getGroupsByProjectId")
+    @SsoAop()
+    public BaseResponse<List<VoGroupSimple>> getGroupsByProjectId(QoGroup qo) {
+        if(qo.getProjectId() == null) {
+            return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨椤圭洰");
+        }
+
+        try {
+            return BaseResponseUtils.buildSuccess(irrigateGroupSv.getGroupsByProjectId(qo));
+        } catch (Exception e) {
+            log.error("鑾峰彇杞亴缁勮褰曞紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
+
+    /**
      * 鑾峰彇鍏ㄩ儴杞亴缁勶紝鏂颁唬鐮�
      * @return
      */

--
Gitblit v1.8.0