From 773bec2374f385bdf40ee049caeb75d44faf9f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 9 Mar 2026 09:51:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ruoyi/task/domain/model/Task.java | 6 +++--- src/main/java/com/ruoyi/task/domain/model/TaskPlan.java | 6 +++--- .../java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java | 6 +++--- .../java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java | 6 +++--- src/main/java/com/ruoyi/task/service/api/ITaskService.java | 6 +++--- src/main/java/com/ruoyi/task/service/dto/TaskDTO.java | 6 +++--- src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java | 6 +++--- .../java/com/ruoyi/task/service/dto/TaskPlanQueryDTO.java | 6 +++--- src/main/java/com/ruoyi/task/service/dto/TaskQueryDTO.java | 6 +++--- .../java/com/ruoyi/task/service/impl/TaskServiceImpl.java | 4 ++-- .../resources/db/migration/V6__Change_uav_id_to_string.sql | 5 +++++ 11 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 src/main/resources/db/migration/V6__Change_uav_id_to_string.sql 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 15de1fb..fbbea90 100644 --- a/src/main/java/com/ruoyi/task/domain/model/Task.java +++ b/src/main/java/com/ruoyi/task/domain/model/Task.java @@ -37,7 +37,7 @@ public class Task { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 状态 */ private StatusEnum status; @@ -132,11 +132,11 @@ public class Task { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } 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 7ed44b1..86b0634 100644 --- a/src/main/java/com/ruoyi/task/domain/model/TaskPlan.java +++ b/src/main/java/com/ruoyi/task/domain/model/TaskPlan.java @@ -64,7 +64,7 @@ public class TaskPlan { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 状态 */ private StatusEnum status; @@ -179,11 +179,11 @@ public class TaskPlan { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } 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 dc41b27..3746fb2 100644 --- a/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java +++ b/src/main/java/com/ruoyi/task/mapper/entity/TaskInfoEntity.java @@ -33,7 +33,7 @@ public class TaskInfoEntity extends BaseEntity { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 执行类型 */ private String executeType; @@ -107,11 +107,11 @@ public class TaskInfoEntity extends BaseEntity { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } 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 78f15f3..35ce731 100644 --- a/src/main/java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java +++ b/src/main/java/com/ruoyi/task/mapper/entity/TaskPlanEntity.java @@ -48,7 +48,7 @@ public class TaskPlanEntity extends BaseEntity { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 状态 */ private String status; @@ -147,11 +147,11 @@ public class TaskPlanEntity extends BaseEntity { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } diff --git a/src/main/java/com/ruoyi/task/service/api/ITaskService.java b/src/main/java/com/ruoyi/task/service/api/ITaskService.java index 6812c37..b7bfe17 100644 --- a/src/main/java/com/ruoyi/task/service/api/ITaskService.java +++ b/src/main/java/com/ruoyi/task/service/api/ITaskService.java @@ -48,14 +48,14 @@ public interface ITaskService { * @param uavId 无人机ID * @return 任务列表 */ - List getTaskByUavId(Long uavId); + List getTaskByUavId(String uavId); /** * 根据无人机ID获取最新的一条任务 * @param uavId 无人机ID - * @return 最新的任务DTO + * @return 任务DTO */ - TaskDTO getCurrentTaskByUavId(Long uavId); + TaskDTO getCurrentTaskByUavId(String uavId); // /** // * 修改实际开始执行时间 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 3b4a23d..2d6ed01 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskDTO.java @@ -37,7 +37,7 @@ public class TaskDTO { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 状态 */ private StatusEnum status; @@ -120,11 +120,11 @@ public class TaskDTO { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } 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 c934e55..2a2bf75 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskPlanDTO.java @@ -51,7 +51,7 @@ public class TaskPlanDTO { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 状态 */ private StatusEnum status; @@ -154,11 +154,11 @@ public class TaskPlanDTO { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } diff --git a/src/main/java/com/ruoyi/task/service/dto/TaskPlanQueryDTO.java b/src/main/java/com/ruoyi/task/service/dto/TaskPlanQueryDTO.java index 015883d..fe26de1 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskPlanQueryDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskPlanQueryDTO.java @@ -42,7 +42,7 @@ public class TaskPlanQueryDTO { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 状态（0待执行 1执行中 2已完成 3已取消） */ private StatusEnum status; @@ -140,11 +140,11 @@ public class TaskPlanQueryDTO { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } diff --git a/src/main/java/com/ruoyi/task/service/dto/TaskQueryDTO.java b/src/main/java/com/ruoyi/task/service/dto/TaskQueryDTO.java index 73d910b..e3760a4 100644 --- a/src/main/java/com/ruoyi/task/service/dto/TaskQueryDTO.java +++ b/src/main/java/com/ruoyi/task/service/dto/TaskQueryDTO.java @@ -33,7 +33,7 @@ public class TaskQueryDTO { private Long routeId; /** 无人机ID */ - private Long uavId; + private String uavId; /** 状态（0待执行 1执行中 2已完成 3已取消） */ private StatusEnum status; @@ -113,11 +113,11 @@ public class TaskQueryDTO { this.routeId = routeId; } - public Long getUavId() { + public String getUavId() { return uavId; } - public void setUavId(Long uavId) { + public void setUavId(String uavId) { this.uavId = uavId; } diff --git a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java index 25691ca..e9dfce4 100644 --- a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java @@ -86,7 +86,7 @@ public class TaskServiceImpl implements ITaskService { } @Override - public List getTaskByUavId(Long uavId) { + public List getTaskByUavId(String uavId) { // 创建Task对象作为查询条件 Task task = new Task(); task.setUavId(uavId); @@ -96,7 +96,7 @@ public class TaskServiceImpl implements ITaskService { } @Override - public TaskDTO getCurrentTaskByUavId(Long uavId) { + public TaskDTO getCurrentTaskByUavId(String uavId) { // 创建Task对象作为查询条件 Task task = new Task(); task.setUavId(uavId); diff --git a/src/main/resources/db/migration/V6__Change_uav_id_to_string.sql b/src/main/resources/db/migration/V6__Change_uav_id_to_string.sql new file mode 100644 index 0000000..a7c1c73 --- /dev/null +++ b/src/main/resources/db/migration/V6__Change_uav_id_to_string.sql @@ -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';