From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001 From: liusuyi <1951119284@qq.com> Date: 星期四, 10 十月 2024 13:34:28 +0800 Subject: [PATCH] init --- ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 18 deletions(-) diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml index 6c9cec1..ff74d67 100644 --- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml +++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.alarm.radar.mapper.ArdAlarmRadarPumpMapper"> - + <resultMap type="ArdAlarmRadarPump" id="ArdAlarmRadarPumpResult"> <result property="id" column="id" /> <result property="name" column="name" /> @@ -12,41 +12,48 @@ <result property="alarmTime" column="alarm_time" /> <result property="longitude" column="longitude" /> <result property="latitude" column="latitude" /> - <result property="recordUrl1" column="record_url1" /> + <result property="recordUrl" column="record_url" /> <result property="viewTime" column="view_time" /> <result property="createBy" column="create_by" /> <result property="createTime" column="create_time" /> <result property="userId" column="user_id" /> <result property="deptId" column="dept_id" /> - <result property="guideFlag" column="guide_flag" /> + <result property="guideTime" column="guide_time" /> </resultMap> <sql id="selectArdAlarmRadarPumpVo"> - select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url1, view_time, create_by, create_time, user_id, dept_id, guide_flag from ard_alarm_radar_pump + select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_pump </sql> <select id="selectArdAlarmRadarPumpList" parameterType="ArdAlarmRadarPump" resultMap="ArdAlarmRadarPumpResult"> <include refid="selectArdAlarmRadarPumpVo"/> - <where> + <where> <if test="name != null and name != ''"> and name like '%'||#{name}||'%'</if> <if test="targetId != null and targetId != ''"> and target_id = #{targetId}</if> <if test="alarmType != null and alarmType != ''"> and alarm_type = #{alarmType}</if> <if test="alarmTime != null "> and alarm_time = #{alarmTime}</if> <if test="longitude != null "> and longitude = #{longitude}</if> <if test="latitude != null "> and latitude = #{latitude}</if> - <if test="recordUrl1 != null and recordUrl1 != ''"> and record_url1 = #{recordUrl1}</if> + <if test="recordUrl != null and recordUrl != ''"> and record_url = #{recordUrl}</if> <if test="viewTime != null "> and view_time = #{viewTime}</if> <if test="userId != null and userId != ''"> and user_id = #{userId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if> - <if test="guideFlag != null "> and guide_flag = #{guideFlag}</if> + <if test="guideTime != null "> and guide_time = #{guideTime}</if> + <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 alarm_time desc </select> - + <select id="selectArdAlarmRadarPumpById" parameterType="String" resultMap="ArdAlarmRadarPumpResult"> <include refid="selectArdAlarmRadarPumpVo"/> where id = #{id} </select> - + <insert id="insertArdAlarmRadarPump" parameterType="ArdAlarmRadarPump"> insert into ard_alarm_radar_pump <trim prefix="(" suffix=")" suffixOverrides=","> @@ -57,13 +64,14 @@ <if test="alarmTime != null">alarm_time,</if> <if test="longitude != null">longitude,</if> <if test="latitude != null">latitude,</if> - <if test="recordUrl1 != null">record_url1,</if> + <if test="recordUrl != null">record_url,</if> <if test="viewTime != null">view_time,</if> <if test="createBy != null">create_by,</if> <if test="createTime != null">create_time,</if> + <if test="updateTime != null">update_time,</if> <if test="userId != null">user_id,</if> <if test="deptId != null">dept_id,</if> - <if test="guideFlag != null">guide_flag,</if> + <if test="guideTime != null">guide_time,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> @@ -73,13 +81,14 @@ <if test="alarmTime != null">#{alarmTime},</if> <if test="longitude != null">#{longitude},</if> <if test="latitude != null">#{latitude},</if> - <if test="recordUrl1 != null">#{recordUrl1},</if> + <if test="recordUrl != null">#{recordUrl},</if> <if test="viewTime != null">#{viewTime},</if> <if test="createBy != null">#{createBy},</if> <if test="createTime != null">#{createTime},</if> + <if test="updateTime != null">#{updateTime},</if> <if test="userId != null">#{userId},</if> <if test="deptId != null">#{deptId},</if> - <if test="guideFlag != null">#{guideFlag},</if> + <if test="guideTime != null">#{guideTime},</if> </trim> </insert> @@ -92,13 +101,14 @@ <if test="alarmTime != null">alarm_time = #{alarmTime},</if> <if test="longitude != null">longitude = #{longitude},</if> <if test="latitude != null">latitude = #{latitude},</if> - <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if> + <if test="recordUrl != null">record_url = #{recordUrl},</if> <if test="viewTime != null">view_time = #{viewTime},</if> <if test="createBy != null">create_by = #{createBy},</if> <if test="createTime != null">create_time = #{createTime},</if> + <if test="updateTime != null">update_time = #{updateTime},</if> <if test="userId != null">user_id = #{userId},</if> <if test="deptId != null">dept_id = #{deptId},</if> - <if test="guideFlag != null">guide_flag = #{guideFlag},</if> + <if test="guideTime != null">guide_time = #{guideTime},</if> </trim> where id = #{id} </update> @@ -108,7 +118,7 @@ </delete> <delete id="deleteArdAlarmRadarPumpByIds" parameterType="String"> - delete from ard_alarm_radar_pump where id in + delete from ard_alarm_radar_pump where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> @@ -140,7 +150,7 @@ aar.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE ) GROUP BY aar.NAME ) r - INNER JOIN ard_alarm_radar_pump aaar ON r.create_time1 = aaar.create_time + INNER JOIN ard_alarm_radar_pump aaar ON aaar.NAME = r.NAME AND r.create_time1 = aaar.create_time </select> <update id="updateViewTimeByCondition" parameterType="String"> update ard_alarm_radar_pump @@ -149,4 +159,17 @@ and alarm_time<=#{alarmTime} and view_time is null </update> -</mapper> \ No newline at end of file + <select id="selectArdAlarmRadarLastData" parameterType="String" resultMap="ArdAlarmRadarPumpResult"> + select * from ard_alarm_radar_pump where name=#{name} order by update_time desc LIMIT 1 + </select> + <select id="pumpYear" resultType="com.ruoyi.statistical.vo.CountVo"> + select to_char(alarm_time::DATE, 'MM') as date,count(id) + from ard_alarm_radar_pump + where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date + </select> + <select id="pumpMonth" resultType="com.ruoyi.statistical.vo.CountVo"> + select to_char(alarm_time::DATE, 'dd') as date,count(id) + from ard_alarm_radar_pump + where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date + </select> +</mapper> -- Gitblit v1.9.3