diff --git a/src/main/java/neatlogic/module/autoexec/api/schedule/AutoexecScheduleListApi.java b/src/main/java/neatlogic/module/autoexec/api/schedule/AutoexecScheduleListApi.java index 1061513b456763f58e37ce5674a93d9e6af07472..e2f4a5faf06851283515be3a993d2d6564876cc3 100644 --- a/src/main/java/neatlogic/module/autoexec/api/schedule/AutoexecScheduleListApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/schedule/AutoexecScheduleListApi.java @@ -1,5 +1,6 @@ package neatlogic.module.autoexec.api.schedule; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.autoexec.auth.AUTOEXEC_BASE; import neatlogic.framework.autoexec.dao.mapper.AutoexecCombopMapper; @@ -14,9 +15,11 @@ import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.framework.scheduler.core.SchedulerManager; +import neatlogic.framework.scheduler.dto.JobStatusVo; import neatlogic.framework.util.TableResultUtil; import neatlogic.module.autoexec.service.AutoexecCombopService; -import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -40,6 +43,9 @@ public class AutoexecScheduleListApi extends PrivateApiComponentBase { @Resource private AutoexecCombopService autoexecCombopService; + @Resource + private SchedulerManager schedulerManager; + @Override public String getToken() { return "autoexec/schedule/list"; @@ -106,6 +112,12 @@ public class AutoexecScheduleListApi extends PrivateApiComponentBase { if (execCount != null) { autoexecScheduleVo.setExecCount(execCount); } + boolean isLoad = false; + JobStatusVo jobStatusVo = autoexecScheduleVo.getJobStatus(); + if (jobStatusVo != null && StringUtils.isNotBlank(jobStatusVo.getJobName()) && StringUtils.isNotBlank(jobStatusVo.getJobGroup())) { + isLoad = schedulerManager.checkJobIsExists(jobStatusVo.getJobName(), jobStatusVo.getJobGroup()); + } + autoexecScheduleVo.setIsLoad(isLoad ? 1 : 0); } } } diff --git a/src/main/java/neatlogic/module/autoexec/schedule/plugin/AutoexecScheduleJob.java b/src/main/java/neatlogic/module/autoexec/schedule/plugin/AutoexecScheduleJob.java index 24a6d44d52fa1bff3f7df6170388d21b86aca6a6..36a202e38403c0d5659903f92b28571cf92328e6 100644 --- a/src/main/java/neatlogic/module/autoexec/schedule/plugin/AutoexecScheduleJob.java +++ b/src/main/java/neatlogic/module/autoexec/schedule/plugin/AutoexecScheduleJob.java @@ -104,7 +104,9 @@ public class AutoexecScheduleJob extends JobBase { searchVo.setIsActive(1); int rowNum = autoexecScheduleMapper.getAutoexecScheduleCount(searchVo); searchVo.setPageSize(100); - for (int currentPage = 1; rowNum > 0; currentPage++, rowNum -= 100) { + searchVo.setRowNum(rowNum); + Integer pageCount = searchVo.getPageCount(); + for (int currentPage = 1; currentPage <= pageCount; currentPage++) { searchVo.setCurrentPage(currentPage); List autoexecScheduleList = autoexecScheduleMapper.getAutoexecScheduleList(searchVo); for (AutoexecScheduleVo autoexecScheduleVo : autoexecScheduleList) {