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

修改日

This commit is contained in:
孙小云 2026-03-12 14:12:11 +08:00
parent 81428acddc
commit 8f7712ecb0
1 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,18 +133,33 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
* 生成周期任务记录
*/
private void generateCycleTasks(TaskPlan taskPlan) {
// 从开始日期到结束日期，根据周期类型和周期值生成任务
java.util.Calendar calendar = java.util.Calendar.getInstance();
calendar.setTime(taskPlan.getStartDate());
java.util.Calendar endCalendar = java.util.Calendar.getInstance();
endCalendar.setTime(taskPlan.getEndDate());
// 解析周期值
String cycleValue = taskPlan.getCycleValue();
if (taskPlan.getCycleType() == CycleTypeEnum.DAILY) {
// 日周期：cycleValue 表示每几天执行一次
int dayInterval = 1;
if (taskPlan.getCycleValue() != null && !taskPlan.getCycleValue().isEmpty()) {
try {
dayInterval = Integer.parseInt(taskPlan.getCycleValue().trim());
if (dayInterval < 1) dayInterval = 1;
} catch (NumberFormatException e) {
dayInterval = 1;
}
}
while (!calendar.after(endCalendar)) {
createTaskForDate(taskPlan, calendar);
calendar.add(java.util.Calendar.DAY_OF_YEAR, dayInterval);
}
} else {
// 周周期和月周期：解析 cycleValue 为集合
java.util.Set<Integer> cycleValues = new java.util.HashSet<>();
if (cycleValue != null && !cycleValue.isEmpty()) {
String[] values = cycleValue.split(",");
if (taskPlan.getCycleValue() != null && !taskPlan.getCycleValue().isEmpty()) {
String[] values = taskPlan.getCycleValue().split(",");
for (String value : values) {
try {
cycleValues.add(Integer.parseInt(value.trim()));
@ -154,24 +169,27 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
}
}
// 根据周期类型生成任务
while (!calendar.after(endCalendar)) {
boolean shouldCreateTask = false;
if (taskPlan.getCycleType() == CycleTypeEnum.DAILY) {
// 日周期：每天都创建任务
shouldCreateTask = true;
} else if (taskPlan.getCycleType() == CycleTypeEnum.WEEKLY) {
// 周周期：在指定的星期几创建任务（1-7，1表示周日）
if (taskPlan.getCycleType() == CycleTypeEnum.WEEKLY) {
int dayOfWeek = calendar.get(java.util.Calendar.DAY_OF_WEEK);
shouldCreateTask = cycleValues.contains(dayOfWeek);
} else if (taskPlan.getCycleType() == CycleTypeEnum.MONTHLY) {
// 月周期：在指定的日期创建任务（1-31）
int dayOfMonth = calendar.get(java.util.Calendar.DAY_OF_MONTH);
shouldCreateTask = cycleValues.contains(dayOfMonth);
}
if (shouldCreateTask) {
createTaskForDate(taskPlan, calendar);
}
calendar.add(java.util.Calendar.DAY_OF_YEAR, 1);
}
}
}
private void createTaskForDate(TaskPlan taskPlan, java.util.Calendar calendar) {
Task task = new Task();
task.setTaskName(taskPlan.getPlanName() + "_任务_" + formatDate(calendar.getTime()));
task.setPlanId(taskPlan.getId());
@ -181,7 +199,6 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
task.setRouteId(taskPlan.getRouteId());
task.setUavId(taskPlan.getUavId());
// 设置任务开始时间：使用日历日期 + 计划的执行时间
if (taskPlan.getExecuteTime() != null) {
java.util.Calendar taskCalendar = java.util.Calendar.getInstance();
taskCalendar.setTime(calendar.getTime());
@ -192,33 +209,24 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
taskCalendar.set(java.util.Calendar.SECOND, executeTimeCalendar.get(java.util.Calendar.SECOND));
task.setStartTime(taskCalendar.getTime());
// 设置结束时间：开始时间 + 执行时长
java.util.Calendar endTaskCalendar = (java.util.Calendar) taskCalendar.clone();
if (taskPlan.getDuration() != null) {
endTaskCalendar.add(java.util.Calendar.SECOND, taskPlan.getDuration());
} else {
// 如果没有设置执行时长，默认1小时
endTaskCalendar.add(java.util.Calendar.HOUR_OF_DAY, 1);
endTaskCalendar.add(java.util.Calendar.SECOND, 3600);
}
task.setEndTime(endTaskCalendar.getTime());
} else {
// 如果没有设置执行时间，使用日历时间作为开始和结束时间
task.setStartTime(calendar.getTime());
task.setEndTime(calendar.getTime());
}
task.setStatus(StatusEnum.PENDING); // 待执行
task.setStatus(StatusEnum.PENDING);
task.setDescription("由任务计划自动创建");
// 创建任务
taskDomain.createTask(task);
}
// 增加一天
calendar.add(java.util.Calendar.DAY_OF_YEAR, 1);
}
}
/**
* 格式化日期为字符串
*/