From c3b04f92b4c196644a80a912a601b5c29194f71b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 05 八月 2023 09:37:52 +0800
Subject: [PATCH] 增加线程池配置信息 修改雷达数据最近一次引导从redis获取

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

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
index 09d5dff..ebe4f66 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.alarm.radarAlarm.mapper.ArdAlarmRadarMapper">
+<mapper namespace="com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMapper">
     <resultMap type="ArdAlarmRadar" id="ArdAlarmRadarResult">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
@@ -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>
 
@@ -40,7 +44,14 @@
             <if test="name != null  and name != ''">and name like '%'||#{name}||'%'</if>
             <if test="alarmType != null  and alarmType != ''">and alarm_type = #{alarmType}</if>
             <if test="deptId != null ">and dept_id = #{deptId}</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="selectArdAlarmRadarById" parameterType="String" resultMap="ArdAlarmRadarResult">
@@ -144,6 +155,7 @@
         FROM ard_alarm_radar aar
         WHERE aar.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
           and aar.alarm_type = #{alarmType}
+          and aar.view_time is null
     </select>
     <select id="getCameraByRadar" resultType="String">
         select ac.id
@@ -169,4 +181,12 @@
           and alarm_type =#{ardAlarmRadar.alarmType}
           and name = #{ardAlarmRadar.name}
     </select>
+    <update id="updateViewTimeByCondition" parameterType="String">
+        update ard_alarm_radar
+        set view_time=#{viewTime}
+        where name = #{name}
+          and alarm_type=#{alarmType}
+          and alarm_time&lt;=#{alarmTime}
+          and view_time is null
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3