From 72359f3c9e9fe855ecafafb769ed52fc2a7f7e61 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期六, 10 八月 2024 09:46:02 +0800
Subject: [PATCH] 优化：视频通话会话列表和详情获取最后一条消息中增加用户名称和头像

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index 3ec6951..05a77ce 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -12,8 +12,7 @@
         <result property="alarmTime"    column="alarm_time"    />
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
-        <result property="recordUrl1"    column="record_url1"    />
-        <result property="recordUrl2"    column="record_url2"    />
+        <result property="recordUrl"    column="record_url"    />
         <result property="viewTime"    column="view_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -23,7 +22,7 @@
     </resultMap>
 
     <sql id="selectArdAlarmRadarMoveVo">
-        select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url1,record_url2, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_move
+        select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_move
     </sql>
 
     <select id="selectArdAlarmRadarMoveList" parameterType="ArdAlarmRadarMove" resultMap="ArdAlarmRadarMoveResult">
@@ -35,7 +34,7 @@
             <if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>
             <if test="longitude != null "> and longitude = #{longitude}</if>
             <if test="latitude != null "> and latitude = #{latitude}</if>
-            <if test="recordUrl1 != null  and recordUrl1 != ''"> and record_url1 = #{recordUrl1}</if>
+            <if test="recordUrl != null  and recordUrl != ''"> and record_url = #{recordUrl}</if>
             <if test="viewTime != null "> and view_time = #{viewTime}</if>
             <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
@@ -65,8 +64,7 @@
             <if test="alarmTime != null">alarm_time,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
-            <if test="recordUrl1 != null">record_url1,</if>
-            <if test="recordUrl2 != null">record_url2,</if>
+            <if test="recordUrl != null">record_url,</if>
             <if test="viewTime != null">view_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -83,8 +81,7 @@
             <if test="alarmTime != null">#{alarmTime},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
-            <if test="recordUrl1 != null">#{recordUrl1},</if>
-            <if test="recordUrl2 != null">#{recordUrl2},</if>
+            <if test="recordUrl != null">#{recordUrl},</if>
             <if test="viewTime != null">#{viewTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -104,8 +101,7 @@
             <if test="alarmTime != null">alarm_time = #{alarmTime},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if>
-            <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if>
+            <if test="recordUrl != null">record_url = #{recordUrl},</if>
             <if test="viewTime != null">view_time = #{viewTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -154,7 +150,7 @@
                  aar.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
              GROUP BY aar.NAME
             ) r
-                INNER JOIN ard_alarm_radar_move aaar ON r.create_time1 = aaar.create_time
+                INNER JOIN ard_alarm_radar_move aaar ON aaar.NAME = r.NAME AND r.create_time1 = aaar.create_time
         ORDER BY aaar.create_time desc
     </select>
     <update id="updateViewTimeByCondition" parameterType="String">
@@ -180,6 +176,6 @@
     </select>
     <select id="ten" resultType="com.ruoyi.statistical.vo.TenVo">
         SELECT name,count(name) as "value" from ard_alarm_radar_move
-        where (current_timestamp - interval '1024 hour') &lt;= alarm_time GROUP BY name ORDER BY "value" desc LIMIT 10
+        where (current_timestamp - interval '1024 hour') &lt;= alarm_time GROUP BY name ORDER BY "value" desc LIMIT 10 offset 0
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3