From 870c5df0398c808b6f097a91c1443dade5550473 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 十二月 2023 10:29:11 +0800
Subject: [PATCH] mybatisplusID赋值取消
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index e6704b4..3ec6951 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -19,11 +19,11 @@
<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="selectArdAlarmRadarMoveVo">
- select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url1,record_url2, view_time, create_by, create_time, user_id, dept_id, guide_flag from ard_alarm_radar_move
+ select id, name, target_id, alarm_type, alarm_time, longitude, latitude, record_url1,record_url2, view_time, create_by, create_time, user_id, dept_id, guide_time from ard_alarm_radar_move
</sql>
<select id="selectArdAlarmRadarMoveList" parameterType="ArdAlarmRadarMove" resultMap="ArdAlarmRadarMoveResult">
@@ -39,8 +39,15 @@
<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="selectArdAlarmRadarMoveById" parameterType="String" resultMap="ArdAlarmRadarMoveResult">
@@ -63,9 +70,10 @@
<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>
@@ -80,9 +88,10 @@
<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>
@@ -100,9 +109,10 @@
<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>
@@ -139,12 +149,13 @@
count(case when aar.view_time is null THEN 1 END) as count,
count(aar.id) as total
FROM
- ard_alarm_radar aar
+ ard_alarm_radar_move aar
WHERE
aar.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
GROUP BY aar.NAME
) r
- INNER JOIN ard_alarm_radar aaar ON r.create_time1 = aaar.create_time
+ INNER JOIN ard_alarm_radar_move aaar ON r.create_time1 = aaar.create_time
+ ORDER BY aaar.create_time desc
</select>
<update id="updateViewTimeByCondition" parameterType="String">
update ard_alarm_radar_move
@@ -153,4 +164,22 @@
and alarm_time<=#{alarmTime}
and view_time is null
</update>
+ <select id="selectArdAlarmRadarLastData" parameterType="String" resultMap="ArdAlarmRadarMoveResult">
+ select * from ard_alarm_radar_move where name=#{name} order by update_time desc LIMIT 1
+ </select>
+
+ <select id="moveYear" resultType="com.ruoyi.statistical.vo.CountVo">
+ select to_char(alarm_time::DATE, 'MM') as date,count(id)
+ from ard_alarm_radar_move
+ where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date
+ </select>
+ <select id="moveMonth" resultType="com.ruoyi.statistical.vo.CountVo">
+ select to_char(alarm_time::DATE, 'dd') as date,count(id)
+ from ard_alarm_radar_move
+ where alarm_time >= #{start} and alarm_time <= #{end} group by date order by date
+ </select>
+ <select id="ten" resultType="com.ruoyi.statistical.vo.TenVo">
+ SELECT name,count(name) as "value" from ard_alarm_radar_move
+ where (current_timestamp - interval '1024 hour') <= alarm_time GROUP BY name ORDER BY "value" desc LIMIT 10
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3