diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/ts/page_vue.btl b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/ts/page_vue.btl index 35669d2..99d68a2 100644 --- a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/ts/page_vue.btl +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/ts/page_vue.btl @@ -127,7 +127,10 @@ function addHandler() { } function reset() { - searchForm.value = {} + searchForm.value = { + current: 1, + size: 20, + } paging() } diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java index 7680965..fed3f6f 100644 --- a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java @@ -18,12 +18,12 @@ import java.util.List; @Accessors(chain = true) public final class PageParam { /** - * 每页显示条数,默认 10 + * 每页显示条数,默认 500 */ private Integer size; /** - * 当前页 + * 当前页,默认 1 */ private Integer current; diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java index 18f3a81..55c552e 100644 --- a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java @@ -46,7 +46,11 @@ public final class PageResult { return new PageResult<>(page.getRecords(), (int) page.getTotal(), (int) page.getPages(), (int) page.getCurrent(), (int) page.getSize()); } - public static PageResult of(int current, int size, List data) { + public static PageResult of(PageParam pageParam, List data) { + Integer current_ = pageParam.getCurrent(); + Integer size_ = pageParam.getSize(); + int current = current_ == null ? 1 : current_; + int size = size_ == null ? 500 : size_; if (data == null) data = Collections.emptyList(); int total = data.size(); int pages = Math.toIntExact(total % size == 0 ? (total / size) : (total / size + 1)); diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/pojo/param/SearchTaskScheduleRecodeParam.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/pojo/param/SearchTaskScheduleRecodeParam.java index 60a97d1..add41bc 100644 --- a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/pojo/param/SearchTaskScheduleRecodeParam.java +++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/pojo/param/SearchTaskScheduleRecodeParam.java @@ -28,7 +28,6 @@ public class SearchTaskScheduleRecodeParam { * 任务结束时间 */ private LocalDateTime endTime; - /** * 任务状态 */ @@ -37,7 +36,4 @@ public class SearchTaskScheduleRecodeParam { * 本次调度是否为手动触发 */ private Boolean manually; - - private Boolean builtin; - } diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/MemoryTaskStoreService.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/MemoryTaskStoreService.java index d329902..f0cbd44 100644 --- a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/MemoryTaskStoreService.java +++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/MemoryTaskStoreService.java @@ -63,13 +63,12 @@ public class MemoryTaskStoreService implements TaskStore { } public PageResult paging(PageParam pageParam, SearchTaskParam searchTaskParam) { - Integer current = pageParam.getCurrent(); - Integer size = pageParam.getSize(); + String taskName = searchTaskParam.getTaskName(); String fn = searchTaskParam.getFn(); ScheduleType scheduleType = searchTaskParam.getScheduleType(); - return PageResult.of(current, size, + return PageResult.of(pageParam, TASKS.stream() .filter(it -> { boolean f = true; diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskExecuteLogService.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskExecuteLogService.java index d1bd432..4c3154c 100644 --- a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskExecuteLogService.java +++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskExecuteLogService.java @@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.common.sichen.contant.TaskLogLevel; import com.njzscloud.common.sichen.mapper.TaskExecuteLogMapper; import com.njzscloud.common.sichen.pojo.entity.TaskExecuteLogEntity; import com.njzscloud.common.sichen.pojo.param.SearchTaskExecuteLogParam; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; public class TaskExecuteLogService extends ServiceImpl implements IService { @@ -50,10 +52,15 @@ public class TaskExecuteLogService extends ServiceImpl paging(PageParam pageParam, SearchTaskExecuteLogParam searchTaskExecuteLogParam) { Long scheduleId = searchTaskExecuteLogParam.getScheduleId(); + TaskLogLevel logLevel = searchTaskExecuteLogParam.getLogLevel(); + LocalDateTime startLogTime = searchTaskExecuteLogParam.getStartLogTime(); + LocalDateTime endLogTime = searchTaskExecuteLogParam.getEndLogTime(); Assert.notNull(scheduleId, () -> Exceptions.clierr("未指调度记录")); return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() .eq(TaskExecuteLogEntity::getScheduleId, scheduleId) - + .eq(logLevel != null, TaskExecuteLogEntity::getLogLevel, logLevel) + .ge(startLogTime != null, TaskExecuteLogEntity::getLogTime, startLogTime) + .le(endLogTime != null, TaskExecuteLogEntity::getLogTime, endLogTime) )); } } diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskScheduleRecodeService.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskScheduleRecodeService.java index f546ee3..48ed6d2 100644 --- a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskScheduleRecodeService.java +++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/service/TaskScheduleRecodeService.java @@ -15,6 +15,7 @@ import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.common.sichen.config.TaskProperties; import com.njzscloud.common.sichen.contant.TaskLogLevel; +import com.njzscloud.common.sichen.contant.TaskStatus; import com.njzscloud.common.sichen.mapper.TaskScheduleRecodeMapper; import com.njzscloud.common.sichen.pojo.entity.TaskExecuteLogEntity; import com.njzscloud.common.sichen.pojo.entity.TaskScheduleRecodeEntity; @@ -70,9 +71,17 @@ public class TaskScheduleRecodeService extends ServiceImpl paging(PageParam pageParam, SearchTaskScheduleRecodeParam searchTaskScheduleRecodeParam) { Long taskId = searchTaskScheduleRecodeParam.getTaskId(); + LocalDateTime startTime = searchTaskScheduleRecodeParam.getStartTime(); + LocalDateTime endTime = searchTaskScheduleRecodeParam.getEndTime(); + TaskStatus taskStatus = searchTaskScheduleRecodeParam.getTaskStatus(); + Boolean manually = searchTaskScheduleRecodeParam.getManually(); Assert.notNull(taskId, () -> Exceptions.clierr("未指定任务")); return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() .eq(TaskScheduleRecodeEntity::getTaskId, taskId) + .ge(startTime != null, TaskScheduleRecodeEntity::getScheduleTime, startTime) + .le(endTime != null, TaskScheduleRecodeEntity::getScheduleTime, endTime) + .eq(taskStatus != null, TaskScheduleRecodeEntity::getTaskStatus, taskStatus) + .eq(manually != null, TaskScheduleRecodeEntity::getManually, manually) )); } @@ -177,10 +186,13 @@ public class TaskScheduleRecodeService extends ServiceImpl