From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index fa71583..5546e76 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.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.tubeAlarm.mapper.ArdAlarmTubeMapper">
+<mapper namespace="com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper">
 
     <resultMap type="ArdAlarmTube" id="ArdAlarmTubeResult">
         <result property="id" column="id"/>
@@ -73,6 +73,7 @@
             <if test="recordUrl != null  and recordUrl != ''">and record_url = #{recordUrl}</if>
             <if test="viewTime != null ">and view_time = #{viewTime}</if>
         </where>
+        order by alarm_time desc
     </select>
 
     <select id="selectArdAlarmTubeById" parameterType="String" resultMap="ArdAlarmTubeResult">
@@ -181,10 +182,11 @@
              ) T
         WHERE T.rn = 1
     </select>
-    <select id="selectCountByStartTime" resultType="Integer">
+    <select id="selectCountByAlarmTime" resultType="Integer">
         SELECT COUNT(DISTINCT aat.tube_id)
         FROM ard_alarm_tube aat
         WHERE aat.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
+          and aat.view_time is null
     </select>
     <update id="updateViewTimeByTubeId" parameterType="String">
         update ard_alarm_tube
@@ -193,4 +195,14 @@
           and alarm_time &lt;= #{alarmTime}
           and view_time is null
     </update>
+    <select id="tubeYear" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(create_time::DATE, 'MM') as date,count(id)
+        from ard_alarm_tube
+        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
+    </select>
+    <select id="tubeMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(create_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_tube
+        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3