From 3eddfc41323c56219f9e71b405a815d52d3db4a4 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 27 九月 2023 12:03:25 +0800
Subject: [PATCH] 优化获取附近井接口坐标分离

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
index dba411b..af96e1d 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
@@ -39,7 +39,14 @@
             <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="guideFlag != null "> and guide_flag = #{guideFlag}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+                AND alarm_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+                AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+            </if>
         </where>
+        order by alarm_time desc
     </select>
     
     <select id="selectArdAlarmRadarFireById" parameterType="String" resultMap="ArdAlarmRadarFireResult">
@@ -61,6 +68,7 @@
             <if test="viewTime != null">view_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
             <if test="userId != null">user_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="guideFlag != null">guide_flag,</if>
@@ -77,6 +85,7 @@
             <if test="viewTime != null">#{viewTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
             <if test="userId != null">#{userId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="guideFlag != null">#{guideFlag},</if>
@@ -96,6 +105,7 @@
             <if test="viewTime != null">view_time = #{viewTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="guideFlag != null">guide_flag = #{guideFlag},</if>
@@ -140,7 +150,7 @@
                  aar.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
              GROUP BY aar.NAME
             ) r
-                INNER JOIN ard_alarm_radar aaar ON r.create_time1 = aaar.create_time
+                INNER JOIN ard_alarm_radar_fire aaar ON r.create_time1 = aaar.create_time
     </select>
     <update id="updateViewTimeByCondition" parameterType="String">
         update ard_alarm_radar_fire
@@ -149,4 +159,7 @@
           and alarm_time&lt;=#{alarmTime}
           and view_time is null
     </update>
+    <select id="selectArdAlarmRadarLastData" parameterType="String" resultMap="ArdAlarmRadarFireResult">
+        select * from ard_alarm_radar_fire where name=#{name} order by update_time desc LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3