From e58507190b23f09a5f4bb184164382cc519f33c4 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 16 三月 2024 11:48:28 +0800
Subject: [PATCH] 增加报警历史查询按name模糊查询 增加雷达报警不存在井下载接口
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml | 106 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml
index b7cfb6e..2fd8536 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml
@@ -1,43 +1,53 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper">
-
+
<resultMap type="ArdAlarmApponekey" id="ArdAlarmApponekeyResult">
- <result property="id" column="id" />
- <result property="userId" column="user_id" />
- <result property="name" column="name" />
- <result property="longitude" column="longitude" />
- <result property="latitude" column="latitude" />
- <result property="altitude" column="altitude" />
- <result property="recordUrl" column="record_url" />
- <result property="createTime" column="create_time" />
- <result property="viewTime" column="view_time" />
+ <result property="id" column="id"/>
+ <result property="userId" column="user_id"/>
+ <result property="name" column="name"/>
+ <result property="longitude" column="longitude"/>
+ <result property="latitude" column="latitude"/>
+ <result property="altitude" column="altitude"/>
+ <result property="recordUrl" column="record_url"/>
+ <result property="createTime" column="create_time"/>
+ <result property="viewTime" column="view_time"/>
</resultMap>
<sql id="selectArdAlarmApponekeyVo">
- select id, user_id,name, longitude, latitude, altitude, record_url, create_time,view_time from ard_alarm_apponekey
+ select id,
+ user_id,
+ name,
+ longitude,
+ latitude,
+ altitude,
+ record_url,
+ create_time,
+ view_time
+ from ard_alarm_apponekey
</sql>
<select id="selectArdAlarmApponekeyList" parameterType="ArdAlarmApponekey" resultMap="ArdAlarmApponekeyResult">
<include refid="selectArdAlarmApponekeyVo"/>
<where>
+ <if test="name != null ">AND name like concat('%', #{name}, '%')</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND alarm_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+ AND create_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')
+ AND create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
</if>
</where>
order by create_time desc
</select>
-
+
<select id="selectArdAlarmApponekeyById" parameterType="String" resultMap="ArdAlarmApponekeyResult">
<include refid="selectArdAlarmApponekeyVo"/>
where id = #{id}
</select>
-
+
<insert id="insertArdAlarmApponekey" parameterType="ArdAlarmApponekey">
insert into ard_alarm_apponekey
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -50,7 +60,7 @@
<if test="recordUrl != null">record_url,</if>
<if test="createTime != null">create_time,</if>
<if test="viewTime != null">view_time,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="userId != null">#{userId},</if>
@@ -61,7 +71,7 @@
<if test="recordUrl != null">#{recordUrl},</if>
<if test="createTime != null">#{createTime},</if>
<if test="viewTime != null">#{viewTime},</if>
- </trim>
+ </trim>
</insert>
<update id="updateArdAlarmApponekey" parameterType="ArdAlarmApponekey">
@@ -80,11 +90,13 @@
</update>
<delete id="deleteArdAlarmApponekeyById" parameterType="String">
- delete from ard_alarm_apponekey where id = #{id}
+ delete
+ from ard_alarm_apponekey
+ where id = #{id}
</delete>
<delete id="deleteArdAlarmApponekeyByIds" parameterType="String">
- delete from ard_alarm_apponekey where id in
+ delete from ard_alarm_apponekey where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
@@ -97,29 +109,25 @@
</select>
<select id="selectListAllByCommand" resultMap="ArdAlarmApponekeyResult">
SELECT T.*
- FROM
- (
- SELECT
- aaa.ID,
- aaa.user_id,
- aaa.NAME,
- aaa.create_time,
- aaa.longitude,
- aaa.latitude,
- aaa.altitude,
- aaa.record_url,
- ROW_NUMBER () OVER ( PARTITION BY aaa.NAME ORDER BY aaa.create_time DESC ) AS rn,
- COUNT ( CASE WHEN aaa.view_time IS NULL THEN 1 END ) OVER ( PARTITION BY aaa.NAME ) AS COUNT,
+ FROM (
+ SELECT aaa.ID,
+ aaa.user_id,
+ aaa.NAME,
+ aaa.create_time,
+ aaa.longitude,
+ aaa.latitude,
+ aaa.altitude,
+ aaa.record_url,
+ ROW_NUMBER() OVER ( PARTITION BY aaa.NAME ORDER BY aaa.create_time DESC ) AS rn, COUNT(CASE WHEN aaa.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aaa.NAME ) AS COUNT,
COUNT ( aaa.create_time ) OVER ( PARTITION BY aaa.NAME ) AS total
- FROM
- ard_alarm_apponekey aaa
- WHERE
- aaa.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
- ORDER BY
- aaa.create_time DESC
- ) T
- WHERE
- T.rn = 1
+ FROM
+ ard_alarm_apponekey aaa
+ WHERE
+ aaa.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
+ ORDER BY
+ aaa.create_time DESC
+ ) T
+ WHERE T.rn = 1
</select>
<update id="updateViewTimeByUserId" parameterType="String">
update ard_alarm_apponekey
@@ -132,11 +140,17 @@
<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
+ 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
+ where create_time >= #{start}
+ and create_time <= #{end}
+ group by date
+ order by date
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3