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/SpecialMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
index 01a5a70..5fbf9ed 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
@@ -72,7 +72,15 @@
from rm_open_close_valve_history mTb
left join pr_intake piTb on piTb.id = mTb.intake_id
left join se_client scTb on scTb.id = mTb.client_id
- where mTb.cl_type != 2
+ <!-- 2025-07-31 鍙傝�僣ommon妯″潡鐨勭被CommonV1鍜孋ommonV202404
+ case 5 -> "浣欓涓嶈冻鍏抽榾";
+ case 6 -> "娴侀噺璁℃晠闅滃叧闃�";
+ case 7 -> "绱ф�ュ叧闃�";
+ case 10 -> "宸℃鍗″叧闃�";
+ case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
+ -->
+ where (mTb.cl_type = 5 or mTb.cl_type = 6 or mTb.cl_type = 7 or mTb.cl_type = 10 or mTb.cl_type = 12 or mTb.cl_type = 16)
<trim prefix="and" suffixOverrides="and">
<if test = "atDateStart != null">
mTb.cl_dt <![CDATA[>=]]> #{atDateStart, javaType=DATE, jdbcType=TIMESTAMP} and
@@ -103,7 +111,15 @@
from rm_open_close_valve_history mTb
left join pr_intake piTb on piTb.id = mTb.intake_id
left join se_client scTb on scTb.id = mTb.client_id
- where mTb.cl_type != 2
+ <!-- 2025-07-31 鍙傝�僣ommon妯″潡鐨勭被CommonV1鍜孋ommonV202404
+ case 5 -> "浣欓涓嶈冻鍏抽榾";
+ case 6 -> "娴侀噺璁℃晠闅滃叧闃�";
+ case 7 -> "绱ф�ュ叧闃�";
+ case 10 -> "宸℃鍗″叧闃�";
+ case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
+ -->
+ where (mTb.cl_type = 5 or mTb.cl_type = 6 or mTb.cl_type = 7 or mTb.cl_type = 10 or mTb.cl_type = 12 or mTb.cl_type = 16)
<trim prefix="and" suffixOverrides="and">
<if test = "atDateStart != null">
mTb.cl_dt <![CDATA[>=]]> #{atDateStart, javaType=DATE, jdbcType=TIMESTAMP} and
--
Gitblit v1.8.0