update codes

src/main/java/com/gmei/data/dqmp/scheduler/DqScheduler.java

@@ -12,32 +12,32 @@ import com.gmei.data.dqmp.service.MonitorService;
 public class DqScheduler {
 	
 	@Autowired
-	private CheckService executeService;
+	private CheckService checkService;
 	@Autowired
 	private MonitorService monitorService;
 	
-//    @Scheduled(cron="0 */100 * * * ?")
-//    private void uniqueCheckProcess(){
-//    	executeService.checkAndPersistSimpleResult(Constants.CHECK_UNIQUE);
-//    }
-//    
-//    @Scheduled(cron="10 */100 * * * ?")
-//    private void unblankCheckProcess(){
-//    	executeService.checkAndPersistSimpleResult(Constants.CHECK_UNBLANK);
-//    }
-//    
-//    @Scheduled(cron="0 */100 * * * ?")
-//    private void referCheckProcess(){
-//    	executeService.checkAndPersistMultipleResult(Constants.CHECK_REFER);
-//    }
-//    
-//    @Scheduled(cron="0 */100 * * * ?")
-//    private void volatilityMonitorProcess(){
-//    	monitorService.monitorAndPersistVolatilityResult(Constants.MONITOR_PV);
-//    }
-//    
-//    @Scheduled(cron="0 */100 * * * ?")
-//    private void specialMonitorProcess(){
-//    	monitorService.monitorAndPersistSpecialResult();
-//    }
+    @Scheduled(cron="0 */100 * * * ?")
+    private void uniqueCheckProcess(){
+    	checkService.checkAndPersistSimpleResult(Constants.CHECK_UNIQUE);
+    }
+    
+    @Scheduled(cron="10 */100 * * * ?")
+    private void unblankCheckProcess(){
+    	checkService.checkAndPersistSimpleResult(Constants.CHECK_UNBLANK);
+    }
+    
+    @Scheduled(cron="0 */100 * * * ?")
+    private void referCheckProcess(){
+    	checkService.checkAndPersistMultipleResult(Constants.CHECK_REFER);
+    }
+    
+    @Scheduled(cron="0 */100 * * * ?")
+    private void volatilityMonitorProcess(){
+    	monitorService.monitorAndPersistVolatilityResult(Constants.MONITOR_PV);
+    }
+    
+    @Scheduled(cron="0 */100 * * * ?")
+    private void specialMonitorProcess(){
+    	monitorService.monitorAndPersistSpecialResult();
+    }
 }

src/main/java/com/gmei/data/dqmp/service/impl/CheckServiceImpl.java

@@ -56,6 +56,7 @@ public class CheckServiceImpl implements CheckService {
 		List<TblSqlCheckSingle> sqlList = tblSqlCheckSingleMapper.selectByExampleWithBLOBs(tblCheckSingleSqlCriteria);
 		for (TblSqlCheckSingle tblCheckSql : sqlList) {
 			String sql = tblCheckSql.getSqlContent();
+			Integer id = tblCheckSql.getId();
 			int rs = 0;
 			if (Constants.CHECK_UNIQUE.equals(tblCheckSql.getCheckType())) {
 				TblResultCheckUnique uniqueCheckResult = getUniqueCheckResult(sql);
@@ -63,6 +64,7 @@ public class CheckServiceImpl implements CheckService {
 					logger.error("Find result is empty!");
 					return;
 				}
+				uniqueCheckResult.setSqlId(id);
 				rs = tblResultCheckUniqueMapper.insert(uniqueCheckResult);
 			} else if (Constants.CHECK_UNBLANK.equals(tblCheckSql.getCheckType())){
 				TblResultCheckUnblank tblResultCheckUnblank = getUnblankCheckResult(sql);
@@ -70,6 +72,7 @@ public class CheckServiceImpl implements CheckService {
 					logger.error("Find result is empty!");
 					return;
 				}
+				tblResultCheckUnblank.setSqlId(id);
 				rs = tblResultCheckUnblankMapper.insert(tblResultCheckUnblank);
 			}
 			if (rs == 1) {
@@ -93,6 +96,7 @@ public class CheckServiceImpl implements CheckService {
 		List<TblSqlCheckMultiple> sqlList = tblSqlCheckMultipleMapper.selectByExampleWithBLOBs(tblCheckMultipleSqlCriteria);
 		for (TblSqlCheckMultiple tblCheckSql : sqlList) {
 			String sql = tblCheckSql.getSqlContent();
+			Integer id = tblCheckSql.getId();
 			int rs = 0;
 			if (Constants.CHECK_REFER.equals(tblCheckSql.getCheckType())) {
 				TblResultCheckRefer referCheckResult = getReferCheckResult(sql);
@@ -100,6 +104,7 @@ public class CheckServiceImpl implements CheckService {
 					logger.error("Find result is empty!");
 					return;
 				}
+				referCheckResult.setSqlId(id);
 				rs = tblResultCheckReferMapper.insert(referCheckResult);
 			}
 			if (rs == 1) {

src/main/java/com/gmei/data/dqmp/service/impl/DqRuleServiceImpl.java

@@ -103,8 +103,7 @@ public class DqRuleServiceImpl implements DqRuleService {
 					logger.error("Param is illegal! {}",dqRuleVo);
 					return false;
 				}
-				TblSqlMonitorVolatility TblSqlMonitorVolatility = BeanUtils.map(dqRuleVo,
-						TblSqlMonitorVolatility.class);
+				TblSqlMonitorVolatility TblSqlMonitorVolatility = BeanUtils.map(dqRuleVo,TblSqlMonitorVolatility.class);
 				TblSqlMonitorVolatility.setSqlContent(genSqlByTemplate(dqRuleVo));
 				tblSqlMonitorVolatilityMapper.insertSelective(TblSqlMonitorVolatility);
 				break;

src/main/java/com/gmei/data/dqmp/service/impl/MonitorServiceImpl.java

@@ -53,12 +53,14 @@ public class MonitorServiceImpl implements MonitorService {
 				.selectByExampleWithBLOBs(tblmonitorVolatilitySqlCriteria);
 		for (TblSqlMonitorVolatility tblCheckSql : sqlList) {
 			String sql = tblCheckSql.getSqlContent();
+			Integer id = tblCheckSql.getId();
 			int rs = 0;
 			TblResultMonitorVolatility tblResultMonitorVolatility = getMonitorVolatilityResult(sql, indicatorType);
 			if (tblResultMonitorVolatility == null) {
 				logger.error("Find result is empty!");
 				return;
 			}
+			tblResultMonitorVolatility.setSqlId(id);
 			rs = tblResultMonitorVolatilityMapper.insert(tblResultMonitorVolatility);
 			if (rs == 1) {
 				logger.info("Run success: {}", sql);
@@ -76,16 +78,17 @@ public class MonitorServiceImpl implements MonitorService {
 	public void monitorAndPersistSpecialResult() {
 		TblSqlMonitorSpecialCriteria tblMonitorSpecialSqlCriteria = new TblSqlMonitorSpecialCriteria();
 		tblMonitorSpecialSqlCriteria.createCriteria().andIsValidEqualTo(Constants.IS_VALID_ON);
-		List<TblSqlMonitorSpecial> sqlList = tblSqlMonitorSpecialMapper
-				.selectByExampleWithBLOBs(tblMonitorSpecialSqlCriteria);
+		List<TblSqlMonitorSpecial> sqlList = tblSqlMonitorSpecialMapper.selectByExampleWithBLOBs(tblMonitorSpecialSqlCriteria);
 		for (TblSqlMonitorSpecial tblCheckSql : sqlList) {
 			String sql = tblCheckSql.getSqlContent();
+			Integer id = tblCheckSql.getId();
 			int rs = 0;
 			TblResultMonitorSpecial tblResultMonitorSpecial = getMonitorSpecialResult(sql);
 			if (tblResultMonitorSpecial == null) {
 				logger.error("Find result is empty!");
 				return;
 			}
+			tblResultMonitorSpecial.setSqlId(id);
 			rs = tblResultMonitorSpecialMapper.insert(tblResultMonitorSpecial);
 			if (rs == 1) {
 				logger.info("Run success: {}", sql);

src/main/java/com/gmei/data/dqmp/vo/DqRuleVo.java

@@ -11,6 +11,8 @@ public class DqRuleVo extends BaseVo{
 	private Integer isValid;
 	@NotBlank(message = "校验时间字段不能为空")
 	private String checkTime;
+	@NotBlank(message = "校验规则备注")
+	private String comment;
 	
 	//simple
 	private String dbName;
@@ -20,7 +22,6 @@ public class DqRuleVo extends BaseVo{
 	private String filters;
 	private String indicatorType;
 	private String startTime;
-	//private String endTime;
 	
 	//duplex
 	private String checkDbName;
@@ -106,12 +107,6 @@ public class DqRuleVo extends BaseVo{
 	public void setStartTime(String startTime) {
 		this.startTime = startTime;
 	}
-//	public String getEndTime() {
-//		return endTime;
-//	}
-//	public void setEndTime(String endTime) {
-//		this.endTime = endTime;
-//	}
 	public String getCheckDbName() {
 		return checkDbName;
 	}
@@ -160,15 +155,20 @@ public class DqRuleVo extends BaseVo{
 	public void setReferFilters(String referFilters) {
 		this.referFilters = referFilters;
 	}
+	public String getComment() {
+		return comment;
+	}
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
 
 	@Override
 	public String toString() {
-		return "DqRuleVo [checkType=" + checkType + ", isValid=" + isValid + ", checkTime=" + checkTime + ", dbName="
-				+ dbName + ", tbName=" + tbName + ", colName=" + colName + ", timeColName=" + timeColName + ", filters="
-				+ filters + ", indicatorType=" + indicatorType + ", startTime=" + startTime + ", checkDbName="
-				+ checkDbName + ", checkTbName=" + checkTbName + ", checkColName=" + checkColName + ", referDbName="
-				+ referDbName + ", referTbName=" + referTbName + ", referColName=" + referColName + ", checkFilters="
-				+ checkFilters + ", referfilters=" + referFilters + "]";
+		return "DqRuleVo [checkType=" + checkType + ", isValid=" + isValid + ", checkTime=" + checkTime + ", comment="
+				+ comment + ", dbName=" + dbName + ", tbName=" + tbName + ", colName=" + colName + ", timeColName="
+				+ timeColName + ", filters=" + filters + ", indicatorType=" + indicatorType + ", startTime=" + startTime
+				+ ", checkDbName=" + checkDbName + ", checkTbName=" + checkTbName + ", checkColName=" + checkColName
+				+ ", referDbName=" + referDbName + ", referTbName=" + referTbName + ", referColName=" + referColName
+				+ ", checkFilters=" + checkFilters + ", referFilters=" + referFilters + "]";
 	}
-
 }