~liusuyi/ruoyi-api.git

			@@ -26,7 +26,25 @@
			</resultMap>

			<sql id="selectArdAlarmTubeVo">
			select id, host, tube_id, tube_name, tube_type, pipe_diameter, color, position, type, alarm_type, alarm_time, watcher, create_time, longitude, latitude, altitude, record_url, view_time from ard_alarm_tube
			select id,
			host,
			tube_id,
			tube_name,
			tube_type,
			pipe_diameter,
			color,
			position,
			type,
			alarm_type,
			alarm_time,
			watcher,
			create_time,
			longitude,
			latitude,
			altitude,
			record_url,
			view_time
			from ard_alarm_tube
			</sql>

			<select id="selectArdAlarmTubeList" parameterType="ArdAlarmTube" resultMap="ArdAlarmTubeResult">
			@@ -41,7 +59,13 @@
			<if test="position != null and position != ''"> and position = #{position}</if>
			<if test="type != null and type != ''"> and type = #{type}</if>
			<if test="alarmType != null and alarmType != ''"> and alarm_type = #{alarmType}</if>
			<if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>
			<!--<if test="alarmTime != null "> and alarm_time = #{alarmTime}</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>
			<if test="watcher != null and watcher != ''"> and watcher = #{watcher}</if>
			<if test="longitude != null and longitude != ''"> and longitude = #{longitude}</if>
			<if test="latitude != null and latitude != ''"> and latitude = #{latitude}</if>
			@@ -125,7 +149,9 @@
			</update>

			<delete id="deleteArdAlarmTubeById" parameterType="String">
			delete from ard_alarm_tube where id = #{id}
			delete
			from ard_alarm_tube
			where id = #{id}
			</delete>

			<delete id="deleteArdAlarmTubeByIds" parameterType="String">
			@@ -145,8 +171,7 @@
			aat.latitude,
			aat.altitude,
			aat.record_url,
			ROW_NUMBER() OVER ( PARTITION BY aat.tube_id ORDER BY aat.alarm_time DESC ) AS rn,
			COUNT(CASE WHEN aat.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aat.tube_id ) AS COUNT,
			ROW_NUMBER() OVER ( PARTITION BY aat.tube_id ORDER BY aat.alarm_time DESC ) AS rn, COUNT(CASE WHEN aat.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aat.tube_id ) AS COUNT,
			COUNT ( aat.alarm_time ) OVER ( PARTITION BY tube_id ) AS total
			FROM
			ard_alarm_tube aat