feat(video): 添加报警记录管理功能- 新增报警记录实体类 AlarmRecord 及相关字段定义
- 实现报警记录的增删改查接口与 Mapper 层逻辑 - 添加报警记录前端页面，支持列表展示、搜索、处理与忽略操作 - 支持批量处理报警记录及导出功能 - 增加报警记录详情查看弹窗，展示图片与视频信息- 配置定时任务白名单，允许访问 ruoyi.video 包 - 引入 JavaCV 依赖以支持视频处理功能 - 添加 testng 依赖用于测试支持
This commit is contained in:
@@ -0,0 +1,147 @@
|
||||
<?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">
|
||||
<mapper namespace="com.ruoyi.video.mapper.AlarmRecordMapper">
|
||||
|
||||
<resultMap type="AlarmRecord" id="AlarmRecordResult">
|
||||
<result property="alarmId" column="alarm_id" />
|
||||
<result property="taskId" column="task_id" />
|
||||
<result property="taskName" column="task_name" />
|
||||
<result property="deviceId" column="device_id" />
|
||||
<result property="deviceName" column="device_name" />
|
||||
<result property="alarmType" column="alarm_type" />
|
||||
<result property="alarmLevel" column="alarm_level" />
|
||||
<result property="alarmDesc" column="alarm_desc" />
|
||||
<result property="confidence" column="confidence" />
|
||||
<result property="imagePath" column="image_path" />
|
||||
<result property="videoPath" column="video_path" />
|
||||
<result property="alarmTime" column="alarm_time" />
|
||||
<result property="handleStatus" column="handle_status" />
|
||||
<result property="handleBy" column="handle_by" />
|
||||
<result property="handleTime" column="handle_time" />
|
||||
<result property="handleRemark" column="handle_remark" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectAlarmRecordVo">
|
||||
select alarm_id, task_id, task_name, device_id, device_name, alarm_type,
|
||||
alarm_level, alarm_desc, confidence, image_path, video_path, alarm_time,
|
||||
handle_status, handle_by, handle_time, handle_remark,
|
||||
create_by, create_time, update_by, update_time
|
||||
from v_alarm_record
|
||||
</sql>
|
||||
|
||||
<select id="selectAlarmRecordList" parameterType="AlarmRecord" resultMap="AlarmRecordResult">
|
||||
<include refid="selectAlarmRecordVo"/>
|
||||
<where>
|
||||
<if test="taskId != null "> and task_id = #{taskId}</if>
|
||||
<if test="taskName != null and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
|
||||
<if test="deviceId != null "> and device_id = #{deviceId}</if>
|
||||
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
|
||||
<if test="alarmType != null and alarmType != ''"> and alarm_type = #{alarmType}</if>
|
||||
<if test="alarmLevel != null and alarmLevel != ''"> and alarm_level = #{alarmLevel}</if>
|
||||
<if test="handleStatus != null and handleStatus != ''"> and handle_status = #{handleStatus}</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and date_format(alarm_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
and date_format(alarm_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
||||
</if>
|
||||
</where>
|
||||
order by alarm_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectAlarmRecordByAlarmId" parameterType="Long" resultMap="AlarmRecordResult">
|
||||
<include refid="selectAlarmRecordVo"/>
|
||||
where alarm_id = #{alarmId}
|
||||
</select>
|
||||
|
||||
<select id="countAlarmByTaskId" parameterType="Long" resultType="Long">
|
||||
select count(*) from v_alarm_record where task_id = #{taskId}
|
||||
</select>
|
||||
|
||||
<insert id="insertAlarmRecord" parameterType="AlarmRecord" useGeneratedKeys="true" keyProperty="alarmId">
|
||||
insert into v_alarm_record
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="taskId != null">task_id,</if>
|
||||
<if test="taskName != null">task_name,</if>
|
||||
<if test="deviceId != null">device_id,</if>
|
||||
<if test="deviceName != null">device_name,</if>
|
||||
<if test="alarmType != null and alarmType != ''">alarm_type,</if>
|
||||
<if test="alarmLevel != null and alarmLevel != ''">alarm_level,</if>
|
||||
<if test="alarmDesc != null">alarm_desc,</if>
|
||||
<if test="confidence != null">confidence,</if>
|
||||
<if test="imagePath != null">image_path,</if>
|
||||
<if test="videoPath != null">video_path,</if>
|
||||
<if test="alarmTime != null">alarm_time,</if>
|
||||
<if test="handleStatus != null">handle_status,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
create_time
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="taskId != null">#{taskId},</if>
|
||||
<if test="taskName != null">#{taskName},</if>
|
||||
<if test="deviceId != null">#{deviceId},</if>
|
||||
<if test="deviceName != null">#{deviceName},</if>
|
||||
<if test="alarmType != null and alarmType != ''">#{alarmType},</if>
|
||||
<if test="alarmLevel != null and alarmLevel != ''">#{alarmLevel},</if>
|
||||
<if test="alarmDesc != null">#{alarmDesc},</if>
|
||||
<if test="confidence != null">#{confidence},</if>
|
||||
<if test="imagePath != null">#{imagePath},</if>
|
||||
<if test="videoPath != null">#{videoPath},</if>
|
||||
<if test="alarmTime != null">#{alarmTime},</if>
|
||||
<if test="handleStatus != null">#{handleStatus},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
sysdate()
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateAlarmRecord" parameterType="AlarmRecord">
|
||||
update v_alarm_record
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="taskId != null">task_id = #{taskId},</if>
|
||||
<if test="taskName != null">task_name = #{taskName},</if>
|
||||
<if test="deviceId != null">device_id = #{deviceId},</if>
|
||||
<if test="deviceName != null">device_name = #{deviceName},</if>
|
||||
<if test="alarmType != null and alarmType != ''">alarm_type = #{alarmType},</if>
|
||||
<if test="alarmLevel != null and alarmLevel != ''">alarm_level = #{alarmLevel},</if>
|
||||
<if test="alarmDesc != null">alarm_desc = #{alarmDesc},</if>
|
||||
<if test="confidence != null">confidence = #{confidence},</if>
|
||||
<if test="imagePath != null">image_path = #{imagePath},</if>
|
||||
<if test="videoPath != null">video_path = #{videoPath},</if>
|
||||
<if test="alarmTime != null">alarm_time = #{alarmTime},</if>
|
||||
<if test="handleStatus != null">handle_status = #{handleStatus},</if>
|
||||
<if test="handleBy != null">handle_by = #{handleBy},</if>
|
||||
<if test="handleTime != null">handle_time = #{handleTime},</if>
|
||||
<if test="handleRemark != null">handle_remark = #{handleRemark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
update_time = sysdate()
|
||||
</trim>
|
||||
where alarm_id = #{alarmId}
|
||||
</update>
|
||||
|
||||
<update id="handleAlarmRecord">
|
||||
update v_alarm_record
|
||||
set handle_status = #{handleStatus},
|
||||
handle_by = #{handleBy},
|
||||
handle_time = sysdate(),
|
||||
handle_remark = #{handleRemark},
|
||||
update_time = sysdate()
|
||||
where alarm_id = #{alarmId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteAlarmRecordByAlarmId" parameterType="Long">
|
||||
delete from v_alarm_record where alarm_id = #{alarmId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteAlarmRecordByAlarmIds" parameterType="String">
|
||||
delete from v_alarm_record where alarm_id in
|
||||
<foreach item="alarmId" collection="array" open="(" separator="," close=")">
|
||||
#{alarmId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -0,0 +1,133 @@
|
||||
<?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">
|
||||
<mapper namespace="com.ruoyi.video.mapper.InspectionTaskMapper">
|
||||
|
||||
<resultMap type="InspectionTask" id="InspectionTaskResult">
|
||||
<result property="taskId" column="task_id" />
|
||||
<result property="taskName" column="task_name" />
|
||||
<result property="deviceId" column="device_id" />
|
||||
<result property="deviceName" column="device_name" />
|
||||
<result property="cronExpression" column="cron_expression" />
|
||||
<result property="duration" column="duration" />
|
||||
<result property="threshold" column="threshold" />
|
||||
<result property="enableDetection" column="enable_detection" />
|
||||
<result property="status" column="status" />
|
||||
<result property="executeCount" column="execute_count" />
|
||||
<result property="alarmCount" column="alarm_count" />
|
||||
<result property="lastExecuteTime" column="last_execute_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectInspectionTaskVo">
|
||||
select task_id, task_name, device_id, device_name, cron_expression, duration,
|
||||
threshold, enable_detection, status, execute_count, alarm_count,
|
||||
last_execute_time, remark, create_by, create_time, update_by, update_time
|
||||
from v_inspection_task
|
||||
</sql>
|
||||
|
||||
<select id="selectInspectionTaskList" parameterType="InspectionTask" resultMap="InspectionTaskResult">
|
||||
<include refid="selectInspectionTaskVo"/>
|
||||
<where>
|
||||
<if test="taskName != null and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
|
||||
<if test="deviceId != null "> and device_id = #{deviceId}</if>
|
||||
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="enableDetection != null and enableDetection != ''"> and enable_detection = #{enableDetection}</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectInspectionTaskByTaskId" parameterType="Long" resultMap="InspectionTaskResult">
|
||||
<include refid="selectInspectionTaskVo"/>
|
||||
where task_id = #{taskId}
|
||||
</select>
|
||||
|
||||
<select id="selectEnabledInspectionTaskList" resultMap="InspectionTaskResult">
|
||||
<include refid="selectInspectionTaskVo"/>
|
||||
where status = '0'
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<insert id="insertInspectionTask" parameterType="InspectionTask" useGeneratedKeys="true" keyProperty="taskId">
|
||||
insert into v_inspection_task
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="taskName != null and taskName != ''">task_name,</if>
|
||||
<if test="deviceId != null">device_id,</if>
|
||||
<if test="deviceName != null">device_name,</if>
|
||||
<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
|
||||
<if test="duration != null">duration,</if>
|
||||
<if test="threshold != null">threshold,</if>
|
||||
<if test="enableDetection != null">enable_detection,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="executeCount != null">execute_count,</if>
|
||||
<if test="alarmCount != null">alarm_count,</if>
|
||||
<if test="lastExecuteTime != null">last_execute_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
create_time
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="taskName != null and taskName != ''">#{taskName},</if>
|
||||
<if test="deviceId != null">#{deviceId},</if>
|
||||
<if test="deviceName != null">#{deviceName},</if>
|
||||
<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
|
||||
<if test="duration != null">#{duration},</if>
|
||||
<if test="threshold != null">#{threshold},</if>
|
||||
<if test="enableDetection != null">#{enableDetection},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="executeCount != null">#{executeCount},</if>
|
||||
<if test="alarmCount != null">#{alarmCount},</if>
|
||||
<if test="lastExecuteTime != null">#{lastExecuteTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
sysdate()
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateInspectionTask" parameterType="InspectionTask">
|
||||
update v_inspection_task
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
|
||||
<if test="deviceId != null">device_id = #{deviceId},</if>
|
||||
<if test="deviceName != null">device_name = #{deviceName},</if>
|
||||
<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
|
||||
<if test="duration != null">duration = #{duration},</if>
|
||||
<if test="threshold != null">threshold = #{threshold},</if>
|
||||
<if test="enableDetection != null">enable_detection = #{enableDetection},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
<if test="executeCount != null">execute_count = #{executeCount},</if>
|
||||
<if test="alarmCount != null">alarm_count = #{alarmCount},</if>
|
||||
<if test="lastExecuteTime != null">last_execute_time = #{lastExecuteTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
update_time = sysdate()
|
||||
</trim>
|
||||
where task_id = #{taskId}
|
||||
</update>
|
||||
|
||||
<update id="updateTaskExecuteInfo">
|
||||
update v_inspection_task
|
||||
set execute_count = #{executeCount},
|
||||
alarm_count = #{alarmCount},
|
||||
last_execute_time = sysdate(),
|
||||
update_time = sysdate()
|
||||
where task_id = #{taskId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteInspectionTaskByTaskId" parameterType="Long">
|
||||
delete from v_inspection_task where task_id = #{taskId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteInspectionTaskByTaskIds" parameterType="String">
|
||||
delete from v_inspection_task where task_id in
|
||||
<foreach item="taskId" collection="array" open="(" separator="," close=")">
|
||||
#{taskId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user