update

studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/controller/CheckRuleController.java

@@ -86,10 +86,13 @@ public class CheckRuleController extends BaseController {
         queryWrapper.like(StrUtil.isNotBlank(checkRuleQuery.getRuleTable()), "r.rule_table", checkRuleQuery.getRuleTable());
         queryWrapper.like(StrUtil.isNotBlank(checkRuleQuery.getRuleColumn()), "r.rule_column", checkRuleQuery.getRuleColumn());
         //结构符合校验过滤
-        if("jj".equals(checkRuleQuery.getRuleType())){
+        if("jg".equals(checkRuleQuery.getRuleType())){
             queryWrapper.in("t.code","table_jc","length_jc","null_jc","pk_jc","fk_jc");
+        } else if ("gl".equals(checkRuleQuery.getRuleType())){
+            // 关联性
+            queryWrapper.in("t.code","relevance");
         } else {
-            queryWrapper.in("t.code","unique","integrity","accuracy","consistent","relevance","regular","timeliness");
+            queryWrapper.in("t.code","unique","integrity","accuracy","consistent","regular","timeliness");
         }
 //        queryWrapper.in("t.code","")
         IPage<CheckRuleEntity> page = checkRuleService.page(new Page<>(checkRuleQuery.getPageNum(), checkRuleQuery.getPageSize()), queryWrapper);

studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/controller/ScheduleJobController.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -166,6 +167,11 @@ public class ScheduleJobController extends BaseController {
 	@PostMapping("/run/{id}")
 	public R runScheduleJobById(@PathVariable("id") String id) {
 		scheduleJobService.runScheduleJobById(id);
+        QueryWrapper<ScheduleJobEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", id);
+        ScheduleJobEntity updatedEntity = new ScheduleJobEntity();
+        updatedEntity.setAfterDate(new Date());
+        scheduleJobService.update(updatedEntity,queryWrapper);
 		return R.ok();
 	}
 }

studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/service/impl/CheckRuleServiceImpl.java

@@ -4,6 +4,8 @@ import cn.datax.common.base.BaseServiceImpl;
 import cn.datax.common.core.RedisConstant;
 import cn.datax.common.database.constants.DbType;
 import cn.datax.common.redis.service.RedisService;
+import cn.datax.service.data.metadata.api.entity.MetadataTableEntity;
+import cn.datax.service.data.metadata.dao.MetadataTableDao;
 import cn.datax.service.data.quality.api.dto.*;
 import cn.datax.service.data.quality.api.entity.CheckRuleEntity;
 import cn.datax.service.data.quality.api.enums.RuleItem;
@@ -44,6 +46,9 @@ public class CheckRuleServiceImpl extends BaseServiceImpl<CheckRuleDao, CheckRul
 	@Autowired
 	private RedisService redisService;
 
+	@Autowired
+	private MetadataTableDao metadataTableDao;
+
 	private static String BIND_GB_CODE = "gb_code";
 	private static String BIND_GB_NAME = "gb_name";
 
@@ -56,8 +61,14 @@ public class CheckRuleServiceImpl extends BaseServiceImpl<CheckRuleDao, CheckRul
 			CheckRuleEntity checkRule = null;
 			for (int i = 0; i < checkRuleDto.getTransferValue().size(); i++) {
 				String currentString = checkRuleDto.getTransferValue().get(i);
+
+				QueryWrapper<MetadataTableEntity> queryWrapper = new QueryWrapper<>();
+				queryWrapper.eq("source_id", checkRuleDto.getRuleSourceId());
+				queryWrapper.eq("table_name",currentString);
+				MetadataTableEntity metadataTableEntity = metadataTableDao.selectOne(queryWrapper);
 				checkRule = checkRuleMapper.toEntity(checkRuleDto);
 				checkRule.setRuleTable(currentString);
+				checkRule.setRuleTableId(metadataTableEntity.getId());
 				checkRuleDao.insert(checkRule);
 			}
 			return checkRule;
@@ -74,8 +85,10 @@ public class CheckRuleServiceImpl extends BaseServiceImpl<CheckRuleDao, CheckRul
 	@Transactional(rollbackFor = Exception.class)
 	public CheckRuleEntity updateCheckRule(CheckRuleDto checkRuleDto) {
 		CheckRuleEntity checkRule = checkRuleMapper.toEntity(checkRuleDto);
+		if(!"jg".equals(checkRuleDto.getQualityType())){
 			String sql = parseSql(checkRule);
 			checkRule.setRuleSql(sql);
+		}
 		checkRuleDao.updateById(checkRule);
 		return checkRule;
 	}