添加航线地址
This commit is contained in:
parent
2854ca20b1
commit
3bc760cfb2
|
|
@ -46,6 +46,7 @@ public class TaskConvert {
|
||||||
model.setUpdateBy(entity.getUpdateBy());
|
model.setUpdateBy(entity.getUpdateBy());
|
||||||
model.setUpdateTime(entity.getUpdateTime());
|
model.setUpdateTime(entity.getUpdateTime());
|
||||||
model.setRemark(entity.getRemark());
|
model.setRemark(entity.getRemark());
|
||||||
|
model.setRouteUrl(entity.getRouteUrl());
|
||||||
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
@ -81,6 +82,7 @@ public class TaskConvert {
|
||||||
entity.setUpdateBy(model.getUpdateBy());
|
entity.setUpdateBy(model.getUpdateBy());
|
||||||
entity.setUpdateTime(model.getUpdateTime());
|
entity.setUpdateTime(model.getUpdateTime());
|
||||||
entity.setRemark(model.getRemark());
|
entity.setRemark(model.getRemark());
|
||||||
|
entity.setRouteUrl(model.getRouteUrl());
|
||||||
|
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ public class TaskPlanConvert {
|
||||||
model.setUpdateBy(entity.getUpdateBy());
|
model.setUpdateBy(entity.getUpdateBy());
|
||||||
model.setUpdateTime(entity.getUpdateTime());
|
model.setUpdateTime(entity.getUpdateTime());
|
||||||
model.setRemark(entity.getRemark());
|
model.setRemark(entity.getRemark());
|
||||||
|
model.setRouteUrl(entity.getRouteUrl());
|
||||||
|
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
@ -81,6 +82,7 @@ public class TaskPlanConvert {
|
||||||
entity.setUpdateBy(model.getUpdateBy());
|
entity.setUpdateBy(model.getUpdateBy());
|
||||||
entity.setUpdateTime(model.getUpdateTime());
|
entity.setUpdateTime(model.getUpdateTime());
|
||||||
entity.setRemark(model.getRemark());
|
entity.setRemark(model.getRemark());
|
||||||
|
entity.setRouteUrl(model.getRouteUrl());
|
||||||
|
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,6 +72,9 @@ public class Task {
|
||||||
/** 备注 */
|
/** 备注 */
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/** 航线文件URL */
|
||||||
|
private String routeUrl;
|
||||||
|
|
||||||
// Getters and Setters
|
// Getters and Setters
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
|
|
@ -225,6 +228,14 @@ public class Task {
|
||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getRouteUrl() {
|
||||||
|
return routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRouteUrl(String routeUrl) {
|
||||||
|
this.routeUrl = routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Task{" +
|
return "Task{" +
|
||||||
|
|
@ -242,6 +253,7 @@ public class Task {
|
||||||
", actualStartTime=" + actualStartTime +
|
", actualStartTime=" + actualStartTime +
|
||||||
", actualEndTime=" + actualEndTime +
|
", actualEndTime=" + actualEndTime +
|
||||||
", description='" + description + '\'' +
|
", description='" + description + '\'' +
|
||||||
|
", routeUrl='" + routeUrl + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -87,6 +87,9 @@ public class TaskPlan {
|
||||||
/** 备注 */
|
/** 备注 */
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/** 航线文件URL */
|
||||||
|
private String routeUrl;
|
||||||
|
|
||||||
// Getters and Setters
|
// Getters and Setters
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
|
|
@ -240,6 +243,14 @@ public class TaskPlan {
|
||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getRouteUrl() {
|
||||||
|
return routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRouteUrl(String routeUrl) {
|
||||||
|
this.routeUrl = routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "TaskPlan{" +
|
return "TaskPlan{" +
|
||||||
|
|
@ -257,6 +268,7 @@ public class TaskPlan {
|
||||||
", uavId=" + uavId +
|
", uavId=" + uavId +
|
||||||
", status=" + status +
|
", status=" + status +
|
||||||
", description='" + description + '\'' +
|
", description='" + description + '\'' +
|
||||||
|
", routeUrl='" + routeUrl + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -56,6 +56,9 @@ public class TaskInfoEntity extends BaseEntity {
|
||||||
/** 描述 */
|
/** 描述 */
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
|
/** 航线文件URL */
|
||||||
|
private String routeUrl;
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
@ -168,6 +171,14 @@ public class TaskInfoEntity extends BaseEntity {
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getRouteUrl() {
|
||||||
|
return routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRouteUrl(String routeUrl) {
|
||||||
|
this.routeUrl = routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "TaskInfoEntity{" +
|
return "TaskInfoEntity{" +
|
||||||
|
|
@ -185,6 +196,7 @@ public class TaskInfoEntity extends BaseEntity {
|
||||||
", actualStartTime=" + actualStartTime +
|
", actualStartTime=" + actualStartTime +
|
||||||
", actualEndTime=" + actualEndTime +
|
", actualEndTime=" + actualEndTime +
|
||||||
", description='" + description + '\'' +
|
", description='" + description + '\'' +
|
||||||
|
", routeUrl='" + routeUrl + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -56,6 +56,9 @@ public class TaskPlanEntity extends BaseEntity {
|
||||||
/** 描述 */
|
/** 描述 */
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
|
/** 航线文件URL */
|
||||||
|
private String routeUrl;
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
@ -168,6 +171,14 @@ public class TaskPlanEntity extends BaseEntity {
|
||||||
this.description = description;
|
this.description = description;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getRouteUrl() {
|
||||||
|
return routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRouteUrl(String routeUrl) {
|
||||||
|
this.routeUrl = routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "TaskPlanEntity{" +
|
return "TaskPlanEntity{" +
|
||||||
|
|
@ -185,6 +196,7 @@ public class TaskPlanEntity extends BaseEntity {
|
||||||
", uavId=" + uavId +
|
", uavId=" + uavId +
|
||||||
", status='" + status + '\'' +
|
", status='" + status + '\'' +
|
||||||
", description='" + description + '\'' +
|
", description='" + description + '\'' +
|
||||||
|
", routeUrl='" + routeUrl + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ public class TaskDTOConvert {
|
||||||
dto.setActualEndTime(task.getActualEndTime());
|
dto.setActualEndTime(task.getActualEndTime());
|
||||||
dto.setDescription(task.getDescription());
|
dto.setDescription(task.getDescription());
|
||||||
dto.setRemark(task.getRemark());
|
dto.setRemark(task.getRemark());
|
||||||
|
dto.setRouteUrl(task.getRouteUrl());
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
@ -56,6 +57,7 @@ public class TaskDTOConvert {
|
||||||
task.setActualEndTime(dto.getActualEndTime());
|
task.setActualEndTime(dto.getActualEndTime());
|
||||||
task.setDescription(dto.getDescription());
|
task.setDescription(dto.getDescription());
|
||||||
task.setRemark(dto.getRemark());
|
task.setRemark(dto.getRemark());
|
||||||
|
task.setRouteUrl(dto.getRouteUrl());
|
||||||
|
|
||||||
return task;
|
return task;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ public class TaskPlanDTOConvert {
|
||||||
dto.setStatus(taskPlan.getStatus());
|
dto.setStatus(taskPlan.getStatus());
|
||||||
dto.setDescription(taskPlan.getDescription());
|
dto.setDescription(taskPlan.getDescription());
|
||||||
dto.setRemark(taskPlan.getRemark());
|
dto.setRemark(taskPlan.getRemark());
|
||||||
|
dto.setRouteUrl(taskPlan.getRouteUrl());
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
@ -58,6 +59,7 @@ public class TaskPlanDTOConvert {
|
||||||
taskPlan.setStatus(dto.getStatus());
|
taskPlan.setStatus(dto.getStatus());
|
||||||
taskPlan.setDescription(dto.getDescription());
|
taskPlan.setDescription(dto.getDescription());
|
||||||
taskPlan.setRemark(dto.getRemark());
|
taskPlan.setRemark(dto.getRemark());
|
||||||
|
taskPlan.setRouteUrl(dto.getRouteUrl());
|
||||||
|
|
||||||
return taskPlan;
|
return taskPlan;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,9 @@ public class TaskDTO {
|
||||||
/** 备注 */
|
/** 备注 */
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/** 航线文件URL */
|
||||||
|
private String routeUrl;
|
||||||
|
|
||||||
// Getters and Setters
|
// Getters and Setters
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
|
|
@ -181,6 +184,14 @@ public class TaskDTO {
|
||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getRouteUrl() {
|
||||||
|
return routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRouteUrl(String routeUrl) {
|
||||||
|
this.routeUrl = routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "TaskDTO{" +
|
return "TaskDTO{" +
|
||||||
|
|
@ -198,6 +209,7 @@ public class TaskDTO {
|
||||||
", actualStartTime=" + actualStartTime +
|
", actualStartTime=" + actualStartTime +
|
||||||
", actualEndTime=" + actualEndTime +
|
", actualEndTime=" + actualEndTime +
|
||||||
", description='" + description + '\'' +
|
", description='" + description + '\'' +
|
||||||
|
", routeUrl='" + routeUrl + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -62,6 +62,9 @@ public class TaskPlanDTO {
|
||||||
/** 备注 */
|
/** 备注 */
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/** 航线文件URL */
|
||||||
|
private String routeUrl;
|
||||||
|
|
||||||
// Getters and Setters
|
// Getters and Setters
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
|
|
@ -183,6 +186,14 @@ public class TaskPlanDTO {
|
||||||
this.remark = remark;
|
this.remark = remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getRouteUrl() {
|
||||||
|
return routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRouteUrl(String routeUrl) {
|
||||||
|
this.routeUrl = routeUrl;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "TaskPlanDTO{" +
|
return "TaskPlanDTO{" +
|
||||||
|
|
@ -200,6 +211,7 @@ public class TaskPlanDTO {
|
||||||
", uavId=" + uavId +
|
", uavId=" + uavId +
|
||||||
", status=" + status +
|
", status=" + status +
|
||||||
", description='" + description + '\'' +
|
", description='" + description + '\'' +
|
||||||
|
", routeUrl='" + routeUrl + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -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';
|
||||||
|
|
@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="actualStartTime" column="actual_start_time" />
|
<result property="actualStartTime" column="actual_start_time" />
|
||||||
<result property="actualEndTime" column="actual_end_time" />
|
<result property="actualEndTime" column="actual_end_time" />
|
||||||
<result property="description" column="description" />
|
<result property="description" column="description" />
|
||||||
|
<result property="routeUrl" column="route_url" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
|
|
@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
|
||||||
<sql id="selectTaskInfoVo">
|
<sql id="selectTaskInfoVo">
|
||||||
select id, task_name, task_category, task_type, plan_id, route_id,
|
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
|
create_by, create_time, update_by, update_time, remark
|
||||||
from task_info
|
from task_info
|
||||||
</sql>
|
</sql>
|
||||||
|
|
@ -84,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="actualStartTime != null">actual_start_time,</if>
|
<if test="actualStartTime != null">actual_start_time,</if>
|
||||||
<if test="actualEndTime != null">actual_end_time,</if>
|
<if test="actualEndTime != null">actual_end_time,</if>
|
||||||
<if test="description != null and description != ''">description,</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="createBy != null and createBy != ''">create_by,</if>
|
||||||
<if test="remark != null and remark != ''">remark,</if>
|
<if test="remark != null and remark != ''">remark,</if>
|
||||||
create_time
|
create_time
|
||||||
|
|
@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="actualStartTime != null">#{actualStartTime},</if>
|
<if test="actualStartTime != null">#{actualStartTime},</if>
|
||||||
<if test="actualEndTime != null">#{actualEndTime},</if>
|
<if test="actualEndTime != null">#{actualEndTime},</if>
|
||||||
<if test="description != null and description != ''">#{description},</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="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
<if test="remark != null and remark != ''">#{remark},</if>
|
<if test="remark != null and remark != ''">#{remark},</if>
|
||||||
now()
|
now()
|
||||||
|
|
@ -124,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="actualStartTime != null">actual_start_time = #{actualStartTime},</if>
|
<if test="actualStartTime != null">actual_start_time = #{actualStartTime},</if>
|
||||||
<if test="actualEndTime != null">actual_end_time = #{actualEndTime},</if>
|
<if test="actualEndTime != null">actual_end_time = #{actualEndTime},</if>
|
||||||
<if test="description != null and description != ''">description = #{description},</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="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||||
<if test="remark != null">remark = #{remark},</if>
|
<if test="remark != null">remark = #{remark},</if>
|
||||||
update_time = now()
|
update_time = now()
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="uavId" column="uav_id" />
|
<result property="uavId" column="uav_id" />
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status" />
|
||||||
<result property="description" column="description" />
|
<result property="description" column="description" />
|
||||||
|
<result property="routeUrl" column="route_url" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
|
|
@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<sql id="selectTaskPlanVo">
|
<sql id="selectTaskPlanVo">
|
||||||
select id, plan_name, plan_type, cycle_type, cycle_value, execute_type,
|
select id, plan_name, plan_type, cycle_type, cycle_value, execute_type,
|
||||||
execute_time, duration, start_date, end_date, route_id, uav_id, status,
|
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
|
from task_plan
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
|
@ -81,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="uavId != null">uav_id,</if>
|
<if test="uavId != null">uav_id,</if>
|
||||||
<if test="status != null and status != ''">status,</if>
|
<if test="status != null and status != ''">status,</if>
|
||||||
<if test="description != null and description != ''">description,</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="createBy != null and createBy != ''">create_by,</if>
|
||||||
<if test="remark != null and remark != ''">remark,</if>
|
<if test="remark != null and remark != ''">remark,</if>
|
||||||
create_time
|
create_time
|
||||||
|
|
@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="uavId != null">#{uavId},</if>
|
<if test="uavId != null">#{uavId},</if>
|
||||||
<if test="status != null and status != ''">#{status},</if>
|
<if test="status != null and status != ''">#{status},</if>
|
||||||
<if test="description != null and description != ''">#{description},</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="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
<if test="remark != null and remark != ''">#{remark},</if>
|
<if test="remark != null and remark != ''">#{remark},</if>
|
||||||
now()
|
now()
|
||||||
|
|
@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="uavId != null">uav_id = #{uavId},</if>
|
<if test="uavId != null">uav_id = #{uavId},</if>
|
||||||
<if test="status != null and status != ''">status = #{status},</if>
|
<if test="status != null and status != ''">status = #{status},</if>
|
||||||
<if test="description != null and description != ''">description = #{description},</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="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||||
<if test="remark != null">remark = #{remark},</if>
|
<if test="remark != null">remark = #{remark},</if>
|
||||||
update_time = now()
|
update_time = now()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue