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/OpeInspectMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
index 088784e..c11b0d3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
@@ -130,7 +130,8 @@
ba_user.`name` AS inspectorName,
oi.id AS inspectId,
oi.start_time AS startTime,
- oi.stop_time AS stopTime
+ oi.stop_time AS stopTime,
+ oi.inspect_distance AS inspectDistance
FROM `ope_inspect` oi
INNER JOIN `ba_user` ON oi.inspector_id = ba_user.id
<where>
@@ -161,4 +162,33 @@
SET inspect_distance = #{distance}
WHERE id = #{inspectId}
</update>
+
+ <!--鏍规嵁宸℃鍛業D鑾峰彇宸℃璁板綍鏁伴噺-->
+ <select id="getInstectsCountByInspectorId" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM ope_inspect ins
+ LEFT JOIN ba_user user ON user.id = ins.inspector_id
+ WHERE ins.inspector_id = #{inspectorId}
+ </select>
+
+ <!--鏍规嵁宸℃鍛業D鑾峰彇宸℃鍒楄〃-->
+ <select id="getInstectsByInspectorId" resultType="com.dy.pipIrrGlobal.voOp.VoInspect">
+ SELECT
+ user.id AS inspectorId,
+ user.name AS inspectorName,
+ ins.id AS inspectId,
+ ins.start_time AS startTime,
+ ins.stop_time AS stopTime,
+ ins.inspect_distance AS inspectDistance
+ FROM ope_inspect ins
+ LEFT JOIN ba_user user ON user.id = ins.inspector_id
+ WHERE ins.inspector_id = #{inspectorId}
+ ORDER BY ins.start_time DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0