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/ArdAlarmStealelecMapper.xml |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
index a4944c6..19a7e29 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper">
+<mapper namespace="com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper">
     <resultMap id="BaseResultMap" type="ArdAlarmStealelec">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
@@ -31,6 +31,7 @@
                 AND start_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
             </if>
         </where>
+        order by start_time desc
     </select>
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
@@ -96,6 +97,7 @@
         select count(DISTINCT aas."describe")
         from ard_alarm_stealelec aas
         where aas.start_time >= (CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE)
+        and aas.view_time is null
     </select>
     <update id="updateViewTimeByDescribe" parameterType="String">
         update ard_alarm_stealelec
@@ -126,4 +128,16 @@
         values (#{id}, #{name},#{describe},#{catalogText},#{description}, #{startTime}, #{endTime},
         #{viewTime},#{longitude},#{latitude},#{altitude},#{createBy},#{createTime},#{userId},#{deptId})
     </insert>
+
+    <select id="stealelecYear" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(start_time::DATE, 'MM') as date,count(id)
+        from ard_alarm_stealelec
+        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
+    </select>
+
+    <select id="stealelecMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(start_time::DATE, 'dd') as date,count(id)
+        from ard_alarm_stealelec
+        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3