diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/controller/InspectionTaskRecordController.java b/ruoyi-video/src/main/java/com/ruoyi/video/controller/InspectionTaskRecordController.java index e293102..dbbfd29 100644 --- a/ruoyi-video/src/main/java/com/ruoyi/video/controller/InspectionTaskRecordController.java +++ b/ruoyi-video/src/main/java/com/ruoyi/video/controller/InspectionTaskRecordController.java @@ -34,6 +34,16 @@ public class InspectionTaskRecordController extends BaseController { return getDataTable(list); } + /** 根据任务ID查询列表 */ + @GetMapping("/listByTask/{taskId}") + public TableDataInfo listByTask(@PathVariable("taskId") Long taskId) { + startPage(); + InspectionTaskRecord query = new InspectionTaskRecord(); + query.setTaskId(taskId); + List list = recordService.selectInspectionTaskRecordList(query); + return getDataTable(list); + } + /** 导出 */ @Log(title = "巡检任务记录", businessType = BusinessType.EXPORT) @PostMapping("/export") diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTask.java b/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTask.java index 4ccce35..2baf4c3 100644 --- a/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTask.java +++ b/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTask.java @@ -18,10 +18,6 @@ public class InspectionTask extends BaseEntity { /** 巡检任务ID */ private Long taskId; - /** 最近记录ID */ - @Excel(name = "记录ID") - private Long recordId; - /** 任务名称 */ @Excel(name = "任务名称") private String taskName; @@ -82,13 +78,6 @@ public class InspectionTask extends BaseEntity { this.taskId = taskId; } - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } public String getTaskName() { return taskName; @@ -190,7 +179,6 @@ public class InspectionTask extends BaseEntity { public String toString() { return "InspectionTask{" + "taskId=" + taskId + - ", recordId=" + recordId + ", taskName='" + taskName + '\'' + ", deviceId=" + deviceId + ", deviceName='" + deviceName + '\'' + diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTaskRecord.java b/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTaskRecord.java index 683eb49..8266e71 100644 --- a/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTaskRecord.java +++ b/ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTaskRecord.java @@ -18,6 +18,10 @@ public class InspectionTaskRecord extends BaseEntity { /** 记录ID,主键 */ private Long recordId; + /** 任务ID(关联巡检任务表) */ + @Excel(name = "任务ID") + private Long taskId; + /** 执行时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @@ -112,10 +116,19 @@ public class InspectionTaskRecord extends BaseEntity { this.remark = remark; } + public Long getTaskId() { + return taskId; + } + + public void setTaskId(Long taskId) { + this.taskId = taskId; + } + @Override public String toString() { return "InspectionTaskRecord{" + "recordId=" + recordId + + ", taskId=" + taskId + ", executeTime=" + executeTime + ", duration=" + duration + ", accessory='" + accessory + '\'' + diff --git a/ruoyi-video/src/main/resources/mapper/video/InspectionTaskMapper.xml b/ruoyi-video/src/main/resources/mapper/video/InspectionTaskMapper.xml index e7e66eb..f8fe71e 100644 --- a/ruoyi-video/src/main/resources/mapper/video/InspectionTaskMapper.xml +++ b/ruoyi-video/src/main/resources/mapper/video/InspectionTaskMapper.xml @@ -6,7 +6,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -26,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select task_id, record_id, task_name, device_id, device_name, cron_expression, duration, + 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 @@ -54,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into v_inspection_task task_name, - record_id, device_id, device_name, cron_expression, @@ -71,7 +69,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{taskName}, - #{recordId}, #{deviceId}, #{deviceName}, #{cronExpression}, @@ -92,7 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update v_inspection_task task_name = #{taskName}, - record_id = #{recordId}, device_id = #{deviceId}, device_name = #{deviceName}, cron_expression = #{cronExpression}, diff --git a/ruoyi-video/src/main/resources/mapper/video/InspectionTaskRecordMapper.xml b/ruoyi-video/src/main/resources/mapper/video/InspectionTaskRecordMapper.xml index 2ff72bf..a8453a4 100644 --- a/ruoyi-video/src/main/resources/mapper/video/InspectionTaskRecordMapper.xml +++ b/ruoyi-video/src/main/resources/mapper/video/InspectionTaskRecordMapper.xml @@ -6,6 +6,7 @@ + @@ -20,7 +21,7 @@ - select record_id, execute_time, duration, accessory, result, status, + select record_id, task_id, execute_time, duration, accessory, result, status, create_by, create_time, update_by, update_time, del_flag, remark from v_inspection_task_record @@ -28,6 +29,7 @@