feat(video): 添加巡检任务记录关联任务ID功能
- 在巡检任务记录表中新增 task_id 字段并建立关联关系 - 移除巡检任务实体中的冗余 recordId 字段及相关映射配置- 更新数据库查询语句以适配新的字段结构 - 为 InspectionTaskRecord 实体类增加 taskId 属性及对应 getter/setter 方法- 新增根据任务ID查询记录列表的接口方法 - 修改 MyBatis 映射文件支持 task_id 的增删改查操作 - 调整 toString 方法输出内容以包含 taskId 信息
This commit is contained in:
@@ -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<InspectionTaskRecord> list = recordService.selectInspectionTaskRecordList(query);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/** 导出 */
|
||||
@Log(title = "巡检任务记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
|
||||
@@ -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 + '\'' +
|
||||
|
||||
@@ -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 + '\'' +
|
||||
|
||||
Reference in New Issue
Block a user