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

修改时间

This commit is contained in:
孙小云 2026-03-06 13:13:08 +08:00
parent db3233b4d8
commit a3aa635f59
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ public class TaskPlan {
/** 结束日期 */
private Date endDate;
/** 执行时间（仅在定义任务时有效） */
/** 执行时间 */
private Date executeTime;
/** 航线ID */

24
src/main/java/com/ruoyi/task/service/impl/TaskPlanServiceImpl.java
View File

@ -152,8 +152,28 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
task.setExecuteType(taskPlan.getExecuteType());
task.setRouteId(taskPlan.getRouteId());
task.setUavId(taskPlan.getUavId());
task.setStartTime(calendar.getTime());
task.setEndTime(calendar.getTime());
// 设置任务开始时间：使用日历日期 + 计划的执行时间
if (taskPlan.getExecuteTime() != null) {
java.util.Calendar taskCalendar = java.util.Calendar.getInstance();
taskCalendar.setTime(calendar.getTime());
java.util.Calendar executeTimeCalendar = java.util.Calendar.getInstance();
executeTimeCalendar.setTime(taskPlan.getExecuteTime());
taskCalendar.set(java.util.Calendar.HOUR_OF_DAY, executeTimeCalendar.get(java.util.Calendar.HOUR_OF_DAY));
taskCalendar.set(java.util.Calendar.MINUTE, executeTimeCalendar.get(java.util.Calendar.MINUTE));
taskCalendar.set(java.util.Calendar.SECOND, executeTimeCalendar.get(java.util.Calendar.SECOND));
task.setStartTime(taskCalendar.getTime());
// 简单设置结束时间为开始时间后1小时（可根据实际需求调整）
// java.util.Calendar endTaskCalendar = (java.util.Calendar) taskCalendar.clone();
// endTaskCalendar.add(java.util.Calendar.HOUR_OF_DAY, 1);
// task.setEndTime(endTaskCalendar.getTime());
} else {
// 如果没有设置执行时间，使用日历时间作为开始和结束时间
task.setStartTime(calendar.getTime());
task.setEndTime(calendar.getTime());
}
task.setStatus(StatusEnum.PENDING); // 待执行
task.setDescription("由任务计划自动创建");