From 8c8af4faa4303499fe9e81dd117932e246008eb0 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 07 十月 2023 14:39:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
index 5beed74..2f919b5 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.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.cameraAlarm.mapper.ArdAlarmCameraMapper">
+<mapper namespace="com.ruoyi.alarm.camera.mapper.ArdAlarmCameraMapper">
     
     <resultMap type="ArdAlarmCamera" id="ArdAlarmCameraResult">
         <result property="id"    column="id"    />
@@ -166,4 +166,10 @@
           and alarm_time&lt;=#{alarmTime}
           and view_time is null
     </update>
+
+    <select id="cameraYear" resultType="com.ruoyi.statistical.vo.CountVo">
+        select to_char(alarm_time::DATE, 'MM') as month,count(id)
+        from ard_alarm_camera
+        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3