定时任务质量稽核

server/src/main/java/edp/davinci/dao/QualityTaskMapper.java

@@ -29,6 +29,9 @@ public interface QualityTaskMapper
     @Select({"select * from `quality_task` where id = #{id}"})
     QualityTask getQualityTask(@Param("id") Long id);
 
+    @Select({"select * from `quality_task` where cronJob_id = #{cronJobId}"})
+    QualityTask getQualityTaskByCronJobId(@Param("cronJobId") Long cronJobId);
+
     @Select({"select * from `quality_task` where view_id = #{viewId}"})
     List<QualityTask> getQualityTaskListByViewId(@Param("viewId") Long viewId);
 

server/src/main/java/edp/davinci/service/QualityTaskService.java

@@ -2,6 +2,7 @@ package edp.davinci.service;
 
 import edp.core.exception.ServerException;
 import edp.davinci.dto.qualityAuditor.QualityTaskDto;
+import edp.davinci.model.CronJob;
 import edp.davinci.model.QualityTask;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,6 +22,8 @@ public interface QualityTaskService
 
     QualityTask getQualityTask(Long id);
 
+    QualityTask getQualityTaskByCronJobId(Long cronJobId );
+
     List<QualityTask> getQualityTaskListByViewId(Long viewId);
 
     List<QualityTaskDto> getQualityTaskListCondition(Long PId, String time);

server/src/main/java/edp/davinci/service/impl/CronJobServiceImpl.java

@@ -36,8 +36,10 @@ import edp.davinci.dto.cronJobDto.CronJobBaseInfo;
 import edp.davinci.dto.cronJobDto.CronJobInfo;
 import edp.davinci.dto.cronJobDto.CronJobUpdate;
 import edp.davinci.model.CronJob;
+import edp.davinci.model.QualityTask;
 import edp.davinci.model.User;
 import edp.davinci.service.CronJobService;
+import edp.davinci.service.QualityTaskService;
 import edp.davinci.service.excel.ExecutorUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.SchedulerException;
@@ -58,341 +60,351 @@ import static edp.davinci.core.common.Constants.DAVINCI_TOPIC_CHANNEL;
 @Service("cronJobService")
 public class CronJobServiceImpl extends BaseEntityService implements CronJobService {
 
-	private static final Logger optLogger = LoggerFactory.getLogger(LogNameEnum.BUSINESS_OPERATION.getName());
-	
-	private static final Logger scheduleLogger = LoggerFactory.getLogger(LogNameEnum.BUSINESS_SCHEDULE.getName());
-
-	@Autowired
-	private CronJobMapper cronJobMapper;
-
-	@Autowired
-	private QuartzHandler quartzHandler;
-
-	@Autowired
-	private RedisUtils redisUtils;
-	
-	@Autowired
-	private EmailScheduleServiceImpl emailScheduleService;
-
-	@Autowired
-	private WeChatWorkScheduleServiceImpl weChatWorkScheduleService;
-
-	private static final CheckEntityEnum entity = CheckEntityEnum.CRONJOB;
-
-	@Override
-	public boolean isExist(String name, Long id, Long projectId) {
-		Long cronJobId = cronJobMapper.getByNameWithProjectId(name, projectId);
-		if (null != id && null != cronJobId) {
-			return !id.equals(cronJobId);
-		}
-		return null != cronJobId && cronJobId.longValue() > 0L;
-	}
-	
-	private void checkIsExist(String name, Long id, Long projectId) {
-		if (isExist(name, id, projectId)) {
-			alertNameTaken(entity, name);
-		}
-	}
-
-	/**
-	 * 获取所在project对用户可见的jobs
-	 *
-	 * @param projectId
-	 * @param user
-	 * @return
-	 */
-	@Override
-	public List<CronJob> getCronJobs(Long projectId, User user) {
-		// return checkReadPermission(entity, projectId, user) == true ? cronJobMapper.getByProject(projectId) : null;
-		return cronJobMapper.getByProject(projectId);
-	}
-
-	@Override
-	public CronJob getCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
-		CronJob cronJob = cronJobMapper.getById(id);
-		return cronJob;
-	}
-	
-	private CronJob getCronJob(Long id) {
-	
-		CronJob cronJob = cronJobMapper.getById(id);
-
-		if (null == cronJob) {
-			log.error("Cronjob({}) is not found", id);
-			throw new NotFoundException("Cronjob is not found");
-		}
-		
-		return cronJob;
-	}
-	
-	/**
-	 * 创建job
-	 *
-	 * @param cronJobBaseInfo
-	 * @param user
-	 * @return
-	 */
-	@Override
-	@Transactional
-	public CronJobInfo createCronJob(CronJobBaseInfo cronJobBaseInfo, User user)
-			throws NotFoundException, UnAuthorizedException, ServerException {
-
-		Long projectId = cronJobBaseInfo.getProjectId();
+    private static final Logger optLogger = LoggerFactory.getLogger(LogNameEnum.BUSINESS_OPERATION.getName());
+
+    private static final Logger scheduleLogger = LoggerFactory.getLogger(LogNameEnum.BUSINESS_SCHEDULE.getName());
+
+    @Autowired
+    private CronJobMapper cronJobMapper;
+
+    @Autowired
+    private QuartzHandler quartzHandler;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private EmailScheduleServiceImpl emailScheduleService;
+
+    @Autowired
+    private WeChatWorkScheduleServiceImpl weChatWorkScheduleService;
+
+    @Autowired
+    private QualityTaskService qualityTaskService;
+
+    private static final CheckEntityEnum entity = CheckEntityEnum.CRONJOB;
+
+    @Override
+    public boolean isExist(String name, Long id, Long projectId) {
+        Long cronJobId = cronJobMapper.getByNameWithProjectId(name, projectId);
+        if (null != id && null != cronJobId) {
+            return !id.equals(cronJobId);
+        }
+        return null != cronJobId && cronJobId.longValue() > 0L;
+    }
+
+    private void checkIsExist(String name, Long id, Long projectId) {
+        if (isExist(name, id, projectId)) {
+            alertNameTaken(entity, name);
+        }
+    }
+
+    /**
+     * 获取所在project对用户可见的jobs
+     *
+     * @param projectId
+     * @param user
+     * @return
+     */
+    @Override
+    public List<CronJob> getCronJobs(Long projectId, User user) {
+        return checkReadPermission(entity, projectId, user) == true ? cronJobMapper.getByProject(projectId) : null;
+//		return cronJobMapper.getByProject(projectId);
+    }
+
+    @Override
+    public CronJob getCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
+        CronJob cronJob = cronJobMapper.getById(id);
+        return cronJob;
+    }
+
+    private CronJob getCronJob(Long id) {
+
+        CronJob cronJob = cronJobMapper.getById(id);
+
+        if (null == cronJob) {
+            log.error("Cronjob({}) is not found", id);
+            throw new NotFoundException("Cronjob is not found");
+        }
+
+        return cronJob;
+    }
+
+    /**
+     * 创建job
+     *
+     * @param cronJobBaseInfo
+     * @param user
+     * @return
+     */
+    @Override
+    @Transactional
+    public CronJobInfo createCronJob(CronJobBaseInfo cronJobBaseInfo, User user)
+            throws NotFoundException, UnAuthorizedException, ServerException {
+
+        Long projectId = cronJobBaseInfo.getProjectId();
 
 //		checkWritePermission(entity, projectId, user, "create");
 
-		String name = cronJobBaseInfo.getName();
-		checkIsExist(name, null, projectId);
-
-		BaseLock lock = getLock(entity, name, projectId);
-		if (lock != null && !lock.getLock()) {
-			alertNameTaken(entity, name);
-		}
-
-		CronJob cronJob = new CronJob().createdBy(user.getId());
-		BeanUtils.copyProperties(cronJobBaseInfo, cronJob);
-		try {
-			cronJob.setStartDate(DateUtils.toDate(cronJobBaseInfo.getStartDate()));
-			cronJob.setEndDate(DateUtils.toDate(cronJobBaseInfo.getEndDate()));
-		} catch (Exception e) {
-			log.error(e.toString(), e);
-		}
-
-		try {
-
-			if (cronJobMapper.insert(cronJob) != 1) {
-				throw new ServerException("Create cronJob fail");
-			}
-
-			CronJobInfo cronJobInfo = new CronJobInfo();
-			BeanUtils.copyProperties(cronJobBaseInfo, cronJobInfo);
-			cronJobInfo.setId(cronJob.getId());
-			cronJobInfo.setJobStatus(CronJobStatusEnum.NEW.getStatus());
-
-			optLogger.info("CronJob({}) is create by user({})", cronJob.toString(), user.getId());
-			return cronJobInfo;
-
-		} finally {
-			releaseLock(lock);
-		}
-	}
-
-	/**
-	 * 修改job
-	 *
-	 * @param cronJobUpdate
-	 * @param user
-	 * @return
-	 */
-	@Override
-	@Transactional
-	public boolean updateCronJob(CronJobUpdate cronJobUpdate, User user)
-			throws NotFoundException, UnAuthorizedException, ServerException {
-		
-		Long id = cronJobUpdate.getId();
-		Long projectId = cronJobUpdate.getProjectId();
-		CronJob cronJob = getCronJob(id);
-		if (!cronJob.getProjectId().equals(projectId)) {
-			throw new ServerException("Invalid project id");
-		}
-
-		checkWritePermission(entity, projectId, user, "update");
-
-		String name = cronJobUpdate.getName();
-		checkIsExist(name, id, projectId);
-
-		if (CronJobStatusEnum.START.getStatus().equals(cronJob.getJobStatus())) {
-			throw new ServerException("Please stop the job before updating");
-		}
-		
-		BaseLock lock = getLock(entity, name, projectId);
-		if (lock != null && !lock.getLock()) {
-			alertNameTaken(entity, name);
-		}
-		
-		BeanUtils.copyProperties(cronJobUpdate, cronJob);
-		cronJob.updatedBy(user.getId());
-		String origin = cronJob.toString();
-		boolean res = false;
-		try {
-			cronJob.setStartDate(DateUtils.toDate(cronJobUpdate.getStartDate()));
-			cronJob.setEndDate(DateUtils.toDate(cronJobUpdate.getEndDate()));
-			cronJob.setUpdateTime(new Date());
-			if (cronJobMapper.update(cronJob) == 1) {
-				optLogger.info("CronJob({}) is update by user({}), origin:{}", cronJob.toString(), user.getId(), origin);
-				quartzHandler.modifyJob(cronJob);
-				res = true;
-			}
-		} catch (Exception e) {
-			log.error(e.toString(), e);
-			quartzHandler.removeJob(cronJob);
-			cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
-			cronJobMapper.update(cronJob);
-		} finally {
-			releaseLock(lock);
-		}
-
-		return res;
-	}
-
-	/**
-	 * 删除job
-	 *
-	 * @param id
-	 * @param user
-	 * @return
-	 */
-	@Override
-	@Transactional
-	public boolean deleteCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
-
-		CronJob cronJob = getCronJob(id);
-
-		checkWritePermission(entity, cronJob.getProjectId(), user, "delete");
-
-		if (cronJobMapper.deleteById(id) == 1) {
-			optLogger.info("Cronjob({}) is delete by user({})", cronJob.toString(), user.getId());
-			quartzHandler.removeJob(cronJob);
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	@Transactional
-	public CronJob startCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
-		CronJob cronJob = getCronJob(id);
+        String name = cronJobBaseInfo.getName();
+        checkIsExist(name, null, projectId);
+
+        BaseLock lock = getLock(entity, name, projectId);
+        if (lock != null && !lock.getLock()) {
+            alertNameTaken(entity, name);
+        }
+
+        CronJob cronJob = new CronJob().createdBy(user.getId());
+        BeanUtils.copyProperties(cronJobBaseInfo, cronJob);
+        try {
+            cronJob.setStartDate(DateUtils.toDate(cronJobBaseInfo.getStartDate()));
+            cronJob.setEndDate(DateUtils.toDate(cronJobBaseInfo.getEndDate()));
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+        }
+
+        try {
+
+            if (cronJobMapper.insert(cronJob) != 1) {
+                throw new ServerException("Create cronJob fail");
+            }
+
+            CronJobInfo cronJobInfo = new CronJobInfo();
+            BeanUtils.copyProperties(cronJobBaseInfo, cronJobInfo);
+            cronJobInfo.setId(cronJob.getId());
+            cronJobInfo.setJobStatus(CronJobStatusEnum.NEW.getStatus());
+
+            optLogger.info("CronJob({}) is create by user({})", cronJob.toString(), user.getId());
+            return cronJobInfo;
+
+        } finally {
+            releaseLock(lock);
+        }
+    }
+
+    /**
+     * 修改job
+     *
+     * @param cronJobUpdate
+     * @param user
+     * @return
+     */
+    @Override
+    @Transactional
+    public boolean updateCronJob(CronJobUpdate cronJobUpdate, User user)
+            throws NotFoundException, UnAuthorizedException, ServerException {
+
+        Long id = cronJobUpdate.getId();
+        Long projectId = cronJobUpdate.getProjectId();
+        CronJob cronJob = getCronJob(id);
+        if (!cronJob.getProjectId().equals(projectId)) {
+            throw new ServerException("Invalid project id");
+        }
+
+        checkWritePermission(entity, projectId, user, "update");
+
+        String name = cronJobUpdate.getName();
+        checkIsExist(name, id, projectId);
+
+        if (CronJobStatusEnum.START.getStatus().equals(cronJob.getJobStatus())) {
+            throw new ServerException("Please stop the job before updating");
+        }
+
+        BaseLock lock = getLock(entity, name, projectId);
+        if (lock != null && !lock.getLock()) {
+            alertNameTaken(entity, name);
+        }
+
+        BeanUtils.copyProperties(cronJobUpdate, cronJob);
+        cronJob.updatedBy(user.getId());
+        String origin = cronJob.toString();
+        boolean res = false;
+        try {
+            cronJob.setStartDate(DateUtils.toDate(cronJobUpdate.getStartDate()));
+            cronJob.setEndDate(DateUtils.toDate(cronJobUpdate.getEndDate()));
+            cronJob.setUpdateTime(new Date());
+            if (cronJobMapper.update(cronJob) == 1) {
+                optLogger.info("CronJob({}) is update by user({}), origin:{}", cronJob.toString(), user.getId(), origin);
+                quartzHandler.modifyJob(cronJob);
+                res = true;
+            }
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            quartzHandler.removeJob(cronJob);
+            cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
+            cronJobMapper.update(cronJob);
+        } finally {
+            releaseLock(lock);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除job
+     *
+     * @param id
+     * @param user
+     * @return
+     */
+    @Override
+    @Transactional
+    public boolean deleteCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
+
+        CronJob cronJob = getCronJob(id);
+
+        checkWritePermission(entity, cronJob.getProjectId(), user, "delete");
+
+        if (cronJobMapper.deleteById(id) == 1) {
+            optLogger.info("Cronjob({}) is delete by user({})", cronJob.toString(), user.getId());
+            quartzHandler.removeJob(cronJob);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public CronJob startCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
+        CronJob cronJob = getCronJob(id);
 //		checkWritePermission(entity, cronJob.getProjectId(), user, "start");
 
-		try {
-			quartzHandler.addJob(cronJob);
-			cronJob.setJobStatus(CronJobStatusEnum.START.getStatus());
-			cronJob.setUpdateTime(new Date());
-			cronJobMapper.update(cronJob);
-			return cronJob;
-		} catch (SchedulerException e) {
-			cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
-			cronJob.setUpdateTime(new Date());
-			cronJobMapper.update(cronJob);
-			throw new ServerException(e.getMessage());
-		}
-	}
-
-	private void publishReconnect(String message) {
-
-		//	String flag = MD5Util.getMD5(UUID.randomUUID().toString() + id, true, 32);
-		// the flag is deprecated
-		String flag = "-1";
-		redisUtils.convertAndSend(DAVINCI_TOPIC_CHANNEL, new RedisMessageEntity(CronJobMessageHandler.class,  message, flag));
-	}
-	
-	@Override
-	@Transactional
-	public CronJob stopCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
-		
-		CronJob cronJob = getCronJob(id);
-
-		checkWritePermission(entity, cronJob.getProjectId(), user, "stop");
-
-		cronJob.setJobStatus(CronJobStatusEnum.STOP.getStatus());
-
-		if (redisUtils.isRedisEnable()) {
-			publishReconnect(JSON.toJSONString(cronJob));
-			return cronJob;
-		}
-
-		try {
-			quartzHandler.removeJob(cronJob);
-			cronJob.setUpdateTime(new Date());
-			cronJobMapper.update(cronJob);
-		} catch (ServerException e) {
-			log.error(e.toString(), e);
-			cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
-			cronJobMapper.update(cronJob);
-		}
-		
-		return cronJob;
-	}
-
-	@Override
-	public void startAllJobs() {
-		List<CronJob> jobList = cronJobMapper.getStartedJobs();
-		jobList.forEach((cronJob) -> {
-			String key = entity.getSource().toUpperCase() + Consts.UNDERLINE + cronJob.getId() + Consts.UNDERLINE
-					+ cronJob.getProjectId();
-			if (LockFactory.getLock(key, 300, LockType.REDIS).getLock()) {
-				try {
-					quartzHandler.addJob(cronJob);
-				} catch (SchedulerException e) {
-					log.warn("CronJob:({}), start error, {}", cronJob.getId(), e.getMessage());
-					cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
-					cronJobMapper.update(cronJob);
-				} catch (ServerException e) {
-					log.warn("CronJob:({}), start error, {}", cronJob.getId(), e.getMessage());
-				}
-			}
-		});
-	}
-
-	@Override
-	public boolean executeCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
-
-		CronJob cronJob = getCronJob(id);
-		System.out.println("执行任务....."+ cronJob.getName());
+        try {
+            quartzHandler.addJob(cronJob);
+            cronJob.setJobStatus(CronJobStatusEnum.START.getStatus());
+            cronJob.setUpdateTime(new Date());
+            cronJobMapper.update(cronJob);
+            return cronJob;
+        } catch (SchedulerException e) {
+            cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
+            cronJob.setUpdateTime(new Date());
+            cronJobMapper.update(cronJob);
+            throw new ServerException(e.getMessage());
+        }
+    }
+
+    private void publishReconnect(String message) {
+
+        //	String flag = MD5Util.getMD5(UUID.randomUUID().toString() + id, true, 32);
+        // the flag is deprecated
+        String flag = "-1";
+        redisUtils.convertAndSend(DAVINCI_TOPIC_CHANNEL, new RedisMessageEntity(CronJobMessageHandler.class, message, flag));
+    }
+
+    @Override
+    @Transactional
+    public CronJob stopCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
+
+        CronJob cronJob = getCronJob(id);
+
+        checkWritePermission(entity, cronJob.getProjectId(), user, "stop");
+
+        cronJob.setJobStatus(CronJobStatusEnum.STOP.getStatus());
+
+        if (redisUtils.isRedisEnable()) {
+            publishReconnect(JSON.toJSONString(cronJob));
+            return cronJob;
+        }
+
+        try {
+            quartzHandler.removeJob(cronJob);
+            cronJob.setUpdateTime(new Date());
+            cronJobMapper.update(cronJob);
+        } catch (ServerException e) {
+            log.error(e.toString(), e);
+            cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
+            cronJobMapper.update(cronJob);
+        }
+
+        return cronJob;
+    }
+
+    @Override
+    public void startAllJobs() {
+        List<CronJob> jobList = cronJobMapper.getStartedJobs();
+        jobList.forEach((cronJob) -> {
+            String key = entity.getSource().toUpperCase() + Consts.UNDERLINE + cronJob.getId() + Consts.UNDERLINE
+                    + cronJob.getProjectId();
+            if (LockFactory.getLock(key, 300, LockType.REDIS).getLock()) {
+                try {
+                    quartzHandler.addJob(cronJob);
+                } catch (SchedulerException e) {
+                    log.warn("CronJob:({}), start error, {}", cronJob.getId(), e.getMessage());
+                    cronJob.setJobStatus(CronJobStatusEnum.FAILED.getStatus());
+                    cronJobMapper.update(cronJob);
+                } catch (ServerException e) {
+                    log.warn("CronJob:({}), start error, {}", cronJob.getId(), e.getMessage());
+                }
+            }
+        });
+    }
+
+    @Override
+    public boolean executeCronJob(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException {
+
+        CronJob cronJob = getCronJob(id);
+        System.out.println("执行任务....." + cronJob.getName());
 //		checkWritePermission(entity, cronJob.getProjectId(), user, "execute");
-		System.out.println("执行任务.....正在执行！"+ cronJob.getName());
-		ExecutorService executorService = ExecutorUtils.getJobWorkers();
-		ExecutorUtils.printThreadPoolStatus(executorService, "JOB_WORKERS", scheduleLogger);
-		executorService.submit(() -> {
-			if (cronJob.getStartDate().getTime() <= System.currentTimeMillis()
-					&& cronJob.getEndDate().getTime() >= System.currentTimeMillis()) {
-				String jobType = cronJob.getJobType().trim();
-
-				if (!StringUtils.isEmpty(jobType)) {
-					if (jobType.equals("email")) {
-						try {
-							emailScheduleService.execute(cronJob.getId());
-						} catch (Exception e) {
-							log.error(e.toString(), e);
-							scheduleLogger.error(e.getMessage());
-						}
-					} else if(jobType.equals("weChatWork")) {
-						try {
-							// 企业微信推送
-							weChatWorkScheduleService.execute(cronJob.getId());
-						} catch (Exception e) {
-							log.error(e.toString(), e);
-							scheduleLogger.error(e.getMessage());
-						}
-					}else if(jobType.equals("auditor")) {  // 质量稽核
-						try {
-							// 质量稽核
-							System.out.println("execute quality auditor");
-						} catch (Exception e) {
-							log.error(e.toString(), e);
-							scheduleLogger.error(e.getMessage());
-						}
-					}
-
-				} else {
-					log.warn("Unknown job type {}, jobId:{}", jobType, cronJob.getId());
-					scheduleLogger.warn("Unknown job type {}, jobId:{}", jobType, cronJob.getId());
-				}
-			} else {
-				Object[] args = { cronJob.getId(), DateUtils.toyyyyMMddHHmmss(System.currentTimeMillis()),
-						DateUtils.toyyyyMMddHHmmss(cronJob.getStartDate()),
-						DateUtils.toyyyyMMddHHmmss(cronJob.getEndDate()), cronJob.getCronExpression() };
-				log.warn(
-						"ScheduleJob({}), currentTime:{} is not within the planned execution time, startTime:{}, endTime:{}, cronExpression:{}",
-						args);
-				scheduleLogger.warn(
-						"ScheduleJob({}), currentTime:{} is not within the planned execution time, startTime:{}, endTime:{}, cronExpression:{}",
-						args);
-			}
-		});
-
-		return true;
-	}
+        System.out.println("执行任务.....正在执行！" + cronJob.getName());
+        ExecutorService executorService = ExecutorUtils.getJobWorkers();
+        ExecutorUtils.printThreadPoolStatus(executorService, "JOB_WORKERS", scheduleLogger);
+        executorService.submit(() -> {
+            if (cronJob.getStartDate().getTime() <= System.currentTimeMillis()
+                    && cronJob.getEndDate().getTime() >= System.currentTimeMillis()) {
+                String jobType = cronJob.getJobType().trim();
+
+                if (!StringUtils.isEmpty(jobType)) {
+                    if (jobType.equals("email")) {
+                        try {
+                            emailScheduleService.execute(cronJob.getId());
+                        } catch (Exception e) {
+                            log.error(e.toString(), e);
+                            scheduleLogger.error(e.getMessage());
+                        }
+                    } else if (jobType.equals("weChatWork")) {
+                        try {
+                            // 企业微信推送
+                            weChatWorkScheduleService.execute(cronJob.getId());
+                        } catch (Exception e) {
+                            log.error(e.toString(), e);
+                            scheduleLogger.error(e.getMessage());
+                        }
+                    } else if (jobType.equals("auditor")) {  // 质量稽核
+                        try {
+                            // 质量稽核
+                            QualityTask qualityTask = qualityTaskService.getQualityTaskByCronJobId(cronJob.getId());
+                            if (null != qualityTask) {
+                                qualityTaskService.auditor(qualityTask.getId());
+                                System.out.println("execute quality auditor");
+
+                            }
+
+
+                        } catch (Exception e) {
+                            log.error(e.toString(), e);
+                            scheduleLogger.error(e.getMessage());
+                        }
+                    }
+
+                } else {
+                    log.warn("Unknown job type {}, jobId:{}", jobType, cronJob.getId());
+                    scheduleLogger.warn("Unknown job type {}, jobId:{}", jobType, cronJob.getId());
+                }
+            } else {
+                Object[] args = {cronJob.getId(), DateUtils.toyyyyMMddHHmmss(System.currentTimeMillis()),
+                        DateUtils.toyyyyMMddHHmmss(cronJob.getStartDate()),
+                        DateUtils.toyyyyMMddHHmmss(cronJob.getEndDate()), cronJob.getCronExpression()};
+                log.warn(
+                        "ScheduleJob({}), currentTime:{} is not within the planned execution time, startTime:{}, endTime:{}, cronExpression:{}",
+                        args);
+                scheduleLogger.warn(
+                        "ScheduleJob({}), currentTime:{} is not within the planned execution time, startTime:{}, endTime:{}, cronExpression:{}",
+                        args);
+            }
+        });
+
+        return true;
+    }
 
 }

server/src/main/java/edp/davinci/service/impl/QualityTaskServiceImpl.java

@@ -76,6 +76,12 @@ public class QualityTaskServiceImpl implements QualityTaskService {
     }
 
     @Override
+    public QualityTask getQualityTaskByCronJobId(Long cronJobId) {
+        QualityTask qualityTask = qualityTaskMapper.getQualityTaskByCronJobId(cronJobId);
+        return qualityTask;
+    }
+
+    @Override
     public List<QualityTask> getQualityTaskListByViewId(Long viewId) {
         return qualityTaskMapper.getQualityTaskListByViewId(viewId);
     }