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

修改字段类型

This commit is contained in:
孙小云 2026-03-09 09:51:54 +08:00
parent a3d7168699
commit 773bec2374
11 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ public class Task {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 状态 */ /** 状态 */
private StatusEnum status; private StatusEnum status;
@ -132,11 +132,11 @@ public class Task {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

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

@ -64,7 +64,7 @@ public class TaskPlan {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 状态 */ /** 状态 */
private StatusEnum status; private StatusEnum status;
@ -179,11 +179,11 @@ public class TaskPlan {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

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

@ -33,7 +33,7 @@ public class TaskInfoEntity extends BaseEntity {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 执行类型 */ /** 执行类型 */
private String executeType; private String executeType;
@ -107,11 +107,11 @@ public class TaskInfoEntity extends BaseEntity {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

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

@ -48,7 +48,7 @@ public class TaskPlanEntity extends BaseEntity {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 状态 */ /** 状态 */
private String status; private String status;
@ -147,11 +147,11 @@ public class TaskPlanEntity extends BaseEntity {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

6
src/main/java/com/ruoyi/task/service/api/ITaskService.java
View File

@ -48,14 +48,14 @@ public interface ITaskService {
* @param uavId 无人机ID * @param uavId 无人机ID
* @return 任务列表 * @return 任务列表
*/ */
List<TaskDTO> getTaskByUavId(Long uavId); List<TaskDTO> getTaskByUavId(String uavId);
/** /**
* 根据无人机ID获取最新的一条任务 * 根据无人机ID获取最新的一条任务
* @param uavId 无人机ID * @param uavId 无人机ID
* @return 最新的任务DTO * @return 任务DTO
*/ */
TaskDTO getCurrentTaskByUavId(Long uavId); TaskDTO getCurrentTaskByUavId(String uavId);
// /** // /**
// * 修改实际开始执行时间 // * 修改实际开始执行时间

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

@ -37,7 +37,7 @@ public class TaskDTO {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 状态 */ /** 状态 */
private StatusEnum status; private StatusEnum status;
@ -120,11 +120,11 @@ public class TaskDTO {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

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

@ -51,7 +51,7 @@ public class TaskPlanDTO {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 状态 */ /** 状态 */
private StatusEnum status; private StatusEnum status;
@ -154,11 +154,11 @@ public class TaskPlanDTO {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

6
src/main/java/com/ruoyi/task/service/dto/TaskPlanQueryDTO.java
View File

@ -42,7 +42,7 @@ public class TaskPlanQueryDTO {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 状态（0待执行 1执行中 2已完成 3已取消） */ /** 状态（0待执行 1执行中 2已完成 3已取消） */
private StatusEnum status; private StatusEnum status;
@ -140,11 +140,11 @@ public class TaskPlanQueryDTO {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

6
src/main/java/com/ruoyi/task/service/dto/TaskQueryDTO.java
View File

@ -33,7 +33,7 @@ public class TaskQueryDTO {
private Long routeId; private Long routeId;
/** 无人机ID */ /** 无人机ID */
private Long uavId; private String uavId;
/** 状态（0待执行 1执行中 2已完成 3已取消） */ /** 状态（0待执行 1执行中 2已完成 3已取消） */
private StatusEnum status; private StatusEnum status;
@ -113,11 +113,11 @@ public class TaskQueryDTO {
this.routeId = routeId; this.routeId = routeId;
} }
public Long getUavId() { public String getUavId() {
return uavId; return uavId;
} }
public void setUavId(Long uavId) { public void setUavId(String uavId) {
this.uavId = uavId; this.uavId = uavId;
} }

4
src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
View File

@ -86,7 +86,7 @@ public class TaskServiceImpl implements ITaskService {
} }
@Override @Override
public List<TaskDTO> getTaskByUavId(Long uavId) { public List<TaskDTO> getTaskByUavId(String uavId) {
// 创建Task对象作为查询条件 // 创建Task对象作为查询条件
Task task = new Task(); Task task = new Task();
task.setUavId(uavId); task.setUavId(uavId);
@ -96,7 +96,7 @@ public class TaskServiceImpl implements ITaskService {
} }
@Override @Override
public TaskDTO getCurrentTaskByUavId(Long uavId) { public TaskDTO getCurrentTaskByUavId(String uavId) {
// 创建Task对象作为查询条件 // 创建Task对象作为查询条件
Task task = new Task(); Task task = new Task();
task.setUavId(uavId); task.setUavId(uavId);

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

@ -0,0 +1,5 @@
-- 修改 task_plan 表的 uav_id 字段类型为 VARCHAR(255)
ALTER TABLE task_plan MODIFY COLUMN uav_id VARCHAR(255) COMMENT '无人机ID';
-- 修改 task_info 表的 uav_id 字段类型为 VARCHAR(255)
ALTER TABLE task_info MODIFY COLUMN uav_id VARCHAR(255) COMMENT '无人机ID';