From ef0ed9877417b7efb3a6ec72121bee56720f6939 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 01 七月 2023 17:28:04 +0800
Subject: [PATCH] 优化提交

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
index 1a98bc8..1d5a538 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
@@ -16,6 +16,8 @@
         <result property="createTime" column="create_time"/>
         <result property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
+        <result property="recordUrl1" column="record_url1"/>
+        <result property="recordUrl2" column="record_url2"/>
     </resultMap>
 
     <sql id="selectArdAlarmRadarVo">
@@ -30,7 +32,9 @@
                create_by,
                create_time,
                user_id,
-               dept_id
+               dept_id,
+               record_url1,
+               record_url2
         from ard_alarm_radar
     </sql>
 
@@ -41,6 +45,7 @@
             <if test="alarmType != null  and alarmType != ''">and alarm_type = #{alarmType}</if>
             <if test="deptId != null ">and dept_id = #{deptId}</if>
         </where>
+        order by alarm_time desc
     </select>
 
     <select id="selectArdAlarmRadarById" parameterType="String" resultMap="ArdAlarmRadarResult">
@@ -63,6 +68,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="userId != null">user_id,</if>
             <if test="deptId != null">dept_id,</if>
+            <if test="guideFlag != null">guide_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -77,6 +83,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="userId != null">#{userId},</if>
             <if test="deptId != null">#{deptId},</if>
+            <if test="guideFlag != null">#{guideFlag},</if>
         </trim>
     </insert>
 
@@ -94,6 +101,9 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if>
+            <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if>
+            <if test="guideFlag != null">guide_flag = #{guideFlag},</if>
         </trim>
         where id = #{id}
     </update>
@@ -140,4 +150,28 @@
         WHERE aar.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
           and aar.alarm_type = #{alarmType}
     </select>
+    <select id="getCameraByRadar" resultType="String">
+        select ac.id
+        from ard_equip_radar aer
+                 INNER JOIN ard_towers at
+        on aer.tower_id= at.id
+            INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
+    </select>
+    <select id="getArdAlarmRadarWithGuide" resultMap="ArdAlarmRadarResult">
+        select *
+        from ard_alarm_radar
+        where create_time > current_timestamp - interval '5' minute
+          and guide_flag = #{guideFlag}
+          and alarm_type =#{alarmType}
+          and name = #{name}
+        ORDER BY create_time desc  limit 1
+    </select>
+    <select id="getArdAlarmRadarWithNotGuide" resultType="Integer">
+        select count(*)
+        from ard_alarm_radar
+        where create_time >= #{guideTime}
+          and guide_flag = #{ardAlarmRadar.guideFlag}
+          and alarm_type =#{ardAlarmRadar.alarmType}
+          and name = #{ardAlarmRadar.name}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3