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/OpeIssueReportMapper.xml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
index 47379c7..9e2323e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
@@ -203,7 +203,7 @@
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇宸℃鍛橀棶棰樹笂鎶�-->
- <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport">
+ <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport_temp">
SELECT
rpt.id AS issueReportId,
us.name AS inspectorName,
@@ -214,6 +214,8 @@
rpt.audios,
rpt.videos,
rpy.reply_time AS replyTime,
+ rpy.reply_content AS replyContent,
+ rpy.replier_id AS replyPersonId,
rpt.state AS stateId,
CASE
WHEN rpt.state = 1 THEN '鏈彈鐞�'
@@ -262,4 +264,28 @@
<update id="deleteIssueReport">
UPDATE ope_issue_report SET state = 3 WHERE id = #{issueReportId}
</update>
+ <!--鏍规嵁闂涓婃姤璁板綍涓婚敭鑾峰彇鑾峰彇宸℃鍛橀棶棰樹笂鎶ヨ褰曡鍥惧璞�-->
+ <select id="getIssueReportById" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport_temp">
+ SELECT
+ rpt.id AS issueReportId,
+ us.name AS inspectorName,
+ rpt.phone,
+ rpt.report_time AS reportTime,
+ rpt.content,
+ rpt.images,
+ rpt.audios,
+ rpt.videos,
+ rpy.reply_time AS replyTime,
+ rpy.reply_content AS replyContent,
+ rpy.replier_id AS replyPersonId,
+ rpt.state AS stateId,
+ CASE
+ WHEN rpt.state = 1 THEN '鏈彈鐞�'
+ WHEN rpt.state = 2 THEN '宸插彈鐞�'
+ END AS state
+ FROM ope_issue_report rpt
+ LEFT JOIN ba_user us ON us.id = rpt.inspector_id
+ LEFT JOIN ope_report_reply rpy ON rpy.report_id = rpt.id
+ where rpt.state != 3 AND rpt.id = #{issueReportId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0