From 5732e181afd6cfbbc8d0eea4319df008c6667db8 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 11 Jun 2025 19:13:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=B7=B2=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1441426846482432]定时作业管理页增加一列显示作业是否已加载 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1441426846482432 --- .../api/schedule/AutoexecScheduleListApi.java | 14 +++++++++++++- .../schedule/plugin/AutoexecScheduleJob.java | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) 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 1061513b..e2f4a5fa 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 24a6d44d..36a202e3 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) { -- Gitee