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/Ar4RemoteMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4RemoteMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4RemoteMapper.xml
index 8548633..6e8d79e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4RemoteMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4RemoteMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoAllRound.Ar4RemoteMapper">
- <select id="alarmInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote">
+ <select id="alarmLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
select
CONCAT(
IF(alarm_loss = 1, '婕忔崯鎶ヨ锛�', ''),
@@ -15,7 +15,7 @@
where intake_id = #{intakeId,jdbcType=BIGINT}
</select>
- <select id="openCloseValveInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote">
+ <select id="openCloseValveLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
select
op_dt AS lastOpenDt,
cl_dt AS lastCloseDt
@@ -23,4 +23,12 @@
where intake_id = #{intakeId,jdbcType=BIGINT}
</select>
+ <select id="lossLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
+ select
+ dt AS lossDt,
+ loss_amount AS lossAmount
+ from rm_loss_day_last rldl
+ where intake_id = #{intakeId,jdbcType=BIGINT}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0