diff --git a/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/entity/ScheduleJobEntity.java b/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/entity/ScheduleJobEntity.java index 9c82661..593183b 100644 --- a/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/entity/ScheduleJobEntity.java +++ b/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/entity/ScheduleJobEntity.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; +import java.util.Date; /** *

@@ -63,4 +64,9 @@ public class ScheduleJobEntity implements Serializable { * 状态(1运行 0暂停) */ private String status; + + /** + * 最后完成时间 + */ + private Date afterDate; } diff --git a/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/vo/ScheduleJobVo.java b/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/vo/ScheduleJobVo.java index 38764ed..2762f2c 100644 --- a/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/vo/ScheduleJobVo.java +++ b/studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/vo/ScheduleJobVo.java @@ -3,6 +3,7 @@ package cn.datax.service.data.quality.api.vo; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** *

@@ -20,8 +21,10 @@ public class ScheduleJobVo implements Serializable { private String id; private String status; private String jobName; + private String jobType; private String beanName; private String methodName; private String methodParams; private String cronExpression; + private Date afterDate; // 最后完成时间 } diff --git a/studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/controller/CheckRuleController.java b/studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/controller/CheckRuleController.java index 447ebbf..21a79f0 100644 --- a/studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/controller/CheckRuleController.java +++ b/studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/controller/CheckRuleController.java @@ -156,10 +156,11 @@ public class CheckRuleController extends BaseController { - @GetMapping("/listSourceIdBytable/{id}") - public R listSourceIdBytable(@PathVariable String id) { + @GetMapping("/listSourceIdBytable/{id}/ruleId/{ruleId}") + public R listSourceIdBytable(@PathVariable String id,@PathVariable String ruleId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("rule_source_id",id); + queryWrapper.eq("rule_item_id",ruleId); List checkRuleList = checkRuleService.list(queryWrapper); return R.ok().setData(checkRuleMapper.toVO(checkRuleList)); } diff --git a/studio/modules/data-quality-service-parent/data-quality-service/src/main/resources/mapper/ScheduleJobMapper.xml b/studio/modules/data-quality-service-parent/data-quality-service/src/main/resources/mapper/ScheduleJobMapper.xml index 7e5bf69..f7b9995 100644 --- a/studio/modules/data-quality-service-parent/data-quality-service/src/main/resources/mapper/ScheduleJobMapper.xml +++ b/studio/modules/data-quality-service-parent/data-quality-service/src/main/resources/mapper/ScheduleJobMapper.xml @@ -12,13 +12,14 @@ + id, status, - job_name, job_type, bean_name, method_name, method_params, cron_expression + job_name, job_type, bean_name, method_name, method_params, cron_expression, after_date