feat(video): 添加设备名称字段并优化巡检任务关联查询
- 在 Device 实体类中新增 deviceName 字段及其 getter/setter 方法 - 更新 DeviceMapper.xml,支持 device_name 字段的查询、插入和更新操作 - 修改 InspectionTask 实体类,增加 deviceIp 字段用于联查返回设备 IP - 调整 InspectionTaskMapper.xml,通过左连接获取设备名称与 IP 信息- 移除冗余的 device_name 插入与更新逻辑 - 注释掉旧有的设备信息设置代码,避免重复赋值 - 更新 toString 方法以包含新的 deviceName 属性
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
<result property="taskName" column="task_name" />
|
||||
<result property="deviceId" column="device_id" />
|
||||
<result property="deviceName" column="device_name" />
|
||||
<result property="deviceIp" column="device_ip" />
|
||||
<result property="cronExpression" column="cron_expression" />
|
||||
<result property="duration" column="duration" />
|
||||
<result property="threshold" column="threshold" />
|
||||
@@ -26,10 +27,15 @@
|
||||
</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, model_name, remark, create_by, create_time, update_by, update_time
|
||||
from v_inspection_task
|
||||
select
|
||||
t.task_id, t.task_name, t.device_id,
|
||||
t.cron_expression, t.duration,
|
||||
t.threshold, t.enable_detection, t.status, t.execute_count, t.alarm_count,
|
||||
t.last_execute_time, t.model_name, t.remark, t.create_by, t.create_time, t.update_by, t.update_time,
|
||||
d.device_name as device_name,
|
||||
d.ip as device_ip
|
||||
from v_inspection_task t
|
||||
left join v_device d on t.device_id = d.device_id
|
||||
</sql>
|
||||
|
||||
<select id="selectInspectionTaskList" parameterType="InspectionTask" resultMap="InspectionTaskResult">
|
||||
@@ -37,7 +43,7 @@
|
||||
<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="deviceName != null and deviceName != ''"> and d.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>
|
||||
<if test="modelName != null and modelName != ''"> and model_name = #{modelName}</if>
|
||||
@@ -61,7 +67,6 @@
|
||||
<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>
|
||||
@@ -78,7 +83,6 @@
|
||||
<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>
|
||||
@@ -99,7 +103,6 @@
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user