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-global/src/main/resources/mapper/UgRtuControllerMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
index fd8a25f..37c93e5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -140,10 +140,10 @@
         AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
       </if>
       <if test="state != null and state == 1">
-        AND ugCon.ug_state = 1
+        AND ugCon.ug_state = 2
       </if>
       <if test="state != null and state == 0">
-        AND ugCon.ug_state != 1
+        AND ugCon.ug_state != 2
       </if>
       <if test="fail != null">
         AND ugCon.ug_state = #{fail,jdbcType=INTEGER}
@@ -175,10 +175,10 @@
         AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
       </if>
       <if test="state != null and state == 1">
-        AND ugCon.ug_state = 1
+        AND ugCon.ug_state = 2
       </if>
       <if test="state != null and state == 0">
-        AND ugCon.ug_state != 1
+        AND ugCon.ug_state != 2
       </if>
       <if test="fail != null">
         AND ugCon.ug_state = #{fail,jdbcType=INTEGER}

--
Gitblit v1.8.0