diff --git a/srt-cloud-data-governance/pom.xml b/srt-cloud-data-governance/pom.xml index bc88a35..9365d65 100644 --- a/srt-cloud-data-governance/pom.xml +++ b/srt-cloud-data-governance/pom.xml @@ -12,6 +12,7 @@ jar + net.srt srt-cloud-api diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java index be52fc5..ce4c5ba 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java @@ -172,7 +172,7 @@ public class QualityConfigServiceimpl extends BaseServiceImplorg.quartz-scheduler quartz - - net.srt - srt-cloud-datax - 2.0.0 - + diff --git a/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/QuartzApplication.java b/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/QuartzApplication.java index fae1f2b..4571cd9 100644 --- a/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/QuartzApplication.java +++ b/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/QuartzApplication.java @@ -14,7 +14,7 @@ import org.springframework.context.annotation.ComponentScan; @EnableFeignClients @EnableDiscoveryClient @SpringBootApplication -@ComponentScan(basePackages = "net.srt.framework.common.cache") +@ComponentScan(basePackages = {"net.srt.framework.common.cache","net.srt"}) public class QuartzApplication { public static void main(String[] args) { diff --git a/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/quartz/api/QuartzDataAccessApiImpl.java b/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/quartz/api/QuartzDataAccessApiImpl.java deleted file mode 100644 index 485e7a1..0000000 --- a/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/quartz/api/QuartzDataAccessApiImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package net.srt.quartz.api; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import net.srt.api.module.data.integrate.DataAccessApi; -import net.srt.api.module.data.integrate.constant.TaskType; -import net.srt.api.module.data.integrate.dto.DataAccessDto; -import net.srt.api.module.data.integrate.dto.DataAccessTaskDto; -import net.srt.api.module.quartz.QuartzDataAccessApi; -import net.srt.api.module.quartz.constant.QuartzJobType; -import net.srt.datax.feign.DataAccessFeign; -import net.srt.framework.common.utils.Result; -import net.srt.quartz.entity.ScheduleJobEntity; -import net.srt.quartz.enums.JobGroupEnum; -import net.srt.quartz.enums.ScheduleConcurrentEnum; -import net.srt.quartz.enums.ScheduleStatusEnum; -import net.srt.quartz.service.ScheduleJobService; -import net.srt.quartz.task.DataAccessTask; -import net.srt.quartz.utils.ScheduleUtils; -import org.quartz.Scheduler; -import org.springframework.web.bind.annotation.RestController; - -/** - * 短信服务API - * - * @author 阿沐 babamu@126.com - */ -@RestController -@RequiredArgsConstructor -public class QuartzDataAccessApiImpl implements QuartzDataAccessApi { - - private final Scheduler scheduler; - private final DataAccessApi dataAccessApi; - private final ScheduleJobService jobService; - private final DataAccessFeign feign; - - @Override - public Result releaseAccess(Long id) { - ScheduleJobEntity jobEntity = buildJobEntity(id); - //判断是否存在,不存在,新增,存在,设置主键 - jobService.buildSystemJob(jobEntity); - ScheduleUtils.createScheduleJob(scheduler, jobEntity); - return Result.ok(); - } - - @Override - public Result cancleAccess(Long id) { - ScheduleJobEntity jobEntity = buildJobEntity(id); - jobService.buildSystemJob(jobEntity); - ScheduleUtils.deleteScheduleJob(scheduler, jobEntity); - //更新任务状态为暂停 - jobService.pauseSystemJob(jobEntity); - return Result.ok(); - } - - @Override - public Result handRun(Long id) { - ScheduleJobEntity jobEntity = buildJobEntity(id); - jobEntity.setOnce(true); - jobEntity.setSaveLog(false); - ScheduleUtils.run(scheduler, jobEntity); - return Result.ok(); - } - - - private ScheduleJobEntity buildJobEntity(Long id) { - DataAccessDto dataAccessDto = dataAccessApi.getById(id).getData(); - if (dataAccessDto.getIsDatax().equals("datax")){ - feign.execute(dataAccessDto); - } - return ScheduleJobEntity.builder().isDatax(dataAccessDto.getIsDatax()).typeId(id).projectId(dataAccessDto.getProjectId()).jobType(QuartzJobType.DATA_ACCESS.getValue()).jobName(String.format("[%s]%s", id.toString(), dataAccessDto.getTaskName())).concurrent(ScheduleConcurrentEnum.NO.getValue()) - .beanName("dataAccessTask").method("run").jobGroup(JobGroupEnum.DATA_ACCESS.getValue()).saveLog(true).cronExpression(dataAccessDto.getCron()).status(ScheduleStatusEnum.NORMAL.getValue()) - .params(String.valueOf(id)).once(TaskType.ONE_TIME_FULL_SYNC.getCode().equals(dataAccessDto.getTaskType())).build(); - - } -} diff --git a/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/quartz/utils/ScheduleUtils.java b/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/quartz/utils/ScheduleUtils.java index 326d74c..f322aa2 100644 --- a/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/quartz/utils/ScheduleUtils.java +++ b/srt-cloud-module/srt-cloud-quartz/src/main/java/net/srt/quartz/utils/ScheduleUtils.java @@ -1,6 +1,5 @@ package net.srt.quartz.utils; -import net.srt.datax.feign.DataAccessFeign; import net.srt.framework.common.exception.ServerException; import net.srt.quartz.entity.ScheduleJobEntity; import net.srt.quartz.enums.ScheduleConcurrentEnum; diff --git a/srt-cloud-module/srt-cloud-quartz/src/main/resources/auth.yml b/srt-cloud-module/srt-cloud-quartz/src/main/resources/auth.yml index a9d7717..fca90d3 100644 --- a/srt-cloud-module/srt-cloud-quartz/src/main/resources/auth.yml +++ b/srt-cloud-module/srt-cloud-quartz/src/main/resources/auth.yml @@ -1,3 +1,3 @@ auth: ignore_urls: - - /api/quartz/** + - /api/quartz/quality/**