From d353fdce7cb957aa0f5d9d51d0ad4205c96e156c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期六, 21 十月 2023 11:57:12 +0800 Subject: [PATCH] 1、流媒体升级1.2.0,修改部分forest接口 2、登录设备判断编码自动配置转码 3、增加sdk聚焦模式切换 4、增加sdk视场角获取并定时上传 --- ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml index c047dc5..b7cfb6e 100644 --- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml +++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml @@ -22,7 +22,13 @@ <select id="selectArdAlarmApponekeyList" parameterType="ArdAlarmApponekey" resultMap="ArdAlarmApponekeyResult"> <include refid="selectArdAlarmApponekeyVo"/> - <where> + <where> + <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� --> + AND alarm_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss') + </if> + <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� --> + AND alarm_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss') + </if> </where> order by create_time desc </select> @@ -122,4 +128,15 @@ and create_time <= #{createTime} and view_time is null </update> + + <select id="apponekeyYear" resultType="com.ruoyi.statistical.vo.CountVo"> + select to_char(create_time::DATE, 'MM') as date,count(id) + from ard_alarm_apponekey + where create_time >= #{start} and create_time <= #{end} group by date order by date + </select> + <select id="apponekeyMonth" resultType="com.ruoyi.statistical.vo.CountVo"> + select to_char(create_time::DATE, 'dd') as date,count(id) + from ard_alarm_apponekey + where create_time >= #{start} and create_time <= #{end} group by date order by date + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3