From 8a33db76a3fb9612e9bdedfffafb66af1fb2e891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 6 Mar 2026 13:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/domain/convert/TaskConvert.java | 4 ++++ .../com/ruoyi/task/domain/model/Task.java | 24 +++++++++++++++++++ .../task/mapper/entity/TaskInfoEntity.java | 24 +++++++++++++++++++ .../migration/V4__Add_actual_time_columns.sql | 6 +++++ .../resources/mapper/task/TaskInfoMapper.xml | 10 +++++++- 5 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/migration/V4__Add_actual_time_columns.sql diff --git a/src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java b/src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java index 1f15444..2a44376 100644 --- a/src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java +++ b/src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java @@ -38,6 +38,8 @@ public class TaskConvert { model.setStatus(StatusEnum.getByCode(entity.getStatus())); model.setStartTime(entity.getStartTime()); model.setEndTime(entity.getEndTime()); + model.setActualStartTime(entity.getActualStartTime()); + model.setActualEndTime(entity.getActualEndTime()); model.setDescription(entity.getDescription()); model.setCreateBy(entity.getCreateBy()); model.setCreateTime(entity.getCreateTime()); @@ -71,6 +73,8 @@ public class TaskConvert { entity.setStatus(model.getStatus() != null ? model.getStatus().getCode() : null); entity.setStartTime(model.getStartTime()); entity.setEndTime(model.getEndTime()); + entity.setActualStartTime(model.getActualStartTime()); + entity.setActualEndTime(model.getActualEndTime()); entity.setDescription(model.getDescription()); entity.setCreateBy(model.getCreateBy()); entity.setCreateTime(model.getCreateTime()); diff --git a/src/main/java/com/ruoyi/task/domain/model/Task.java b/src/main/java/com/ruoyi/task/domain/model/Task.java index 99ff311..348c5c2 100644 --- a/src/main/java/com/ruoyi/task/domain/model/Task.java +++ b/src/main/java/com/ruoyi/task/domain/model/Task.java @@ -48,6 +48,12 @@ public class Task { /** 结束时间 */ private Date endTime; + /** 实际开始时间 */ + private Date actualStartTime; + + /** 实际结束时间 */ + private Date actualEndTime; + /** 描述 */ private String description; @@ -155,6 +161,22 @@ public class Task { this.endTime = endTime; } + public Date getActualStartTime() { + return actualStartTime; + } + + public void setActualStartTime(Date actualStartTime) { + this.actualStartTime = actualStartTime; + } + + public Date getActualEndTime() { + return actualEndTime; + } + + public void setActualEndTime(Date actualEndTime) { + this.actualEndTime = actualEndTime; + } + public String getDescription() { return description; } @@ -217,6 +239,8 @@ public class Task { ", status=" + status + ", startTime=" + startTime + ", endTime=" + endTime + + ", actualStartTime=" + actualStartTime + + ", actualEndTime=" + actualEndTime + ", description='" + description + '\'' + '}'; } diff --git a/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java b/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java index 053b9ec..491bd1d 100644 --- a/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java +++ b/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java @@ -47,6 +47,12 @@ public class TaskInfoEntity extends BaseEntity { /** 结束时间 */ private Date endTime; + /** 实际开始时间 */ + private Date actualStartTime; + + /** 实际结束时间 */ + private Date actualEndTime; + /** 描述 */ private String description; @@ -138,6 +144,22 @@ public class TaskInfoEntity extends BaseEntity { this.endTime = endTime; } + public Date getActualStartTime() { + return actualStartTime; + } + + public void setActualStartTime(Date actualStartTime) { + this.actualStartTime = actualStartTime; + } + + public Date getActualEndTime() { + return actualEndTime; + } + + public void setActualEndTime(Date actualEndTime) { + this.actualEndTime = actualEndTime; + } + public String getDescription() { return description; } @@ -160,6 +182,8 @@ public class TaskInfoEntity extends BaseEntity { ", status='" + status + '\'' + ", startTime=" + startTime + ", endTime=" + endTime + + ", actualStartTime=" + actualStartTime + + ", actualEndTime=" + actualEndTime + ", description='" + description + '\'' + '}'; } diff --git a/src/main/resources/db/migration/V4__Add_actual_time_columns.sql b/src/main/resources/db/migration/V4__Add_actual_time_columns.sql new file mode 100644 index 0000000..0af06c5 --- /dev/null +++ b/src/main/resources/db/migration/V4__Add_actual_time_columns.sql @@ -0,0 +1,6 @@ +-- ---------------------------- +-- 添加任务实际执行时间和实际结束时间字段 +-- ---------------------------- +ALTER TABLE task_info +ADD COLUMN actual_start_time DATETIME DEFAULT NULL COMMENT '实际开始时间' AFTER start_time, +ADD COLUMN actual_end_time DATETIME DEFAULT NULL COMMENT '实际结束时间' AFTER end_time; \ No newline at end of file diff --git a/src/main/resources/mapper/task/TaskInfoMapper.xml b/src/main/resources/mapper/task/TaskInfoMapper.xml index 5b5bc39..3d1608a 100644 --- a/src/main/resources/mapper/task/TaskInfoMapper.xml +++ b/src/main/resources/mapper/task/TaskInfoMapper.xml @@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -26,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, task_name, task_category, task_type, plan_id, route_id, - uav_id, execute_type, status, start_time, end_time, description, + uav_id, execute_type, status, start_time, end_time, actual_start_time, actual_end_time, description, create_by, create_time, update_by, update_time, remark from task_info @@ -79,6 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, start_time, end_time, + actual_start_time, + actual_end_time, description, create_by, remark, @@ -95,6 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{startTime}, #{endTime}, + #{actualStartTime}, + #{actualEndTime}, #{description}, #{createBy}, #{remark}, @@ -115,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, start_time = #{startTime}, end_time = #{endTime}, + actual_start_time = #{actualStartTime}, + actual_end_time = #{actualEndTime}, description = #{description}, update_by = #{updateBy}, remark = #{remark},