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 | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 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
new file mode 100644
index 0000000..6e8d79e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4RemoteMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="alarmLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
+ select
+ CONCAT(
+ IF(alarm_loss = 1, '婕忔崯鎶ヨ锛�', ''),
+ IF(alarm_battery_volt = 1, '鐢垫睜鐢靛帇鎶ヨ锛�', ''),
+ IF(alarm_valve = 1, '闃�闂ㄦ姤璀︼紝', ''),
+ IF(alarm_water_meter_fault = 1, '娴侀噺璁℃晠闅滄姤璀︼紝', '')
+ ) AS alarm,
+ dt AS alarmDt
+ from rm_alarm_state_last rasl
+ where intake_id = #{intakeId,jdbcType=BIGINT}
+ </select>
+
+ <select id="openCloseValveLastInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote">
+ select
+ op_dt AS lastOpenDt,
+ cl_dt AS lastCloseDt
+ from rm_open_close_valve_last rocvl
+ 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