THENG
/
a-tuoheng-task
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加航线地址

This commit is contained in:
孙小云 2026-03-07 10:38:28 +08:00
parent 2854ca20b1
commit 3bc760cfb2
13 changed files with 95 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ruoyi/task/domain/convert/TaskConvert.java
View File

@ -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;
}

2
src/main/java/com/ruoyi/task/domain/convert/TaskPlanConvert.java
View File

@ -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;
}

12
src/main/java/com/ruoyi/task/domain/model/Task.java
View File

@ -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 + '\'' +
'}';
}
}

12
src/main/java/com/ruoyi/task/domain/model/TaskPlan.java
View File

@ -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 + '\'' +
'}';
}
}

12
src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java
View File

@ -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 + '\'' +
'}';
}
}

12
src/main/java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java
View File

@ -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 + '\'' +
'}';
}
}

2
src/main/java/com/ruoyi/task/service/convert/TaskDTOConvert.java
View File

@ -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;
}

2
src/main/java/com/ruoyi/task/service/convert/TaskPlanDTOConvert.java
View File

@ -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;
}

12
src/main/java/com/ruoyi/task/service/dto/TaskDTO.java
View File

@ -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 + '\'' +
'}';
}
}

12
src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java
View File

@ -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 + '\'' +
'}';
}
}

5
src/main/resources/db/migration/V5__Add_route_url_column.sql Normal file
View File

@ -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';

6
src/main/resources/mapper/task/TaskInfoMapper.xml
View File

@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="actualStartTime" column="actual_start_time" />
<result property="actualEndTime" column="actual_end_time" />
<result property="description" column="description" />
<result property="routeUrl" column="route_url" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectTaskInfoVo">
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
</sql>
@ -84,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="actualStartTime != null">actual_start_time,</if>
<if test="actualEndTime != null">actual_end_time,</if>
<if test="description != null and description != ''">description,</if>
<if test="routeUrl != null and routeUrl != ''">route_url,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="actualStartTime != null">#{actualStartTime},</if>
<if test="actualEndTime != null">#{actualEndTime},</if>
<if test="description != null and description != ''">#{description},</if>
<if test="routeUrl != null and routeUrl != ''">#{routeUrl},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
now()
@ -124,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="actualStartTime != null">actual_start_time = #{actualStartTime},</if>
<if test="actualEndTime != null">actual_end_time = #{actualEndTime},</if>
<if test="description != null and description != ''">description = #{description},</if>
<if test="routeUrl != null and routeUrl != ''">route_url = #{routeUrl},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
update_time = now()

6
src/main/resources/mapper/task/TaskPlanMapper.xml
View File

@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="uavId" column="uav_id" />
<result property="status" column="status" />
<result property="description" column="description" />
<result property="routeUrl" column="route_url" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectTaskPlanVo">
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
</sql>
@ -81,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="uavId != null">uav_id,</if>
<if test="status != null and status != ''">status,</if>
<if test="description != null and description != ''">description,</if>
<if test="routeUrl != null and routeUrl != ''">route_url,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="uavId != null">#{uavId},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="description != null and description != ''">#{description},</if>
<if test="routeUrl != null and routeUrl != ''">#{routeUrl},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
now()
@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="uavId != null">uav_id = #{uavId},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="description != null and description != ''">description = #{description},</if>
<if test="routeUrl != null and routeUrl != ''">route_url = #{routeUrl},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
update_time = now()