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 2a44376..ebf331e 100644 --- a/src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java +++ b/src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java @@ -46,6 +46,7 @@ public class TaskConvert { model.setUpdateBy(entity.getUpdateBy()); model.setUpdateTime(entity.getUpdateTime()); model.setRemark(entity.getRemark()); + model.setRouteUrl(entity.getRouteUrl()); return model; } @@ -81,6 +82,7 @@ public class TaskConvert { entity.setUpdateBy(model.getUpdateBy()); entity.setUpdateTime(model.getUpdateTime()); entity.setRemark(model.getRemark()); + entity.setRouteUrl(model.getRouteUrl()); return entity; } diff --git a/src/main/java/com/ruoyi/task/domain/convert/TaskPlanConvert.java b/src/main/java/com/ruoyi/task/domain/convert/TaskPlanConvert.java index 7fcf6f8..dc3f43b 100644 --- a/src/main/java/com/ruoyi/task/domain/convert/TaskPlanConvert.java +++ b/src/main/java/com/ruoyi/task/domain/convert/TaskPlanConvert.java @@ -46,6 +46,7 @@ public class TaskPlanConvert { model.setUpdateBy(entity.getUpdateBy()); model.setUpdateTime(entity.getUpdateTime()); model.setRemark(entity.getRemark()); + model.setRouteUrl(entity.getRouteUrl()); return model; } @@ -81,6 +82,7 @@ public class TaskPlanConvert { entity.setUpdateBy(model.getUpdateBy()); entity.setUpdateTime(model.getUpdateTime()); entity.setRemark(model.getRemark()); + entity.setRouteUrl(model.getRouteUrl()); return entity; } 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 348c5c2..15de1fb 100644 --- a/src/main/java/com/ruoyi/task/domain/model/Task.java +++ b/src/main/java/com/ruoyi/task/domain/model/Task.java @@ -72,6 +72,9 @@ public class Task { /** 备注 */ private String remark; + /** 航线文件URL */ + private String routeUrl; + // Getters and Setters public Long getId() { return id; @@ -225,6 +228,14 @@ public class Task { this.remark = remark; } + public String getRouteUrl() { + return routeUrl; + } + + public void setRouteUrl(String routeUrl) { + this.routeUrl = routeUrl; + } + @Override public String toString() { return "Task{" + @@ -242,6 +253,7 @@ public class Task { ", actualStartTime=" + actualStartTime + ", actualEndTime=" + actualEndTime + ", description='" + description + '\'' + + ", routeUrl='" + routeUrl + '\'' + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/task/domain/model/TaskPlan.java b/src/main/java/com/ruoyi/task/domain/model/TaskPlan.java index 7b2c6ec..7ed44b1 100644 --- a/src/main/java/com/ruoyi/task/domain/model/TaskPlan.java +++ b/src/main/java/com/ruoyi/task/domain/model/TaskPlan.java @@ -87,6 +87,9 @@ public class TaskPlan { /** 备注 */ private String remark; + /** 航线文件URL */ + private String routeUrl; + // Getters and Setters public Long getId() { return id; @@ -240,6 +243,14 @@ public class TaskPlan { this.remark = remark; } + public String getRouteUrl() { + return routeUrl; + } + + public void setRouteUrl(String routeUrl) { + this.routeUrl = routeUrl; + } + @Override public String toString() { return "TaskPlan{" + @@ -257,6 +268,7 @@ public class TaskPlan { ", uavId=" + uavId + ", status=" + status + ", description='" + description + '\'' + + ", routeUrl='" + routeUrl + '\'' + '}'; } } \ No newline at end of file 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 491bd1d..dc41b27 100644 --- a/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java +++ b/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java @@ -56,6 +56,9 @@ public class TaskInfoEntity extends BaseEntity { /** 描述 */ private String description; + /** 航线文件URL */ + private String routeUrl; + public Long getId() { return id; } @@ -168,6 +171,14 @@ public class TaskInfoEntity extends BaseEntity { this.description = description; } + public String getRouteUrl() { + return routeUrl; + } + + public void setRouteUrl(String routeUrl) { + this.routeUrl = routeUrl; + } + @Override public String toString() { return "TaskInfoEntity{" + @@ -185,6 +196,7 @@ public class TaskInfoEntity extends BaseEntity { ", actualStartTime=" + actualStartTime + ", actualEndTime=" + actualEndTime + ", description='" + description + '\'' + + ", routeUrl='" + routeUrl + '\'' + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java b/src/main/java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java index 56f3ab0..78f15f3 100644 --- a/src/main/java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java +++ b/src/main/java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java @@ -56,6 +56,9 @@ public class TaskPlanEntity extends BaseEntity { /** 描述 */ private String description; + /** 航线文件URL */ + private String routeUrl; + public Long getId() { return id; } @@ -168,6 +171,14 @@ public class TaskPlanEntity extends BaseEntity { this.description = description; } + public String getRouteUrl() { + return routeUrl; + } + + public void setRouteUrl(String routeUrl) { + this.routeUrl = routeUrl; + } + @Override public String toString() { return "TaskPlanEntity{" + @@ -185,6 +196,7 @@ public class TaskPlanEntity extends BaseEntity { ", uavId=" + uavId + ", status='" + status + '\'' + ", description='" + description + '\'' + + ", routeUrl='" + routeUrl + '\'' + '}'; } } diff --git a/src/main/java/com/ruoyi/task/service/convert/TaskDTOConvert.java b/src/main/java/com/ruoyi/task/service/convert/TaskDTOConvert.java index 7dbf74a..3ec6bc4 100644 --- a/src/main/java/com/ruoyi/task/service/convert/TaskDTOConvert.java +++ b/src/main/java/com/ruoyi/task/service/convert/TaskDTOConvert.java @@ -31,6 +31,7 @@ public class TaskDTOConvert { dto.setActualEndTime(task.getActualEndTime()); dto.setDescription(task.getDescription()); dto.setRemark(task.getRemark()); + dto.setRouteUrl(task.getRouteUrl()); return dto; } @@ -56,6 +57,7 @@ public class TaskDTOConvert { task.setActualEndTime(dto.getActualEndTime()); task.setDescription(dto.getDescription()); task.setRemark(dto.getRemark()); + task.setRouteUrl(dto.getRouteUrl()); return task; } diff --git a/src/main/java/com/ruoyi/task/service/convert/TaskPlanDTOConvert.java b/src/main/java/com/ruoyi/task/service/convert/TaskPlanDTOConvert.java index bd247ff..b394b50 100644 --- a/src/main/java/com/ruoyi/task/service/convert/TaskPlanDTOConvert.java +++ b/src/main/java/com/ruoyi/task/service/convert/TaskPlanDTOConvert.java @@ -33,6 +33,7 @@ public class TaskPlanDTOConvert { dto.setStatus(taskPlan.getStatus()); dto.setDescription(taskPlan.getDescription()); dto.setRemark(taskPlan.getRemark()); + dto.setRouteUrl(taskPlan.getRouteUrl()); return dto; } @@ -58,6 +59,7 @@ public class TaskPlanDTOConvert { taskPlan.setStatus(dto.getStatus()); taskPlan.setDescription(dto.getDescription()); taskPlan.setRemark(dto.getRemark()); + taskPlan.setRouteUrl(dto.getRouteUrl()); return taskPlan; } diff --git a/src/main/java/com/ruoyi/task/service/dto/TaskDTO.java b/src/main/java/com/ruoyi/task/service/dto/TaskDTO.java index b95b094..3b4a23d 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskDTO.java @@ -60,6 +60,9 @@ public class TaskDTO { /** 备注 */ private String remark; + /** 航线文件URL */ + private String routeUrl; + // Getters and Setters public Long getId() { return id; @@ -181,6 +184,14 @@ public class TaskDTO { this.remark = remark; } + public String getRouteUrl() { + return routeUrl; + } + + public void setRouteUrl(String routeUrl) { + this.routeUrl = routeUrl; + } + @Override public String toString() { return "TaskDTO{" + @@ -198,6 +209,7 @@ public class TaskDTO { ", actualStartTime=" + actualStartTime + ", actualEndTime=" + actualEndTime + ", description='" + description + '\'' + + ", routeUrl='" + routeUrl + '\'' + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java b/src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java index 0a1ad77..c934e55 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java @@ -62,6 +62,9 @@ public class TaskPlanDTO { /** 备注 */ private String remark; + /** 航线文件URL */ + private String routeUrl; + // Getters and Setters public Long getId() { return id; @@ -183,6 +186,14 @@ public class TaskPlanDTO { this.remark = remark; } + public String getRouteUrl() { + return routeUrl; + } + + public void setRouteUrl(String routeUrl) { + this.routeUrl = routeUrl; + } + @Override public String toString() { return "TaskPlanDTO{" + @@ -200,6 +211,7 @@ public class TaskPlanDTO { ", uavId=" + uavId + ", status=" + status + ", description='" + description + '\'' + + ", routeUrl='" + routeUrl + '\'' + '}'; } } \ No newline at end of file diff --git a/src/main/resources/db/migration/V5__Add_route_url_column.sql b/src/main/resources/db/migration/V5__Add_route_url_column.sql new file mode 100644 index 0000000..6469a83 --- /dev/null +++ b/src/main/resources/db/migration/V5__Add_route_url_column.sql @@ -0,0 +1,5 @@ +-- 添加 route_url 字段到 task_info 表 +ALTER TABLE task_info ADD COLUMN route_url VARCHAR(255) COMMENT '航线文件URL'; + +-- 添加 route_url 字段到 task_plan 表 +ALTER TABLE task_plan ADD COLUMN route_url VARCHAR(255) COMMENT '航线文件URL'; diff --git a/src/main/resources/mapper/task/TaskInfoMapper.xml b/src/main/resources/mapper/task/TaskInfoMapper.xml index 3d1608a..5369d40 100644 --- a/src/main/resources/mapper/task/TaskInfoMapper.xml +++ b/src/main/resources/mapper/task/TaskInfoMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,7 +29,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, actual_start_time, actual_end_time, description, + uav_id, execute_type, status, start_time, end_time, actual_start_time, actual_end_time, description, route_url, create_by, create_time, update_by, update_time, remark from task_info @@ -84,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" actual_start_time, actual_end_time, description, + route_url, create_by, remark, create_time @@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{actualStartTime}, #{actualEndTime}, #{description}, + #{routeUrl}, #{createBy}, #{remark}, now() @@ -124,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" actual_start_time = #{actualStartTime}, actual_end_time = #{actualEndTime}, description = #{description}, + route_url = #{routeUrl}, update_by = #{updateBy}, remark = #{remark}, update_time = now() diff --git a/src/main/resources/mapper/task/TaskPlanMapper.xml b/src/main/resources/mapper/task/TaskPlanMapper.xml index eb5c39e..365bdc4 100644 --- a/src/main/resources/mapper/task/TaskPlanMapper.xml +++ b/src/main/resources/mapper/task/TaskPlanMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, plan_name, plan_type, cycle_type, cycle_value, execute_type, execute_time, duration, start_date, end_date, route_id, uav_id, status, - description, create_by, create_time, update_by, update_time, remark + description, route_url, create_by, create_time, update_by, update_time, remark from task_plan @@ -81,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" uav_id, status, description, + route_url, create_by, remark, create_time @@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{uavId}, #{status}, #{description}, + #{routeUrl}, #{createBy}, #{remark}, now() @@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" uav_id = #{uavId}, status = #{status}, description = #{description}, + route_url = #{routeUrl}, update_by = #{updateBy}, remark = #{remark}, update_time = now()