~liusuyi/ruoyi-api.git

			@@ -17,12 +17,22 @@
			</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 create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
			</if>
			@@ -80,7 +90,9 @@
			</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">
			@@ -97,10 +109,8 @@
			</select>
			<select id="selectListAllByCommand" resultMap="ArdAlarmApponekeyResult">
			SELECT T.*
			FROM
			(
			SELECT
			aaa.ID,
			FROM (
			SELECT aaa.ID,
			aaa.user_id,
			aaa.NAME,
			aaa.create_time,
			@@ -108,8 +118,7 @@
			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,
			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
			@@ -118,8 +127,7 @@
			ORDER BY
			aaa.create_time DESC
			) T
			WHERE
			T.rn = 1
			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>