From 4806b676dbbab4675e5ee43b4018f2cd9d43797f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 23 十月 2023 17:15:09 +0800
Subject: [PATCH] 1. 将sdk动态链接库dll集成到项目内,提升部署便捷性； 2. 增加设备断线重连回调方法，打印相关日志； 3. 删除多余依赖，减小jar包体积； 4. 处理SDK日志打印；

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 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 d19ef6b..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"/>
@@ -97,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
@@ -127,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