diff --git a/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java b/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java
index fada341f842535ef8b7826d464c5d0624fdb2397..ca10cb3d37d0e9dbcbfc2e02fcd5722b608a3699 100644
--- a/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/schedule/ListDeployScheduleApi.java
@@ -38,6 +38,8 @@ import neatlogic.framework.deploy.dto.schedule.DeployScheduleVo;
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.deploy.dao.mapper.DeployPipelineMapper;
import neatlogic.module.deploy.dao.mapper.DeployScheduleMapper;
@@ -59,6 +61,9 @@ public class ListDeployScheduleApi extends PrivateApiComponentBase {
@Resource
private DeployPipelineMapper deployPipelineMapper;
+ @Resource
+ private SchedulerManager schedulerManager;
+
@Override
public String getToken() {
return "deploy/schedule/list";
@@ -186,6 +191,12 @@ public class ListDeployScheduleApi extends PrivateApiComponentBase {
}
}
}
+ boolean isLoad = false;
+ JobStatusVo jobStatusVo = scheduleVo.getJobStatus();
+ if (jobStatusVo != null && StringUtils.isNotBlank(jobStatusVo.getJobName()) && StringUtils.isNotBlank(jobStatusVo.getJobGroup())) {
+ isLoad = schedulerManager.checkJobIsExists(jobStatusVo.getJobName(), jobStatusVo.getJobGroup());
+ }
+ scheduleVo.setIsLoad(isLoad ? 1 : 0);
}
}
}
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml
index 209e481e0a03889200144446a3144773e2828944..dac88fd559c04f41f5c282fcdc8d69dd43d9b7b6 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployScheduleMapper.xml
@@ -112,26 +112,65 @@ along with this program. If not, see .-->
LIMIT #{startNum}, #{pageSize}
-