Merge branch 'zhaojianwei' into 'master'

add data quality project codes

See merge request !2

docs/dqmp.conf

+#在BJ-GM-Prod-Cos-metabase001节点上进行如下配置
+vim dqmp.conf
+	server {
+	    listen   80;
+	    server_name dqmp.prod.gengmei;
+	    client_max_body_size 4G;
+	
+	    access_log /data/log/nginx/acces-dqmp.log combined;
+	    error_log /data/log/nginx/error.log;
+	
+	    location  / {
+	        proxy_set_header X-Real-IP $remote_addr;
+	        proxy_set_header X-Forwarded-For $http_remoteip;
+	        proxy_set_header Host $http_host;
+	        proxy_pass http://172.16.44.8:8990;
+	    }
+	}
\ No newline at end of file

docs/readme.txt

+sudo mdir -p /data/log/dqmp
+sudo chown -R apple:wheel /data/log/dqmp
\ No newline at end of file

pom.xml

@@ -44,6 +44,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
+		<!-- httpclient -->
+		<dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.2</version>
+        </dependency>
 		<!-- 集成mysql驱动 -->
 		<dependency>
 			<groupId>mysql</groupId>
@@ -66,6 +72,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
+		<dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+            <version>1.9.22</version>
+        </dependency>
 		<!-- 集成热部署插件 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -78,6 +89,12 @@
 			<artifactId>lombok</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<!--alibaba easyexcel -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>1.1.2-beta5</version>
+		</dependency>
 		<!-- 增加fastjson工具类 -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -128,6 +145,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<!-- xxl-job依赖 -->
 		<dependency>
 			<groupId>com.xuxueli</groupId>
@@ -220,7 +238,7 @@
 				</executions>
 			</plugin>
 			<!--集成mybatis自动生成工具 -->
-			<plugin>
+			<!-- <plugin>
 				<groupId>org.mybatis.generator</groupId>
 				<artifactId>mybatis-generator-maven-plugin</artifactId>
 				<version>1.3.2</version>
@@ -244,7 +262,7 @@
 						<version>1.3.2</version>
 					</dependency>
 				</dependencies>
-			</plugin>
+			</plugin> -->
 		</plugins>
 	</build>
 </project>
\ No newline at end of file

src/main/java/com/DqmpApplication.java

@@ -5,6 +5,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 /**
  * 程序入口
@@ -13,7 +16,13 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @EnableTransactionManagement
 @MapperScan("com.gmei.data.dqmp.mapper")
-public class DqmpApplication {
+public class DqmpApplication extends WebMvcConfigurationSupport{
+	
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		registry.addResourceHandler("/templates/**").addResourceLocations(ResourceUtils.CLASSPATH_URL_PREFIX+"/templates/");
+	}
+	
 	public static void main(String[] args) {
         SpringApplication.run(DqmpApplication.class, args);
 	}

src/main/java/com/gmei/data/dqmp/common/Constants.java

@@ -36,9 +36,10 @@ public class Constants {
 	// 双表规则类型
 	public static final String TABLE_DUPLEX = "duplex";
 
-//	public static final String CHECK_SIMPLE = "check_single";
-//	public static final String CHECK_MULTIPLE = "check_multiple";
-//	public static final String MONITOR_VOLATILITY = "monitor_volatility";
-//	public static final String MONITOR_SPECIAL = "monitor_special";
+	public static final String UNIQUE = "unique";
+	public static final String UNBLANK = "unblank";
+	public static final String REFER = "refer";
+	public static final String VOLATILITY = "volatility";
+	public static final String SPECIAL = "special";
 
 }

src/main/java/com/gmei/data/dqmp/config/ScheduleConfig.java

+package com.gmei.data.dqmp.config;
+
+import java.util.concurrent.Executors;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+@Configuration
+public class ScheduleConfig implements SchedulingConfigurer {
+	@Override
+	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+		taskRegistrar.setScheduler(Executors.newScheduledThreadPool(10));
+	}
+}

src/main/java/com/gmei/data/dqmp/controller/BaseController.java

+package com.gmei.data.dqmp.controller;
+
+import org.springframework.ui.Model;
+
+public class BaseController {
+
+	/**
+	 * 执行结果页面属性返回
+	 * @param model
+	 * @param isSuc
+	 * @param msg
+	 * @return
+	 */
+	protected String model(Model model, boolean isSuc, String msg) {
+		if(isSuc) {
+			model.addAttribute("result", "success!");
+		}else {
+			model.addAttribute("result", msg);
+		}
+		return "view/result";
+	}
+}

src/main/java/com/gmei/data/dqmp/controller/DqRuleController.java

@@ -2,20 +2,21 @@ package com.gmei.data.dqmp.controller;
 
 import javax.validation.Valid;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import com.gmei.data.dqmp.service.DqRuleService;
 import com.gmei.data.dqmp.vo.DqRuleVo;
 
-@RestController
-@RequestMapping(value = "/dqrule")
-public class DqRuleController {
+@Controller
+@RequestMapping(value = "/dqRule")
+public class DqRuleController extends BaseController{
 
 	@Autowired
 	private DqRuleService dqRuleService;
@@ -26,17 +27,29 @@ public class DqRuleController {
 	 * @param bindingResult
 	 * @return
 	 */
-	@ResponseBody
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public DqRuleVo addDqRule(@RequestBody @Valid DqRuleVo dqRuleVo,BindingResult bindingResult) {
+    public String addDqRule(@RequestBody @Valid DqRuleVo dqRuleVo,BindingResult bindingResult, Model model) {
 		if (bindingResult.hasErrors()) {
-            return new DqRuleVo(-1,bindingResult.getFieldError().getDefaultMessage());
+            return model(model,false,bindingResult.getFieldError().getDefaultMessage());
         }
 		Boolean isAddSuc = dqRuleService.addDqRule(dqRuleVo);
 		if(isAddSuc) {
-			return new DqRuleVo();
+			return model(model,true,"");
 		}else {
-			return new DqRuleVo(-1,"Rule add error!");
+			return model(model,false,"Rule add error!");
+		}
+    }
+	
+    @RequestMapping(value = "/del", method = RequestMethod.GET)
+    public String delDqRule(DqRuleVo dqRuleVo, Model model) {
+		if(dqRuleVo.getId() == null || StringUtils.isBlank(dqRuleVo.getCheckType())) {
+			return model(model,false,"Params is error!");
+		}
+		Boolean isDelSuc = dqRuleService.delDqRule(dqRuleVo);
+		if(isDelSuc) {
+			return model(model,true,"");
+		}else {
+			return model(model,false,"数据质量规则删除失败!");
 		}
     }
 }

src/main/java/com/gmei/data/dqmp/controller/DqRuleImportController.java

+package com.gmei.data.dqmp.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.gmei.data.dqmp.common.Constants;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.utils.ImportExcelUtils;
+import com.gmei.data.dqmp.vo.BaseVo;
+
+@Controller
+@RequestMapping(value = "/excel")
+public class DqRuleImportController extends BaseController{
+
+	@Autowired
+	private DqRuleService dqRuleService;
+	private static final Logger logger = LoggerFactory.getLogger(DqRuleImportController.class);
+
+	@PostMapping(value = "export")
+	public BaseVo exportExcel() {
+		return new BaseVo();
+	}
+
+	@PostMapping(value = "importUnique")
+	public String importUniqueExcel(HttpServletRequest httpServletRequest, Model model) {
+		if (!checkIsLegal(httpServletRequest, Constants.UNIQUE)) {
+			return model(model,false,"上传的数据质量规则文件格式或内容错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadUniqueListString(httpServletRequest, dqRuleService);
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+			return model(model,false,e.getMessage());
+		}
+		return model(model,true,"");
+	}
+
+	@PostMapping(value = "importUnblank")
+	public String importUnblankExcel(HttpServletRequest httpServletRequest, Model model) {
+		if (!checkIsLegal(httpServletRequest, Constants.UNBLANK)) {
+			return model(model,false,"上传的数据质量规则文件格式或内容错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadUnblankListString(httpServletRequest, dqRuleService);
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+			return model(model,false,e.getMessage());
+		}
+		return model(model,true,"");
+	}
+
+	@PostMapping(value = "importRefer")
+	public String importReferExcel(HttpServletRequest httpServletRequest, Model model) {
+		if (!checkIsLegal(httpServletRequest, Constants.REFER)) {
+			return model(model,false,"上传的数据质量规则文件格式或内容错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadReferListString(httpServletRequest, dqRuleService);
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+			return model(model,false,e.getMessage());
+		}
+		return model(model,true,"");
+	}
+
+	@PostMapping(value = "importVolatility")
+	public String importVolatilityExcel(HttpServletRequest httpServletRequest, Model model) {
+		if (!checkIsLegal(httpServletRequest, Constants.VOLATILITY)) {
+			return model(model,false,"上传的数据质量规则文件格式或内容错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadVolatilityListString(httpServletRequest, dqRuleService);
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+			return model(model,false,e.getMessage());
+		}
+		return model(model,true,"");
+	}
+
+	@PostMapping(value = "importSpecial")
+	public String importExcel(HttpServletRequest httpServletRequest, Model model) {
+		if (!checkIsLegal(httpServletRequest, Constants.SPECIAL)) {
+			return model(model,false,"上传的数据质量规则文件格式或内容错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadSpecialListString(httpServletRequest, dqRuleService);
+		} catch (Exception e) {
+			logger.error(e.getMessage());
+			return model(model,false,e.getMessage());
+		}
+		return model(model,true,"");
+	}
+
+	/**
+	 * 上传文件格式、内容校验
+	 * 
+	 * @param httpServletRequest
+	 * @param type
+	 * @return
+	 */
+	private Boolean checkIsLegal(HttpServletRequest httpServletRequest, String type) {
+		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) httpServletRequest;
+		MultipartFile requestFile = multipartRequest.getFile("file");
+		String originalFilename = requestFile.getOriginalFilename();
+		if (!originalFilename.endsWith(ExcelTypeEnum.XLS.getValue())
+				&& !originalFilename.endsWith(ExcelTypeEnum.XLSX.getValue())) {
+			logger.error("Excel导入错误文件名称：{}", originalFilename);
+			return false;
+		} else {
+			if (!originalFilename.contains(type)) {
+				logger.error("导入的不是非空性校验规则文件：{}", originalFilename);
+				return false;
+			}
+		}
+		return true;
+	}
+
+}

src/main/java/com/gmei/data/dqmp/controller/IndexController.java

+package com.gmei.data.dqmp.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import com.gmei.data.dqmp.service.DashbordService;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.service.ThresholdExceedAllService;
+import com.gmei.data.dqmp.vo.DashbordVo;
+import com.gmei.data.dqmp.vo.DqReferRuleVo;
+import com.gmei.data.dqmp.vo.DqSpecialRuleVo;
+import com.gmei.data.dqmp.vo.DqUnblankRuleVo;
+import com.gmei.data.dqmp.vo.DqUniqueRuleVo;
+import com.gmei.data.dqmp.vo.DqVolatilityRuleVo;
+import com.gmei.data.dqmp.vo.ThresholdExceedAllVo;
+
+@Controller
+public class IndexController {
+
+	@Autowired
+	private DqRuleService dqRuleService;
+	@Autowired
+	private DashbordService dashbordService;
+	@Autowired
+	private ThresholdExceedAllService thresholdExceedAllService;
+
+	@GetMapping("/")
+	public String index() {
+		return "index";
+	}
+	
+	@GetMapping("/view")
+	public String demo(Model model) {
+		DashbordVo dashbordInfo = dashbordService.getDashbordInfo();
+		model.addAttribute("volatilityLegendData",dashbordInfo.getVolatilityLegendData());
+		model.addAttribute("volatilitySeriesData",dashbordInfo.getVolatilitySeriesData());
+		model.addAttribute("specialLegendData",dashbordInfo.getSpecialLegendData());
+		model.addAttribute("specialSeriesData",dashbordInfo.getSpecialSeriesData());
+		List<ThresholdExceedAllVo> thresholdExceedAllList = thresholdExceedAllService.getThresholdExceedAllList();
+		model.addAttribute("thresholdExceedAllList",thresholdExceedAllList);
+		return "view/dashbord";
+	}
+
+	/**
+	 * 首页中功能列表
+	 * 
+	 * @param model
+	 * @return
+	 */
+	@GetMapping("/manage")
+	public String index(Model model) {
+		List<DqUniqueRuleVo> uniqueList = dqRuleService.findUniqueDqRuleList();
+		List<DqUnblankRuleVo> unblankList = dqRuleService.findUnblankDqRuleList();
+		List<DqReferRuleVo> referList = dqRuleService.findReferDqRuleList();
+		List<DqVolatilityRuleVo> volatilityList = dqRuleService.findVolatilityDqRuleList();
+		List<DqSpecialRuleVo> specialList = dqRuleService.findSpecialDqRuleList();
+		model.addAttribute("uniqueList", uniqueList);
+		model.addAttribute("unblankList", unblankList);
+		model.addAttribute("referList", referList);
+		model.addAttribute("volatilityList", volatilityList);
+		model.addAttribute("specialList", specialList);
+		return "view/manage";
+	}
+
+}

src/main/java/com/gmei/data/dqmp/controller/api/DqRuleApiController.java

+package com.gmei.data.dqmp.controller.api;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.vo.DqRuleVo;
+
+@RestController
+@RequestMapping(value = "/api/dqrule")
+public class DqRuleApiController {
+
+	@Autowired
+	private DqRuleService dqRuleService;
+	
+	/**
+	 * 校验规则新增
+	 * @param dqRuleVo
+	 * @param bindingResult
+	 * @return
+	 */
+	@ResponseBody
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public DqRuleVo addDqRule(@RequestBody @Valid DqRuleVo dqRuleVo,BindingResult bindingResult) {
+		if (bindingResult.hasErrors()) {
+            return new DqRuleVo(-1,bindingResult.getFieldError().getDefaultMessage());
+        }
+		Boolean isAddSuc = dqRuleService.addDqRule(dqRuleVo);
+		if(isAddSuc) {
+			return new DqRuleVo();
+		}else {
+			return new DqRuleVo(-1,"Rule add error!");
+		}
+    }
+}

src/main/java/com/gmei/data/dqmp/controller/api/DqRuleImportApiController.java

+package com.gmei.data.dqmp.controller.api;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.gmei.data.dqmp.common.Constants;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.utils.ImportExcelUtils;
+import com.gmei.data.dqmp.vo.BaseVo;
+
+@RestController
+@RequestMapping(value = "/api/excel")
+public class DqRuleImportApiController {
+	
+	@Autowired
+    private DqRuleService dqRuleService;
+	private static final Logger logger = LoggerFactory.getLogger(DqRuleImportApiController.class);
+	
+	@PostMapping(value = "export")
+    public BaseVo exportExcel() {
+        return new BaseVo();
+    }
+	
+	@PostMapping(value = "importUnique")
+    public BaseVo importUniqueExcel(HttpServletRequest httpServletRequest) {
+		if(!checkIsLegal(httpServletRequest,Constants.UNIQUE)) {
+			return new BaseVo(-1,"上传的数据质量规则文件错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadUniqueListString(httpServletRequest,dqRuleService);
+		}catch (Exception e) {
+			logger.error(e.getMessage());
+			return new BaseVo(-1,e.getMessage());
+		}
+        return new BaseVo();
+    }
+	
+	@PostMapping(value = "importUnblank")
+	public BaseVo importUnblankExcel(HttpServletRequest httpServletRequest) {
+		if(!checkIsLegal(httpServletRequest,Constants.UNBLANK)) {
+			return new BaseVo(-1,"上传的数据质量规则文件错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadUnblankListString(httpServletRequest,dqRuleService);
+		}catch (Exception e) {
+			logger.error(e.getMessage());
+			return new BaseVo(-1,e.getMessage());
+		}
+		return new BaseVo();
+	}
+	
+	@PostMapping(value = "importRefer")
+	public BaseVo importReferExcel(HttpServletRequest httpServletRequest) {
+		if(!checkIsLegal(httpServletRequest,Constants.REFER)) {
+			return new BaseVo(-1,"上传的数据质量规则文件错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadReferListString(httpServletRequest,dqRuleService);
+		}catch (Exception e) {
+			logger.error(e.getMessage());
+			return new BaseVo(-1,e.getMessage());
+		}
+		return new BaseVo();
+	}
+	
+	@PostMapping(value = "importVolatility")
+	public BaseVo importVolatilityExcel(HttpServletRequest httpServletRequest) {
+		if(!checkIsLegal(httpServletRequest,Constants.VOLATILITY)) {
+			return new BaseVo(-1,"上传的数据质量规则文件错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadVolatilityListString(httpServletRequest,dqRuleService);
+		}catch (Exception e) {
+			logger.error(e.getMessage());
+			return new BaseVo(-1,e.getMessage());
+		}
+		return new BaseVo();
+	}
+	
+	@PostMapping(value = "importSpecial")
+	public BaseVo importExcel(HttpServletRequest httpServletRequest) {
+		if(!checkIsLegal(httpServletRequest,Constants.SPECIAL)) {
+			return new BaseVo(-1,"上传的数据质量规则文件错误，请核实!");
+		}
+		try {
+			ImportExcelUtils.saxReadSpecialListString(httpServletRequest,dqRuleService);
+		}catch (Exception e) {
+			logger.error(e.getMessage());
+			return new BaseVo(-1,e.getMessage());
+		}
+		return new BaseVo();
+	}
+	
+	/**
+	 * 上传文件格式、内容校验
+	 * @param httpServletRequest
+	 * @param type
+	 * @return
+	 */
+	private Boolean checkIsLegal(HttpServletRequest httpServletRequest,String type) {
+		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) httpServletRequest;
+        MultipartFile requestFile = multipartRequest.getFile("file");
+        String originalFilename = requestFile.getOriginalFilename();
+        if (!originalFilename.endsWith(ExcelTypeEnum.XLS.getValue()) && !originalFilename.endsWith(ExcelTypeEnum.XLSX.getValue())) {
+        	logger.error("Excel导入错误文件名称：{}", originalFilename);
+        	return false;
+        }else {
+        	if(!originalFilename.contains(type)) {
+        		logger.error("导入的不是非空性校验规则文件：{}", originalFilename);
+        		return false;
+        	}
+        }
+        return true;
+	}
+}

src/main/java/com/gmei/data/dqmp/domain/TblIndicatorOperatorInfo.java

@@ -3,7 +3,7 @@ package com.gmei.data.dqmp.domain;
 public class TblIndicatorOperatorInfo {
     private Integer id;
 
-    private String indicatorName;
+    private String indicatorType;
 
     private String operatorExpr;
 
@@ -17,12 +17,12 @@ public class TblIndicatorOperatorInfo {
         this.id = id;
     }
 
-    public String getIndicatorName() {
-        return indicatorName;
+    public String getIndicatorType() {
+        return indicatorType;
     }
 
-    public void setIndicatorName(String indicatorName) {
-        this.indicatorName = indicatorName == null ? null : indicatorName.trim();
+    public void setIndicatorType(String indicatorType) {
+        this.indicatorType = indicatorType == null ? null : indicatorType.trim();
     }
 
     public String getOperatorExpr() {

src/main/java/com/gmei/data/dqmp/domain/TblIndicatorOperatorInfoCriteria.java

@@ -164,73 +164,73 @@ public class TblIndicatorOperatorInfoCriteria {
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameIsNull() {
-            addCriterion("indicator_name is null");
+        public Criteria andIndicatorTypeIsNull() {
+            addCriterion("indicator_type is null");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameIsNotNull() {
-            addCriterion("indicator_name is not null");
+        public Criteria andIndicatorTypeIsNotNull() {
+            addCriterion("indicator_type is not null");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameEqualTo(String value) {
-            addCriterion("indicator_name =", value, "indicatorName");
+        public Criteria andIndicatorTypeEqualTo(String value) {
+            addCriterion("indicator_type =", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameNotEqualTo(String value) {
-            addCriterion("indicator_name <>", value, "indicatorName");
+        public Criteria andIndicatorTypeNotEqualTo(String value) {
+            addCriterion("indicator_type <>", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameGreaterThan(String value) {
-            addCriterion("indicator_name >", value, "indicatorName");
+        public Criteria andIndicatorTypeGreaterThan(String value) {
+            addCriterion("indicator_type >", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameGreaterThanOrEqualTo(String value) {
-            addCriterion("indicator_name >=", value, "indicatorName");
+        public Criteria andIndicatorTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("indicator_type >=", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameLessThan(String value) {
-            addCriterion("indicator_name <", value, "indicatorName");
+        public Criteria andIndicatorTypeLessThan(String value) {
+            addCriterion("indicator_type <", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameLessThanOrEqualTo(String value) {
-            addCriterion("indicator_name <=", value, "indicatorName");
+        public Criteria andIndicatorTypeLessThanOrEqualTo(String value) {
+            addCriterion("indicator_type <=", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameLike(String value) {
-            addCriterion("indicator_name like", value, "indicatorName");
+        public Criteria andIndicatorTypeLike(String value) {
+            addCriterion("indicator_type like", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameNotLike(String value) {
-            addCriterion("indicator_name not like", value, "indicatorName");
+        public Criteria andIndicatorTypeNotLike(String value) {
+            addCriterion("indicator_type not like", value, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameIn(List<String> values) {
-            addCriterion("indicator_name in", values, "indicatorName");
+        public Criteria andIndicatorTypeIn(List<String> values) {
+            addCriterion("indicator_type in", values, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameNotIn(List<String> values) {
-            addCriterion("indicator_name not in", values, "indicatorName");
+        public Criteria andIndicatorTypeNotIn(List<String> values) {
+            addCriterion("indicator_type not in", values, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameBetween(String value1, String value2) {
-            addCriterion("indicator_name between", value1, value2, "indicatorName");
+        public Criteria andIndicatorTypeBetween(String value1, String value2) {
+            addCriterion("indicator_type between", value1, value2, "indicatorType");
             return (Criteria) this;
         }
 
-        public Criteria andIndicatorNameNotBetween(String value1, String value2) {
-            addCriterion("indicator_name not between", value1, value2, "indicatorName");
+        public Criteria andIndicatorTypeNotBetween(String value1, String value2) {
+            addCriterion("indicator_type not between", value1, value2, "indicatorType");
             return (Criteria) this;
         }
 

src/main/java/com/gmei/data/dqmp/domain/TblResultCheckRefer.java

@@ -23,6 +23,8 @@ public class TblResultCheckRefer {
 
     private String partitionDate;
 
+    private Integer sqlId;
+
     private String createTime;
 
     public Integer getId() {
@@ -113,6 +115,14 @@ public class TblResultCheckRefer {
         this.partitionDate = partitionDate == null ? null : partitionDate.trim();
     }
 
+    public Integer getSqlId() {
+        return sqlId;
+    }
+
+    public void setSqlId(Integer sqlId) {
+        this.sqlId = sqlId;
+    }
+
     public String getCreateTime() {
         return createTime;
     }
@@ -120,4 +130,27 @@ public class TblResultCheckRefer {
     public void setCreateTime(String createTime) {
         this.createTime = createTime == null ? null : createTime.trim();
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", checkDbName=").append(checkDbName);
+        sb.append(", checkTbName=").append(checkTbName);
+        sb.append(", checkColName=").append(checkColName);
+        sb.append(", referDbName=").append(referDbName);
+        sb.append(", referTbName=").append(referTbName);
+        sb.append(", referColName=").append(referColName);
+        sb.append(", allNum=").append(allNum);
+        sb.append(", matchedNum=").append(matchedNum);
+        sb.append(", matchedRate=").append(matchedRate);
+        sb.append(", partitionDate=").append(partitionDate);
+        sb.append(", sqlId=").append(sqlId);
+        sb.append(", createTime=").append(createTime);
+        sb.append("]");
+        return sb.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/domain/TblResultCheckReferCriteria.java

@@ -834,6 +834,66 @@ public class TblResultCheckReferCriteria {
             return (Criteria) this;
         }
 
+        public Criteria andSqlIdIsNull() {
+            addCriterion("sql_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIsNotNull() {
+            addCriterion("sql_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdEqualTo(Integer value) {
+            addCriterion("sql_id =", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotEqualTo(Integer value) {
+            addCriterion("sql_id <>", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThan(Integer value) {
+            addCriterion("sql_id >", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sql_id >=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThan(Integer value) {
+            addCriterion("sql_id <", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThanOrEqualTo(Integer value) {
+            addCriterion("sql_id <=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIn(List<Integer> values) {
+            addCriterion("sql_id in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotIn(List<Integer> values) {
+            addCriterion("sql_id not in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id not between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

src/main/java/com/gmei/data/dqmp/domain/TblResultCheckUnblank.java

@@ -17,6 +17,8 @@ public class TblResultCheckUnblank {
 
     private String partitionDate;
 
+    private Integer sqlId;
+
     private String createTime;
 
     public Integer getId() {
@@ -83,6 +85,14 @@ public class TblResultCheckUnblank {
         this.partitionDate = partitionDate == null ? null : partitionDate.trim();
     }
 
+    public Integer getSqlId() {
+        return sqlId;
+    }
+
+    public void setSqlId(Integer sqlId) {
+        this.sqlId = sqlId;
+    }
+
     public String getCreateTime() {
         return createTime;
     }
@@ -90,4 +100,24 @@ public class TblResultCheckUnblank {
     public void setCreateTime(String createTime) {
         this.createTime = createTime == null ? null : createTime.trim();
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", dbName=").append(dbName);
+        sb.append(", tbName=").append(tbName);
+        sb.append(", colName=").append(colName);
+        sb.append(", allNum=").append(allNum);
+        sb.append(", unblankNum=").append(unblankNum);
+        sb.append(", unblankRate=").append(unblankRate);
+        sb.append(", partitionDate=").append(partitionDate);
+        sb.append(", sqlId=").append(sqlId);
+        sb.append(", createTime=").append(createTime);
+        sb.append("]");
+        return sb.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/domain/TblResultCheckUnblankCriteria.java

@@ -624,6 +624,66 @@ public class TblResultCheckUnblankCriteria {
             return (Criteria) this;
         }
 
+        public Criteria andSqlIdIsNull() {
+            addCriterion("sql_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIsNotNull() {
+            addCriterion("sql_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdEqualTo(Integer value) {
+            addCriterion("sql_id =", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotEqualTo(Integer value) {
+            addCriterion("sql_id <>", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThan(Integer value) {
+            addCriterion("sql_id >", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sql_id >=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThan(Integer value) {
+            addCriterion("sql_id <", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThanOrEqualTo(Integer value) {
+            addCriterion("sql_id <=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIn(List<Integer> values) {
+            addCriterion("sql_id in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotIn(List<Integer> values) {
+            addCriterion("sql_id not in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id not between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

src/main/java/com/gmei/data/dqmp/domain/TblResultCheckUnique.java

@@ -17,6 +17,8 @@ public class TblResultCheckUnique {
 
     private String partitionDate;
 
+    private Integer sqlId;
+
     private String createTime;
 
     public Integer getId() {
@@ -83,6 +85,14 @@ public class TblResultCheckUnique {
         this.partitionDate = partitionDate == null ? null : partitionDate.trim();
     }
 
+    public Integer getSqlId() {
+        return sqlId;
+    }
+
+    public void setSqlId(Integer sqlId) {
+        this.sqlId = sqlId;
+    }
+
     public String getCreateTime() {
         return createTime;
     }
@@ -90,4 +100,24 @@ public class TblResultCheckUnique {
     public void setCreateTime(String createTime) {
         this.createTime = createTime == null ? null : createTime.trim();
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", dbName=").append(dbName);
+        sb.append(", tbName=").append(tbName);
+        sb.append(", colName=").append(colName);
+        sb.append(", allNum=").append(allNum);
+        sb.append(", uniqueNum=").append(uniqueNum);
+        sb.append(", uniqueRate=").append(uniqueRate);
+        sb.append(", partitionDate=").append(partitionDate);
+        sb.append(", sqlId=").append(sqlId);
+        sb.append(", createTime=").append(createTime);
+        sb.append("]");
+        return sb.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/domain/TblResultCheckUniqueCriteria.java

@@ -624,6 +624,66 @@ public class TblResultCheckUniqueCriteria {
             return (Criteria) this;
         }
 
+        public Criteria andSqlIdIsNull() {
+            addCriterion("sql_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIsNotNull() {
+            addCriterion("sql_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdEqualTo(Integer value) {
+            addCriterion("sql_id =", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotEqualTo(Integer value) {
+            addCriterion("sql_id <>", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThan(Integer value) {
+            addCriterion("sql_id >", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sql_id >=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThan(Integer value) {
+            addCriterion("sql_id <", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThanOrEqualTo(Integer value) {
+            addCriterion("sql_id <=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIn(List<Integer> values) {
+            addCriterion("sql_id in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotIn(List<Integer> values) {
+            addCriterion("sql_id not in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id not between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

src/main/java/com/gmei/data/dqmp/domain/TblResultMonitorSpecial.java

@@ -9,14 +9,16 @@ public class TblResultMonitorSpecial {
 
     private String timeColName;
 
-    private String startTime;
+    private String indicatorType;
 
-    private String endTime;
+    private Long indicatorValue;
 
-    private Long countNum;
+    private String startTime;
 
     private String partitionDate;
 
+    private Integer sqlId;
+
     private String createTime;
 
     public Integer getId() {
@@ -51,28 +53,28 @@ public class TblResultMonitorSpecial {
         this.timeColName = timeColName == null ? null : timeColName.trim();
     }
 
-    public String getStartTime() {
-        return startTime;
+    public String getIndicatorType() {
+        return indicatorType;
     }
 
-    public void setStartTime(String startTime) {
-        this.startTime = startTime == null ? null : startTime.trim();
+    public void setIndicatorType(String indicatorType) {
+        this.indicatorType = indicatorType == null ? null : indicatorType.trim();
     }
 
-    public String getEndTime() {
-        return endTime;
+    public Long getIndicatorValue() {
+        return indicatorValue;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime == null ? null : endTime.trim();
+    public void setIndicatorValue(Long indicatorValue) {
+        this.indicatorValue = indicatorValue;
     }
 
-    public Long getCountNum() {
-        return countNum;
+    public String getStartTime() {
+        return startTime;
     }
 
-    public void setCountNum(Long countNum) {
-        this.countNum = countNum;
+    public void setStartTime(String startTime) {
+        this.startTime = startTime == null ? null : startTime.trim();
     }
 
     public String getPartitionDate() {
@@ -83,6 +85,14 @@ public class TblResultMonitorSpecial {
         this.partitionDate = partitionDate == null ? null : partitionDate.trim();
     }
 
+    public Integer getSqlId() {
+        return sqlId;
+    }
+
+    public void setSqlId(Integer sqlId) {
+        this.sqlId = sqlId;
+    }
+
     public String getCreateTime() {
         return createTime;
     }
@@ -90,4 +100,24 @@ public class TblResultMonitorSpecial {
     public void setCreateTime(String createTime) {
         this.createTime = createTime == null ? null : createTime.trim();
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", dbName=").append(dbName);
+        sb.append(", tbName=").append(tbName);
+        sb.append(", timeColName=").append(timeColName);
+        sb.append(", indicatorType=").append(indicatorType);
+        sb.append(", indicatorValue=").append(indicatorValue);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", partitionDate=").append(partitionDate);
+        sb.append(", sqlId=").append(sqlId);
+        sb.append(", createTime=").append(createTime);
+        sb.append("]");
+        return sb.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/domain/TblResultMonitorVolatility.java

@@ -15,6 +15,8 @@ public class TblResultMonitorVolatility {
 
     private String partitionDate;
 
+    private Integer sqlId;
+
     private String createTime;
 
     public Integer getId() {
@@ -73,6 +75,14 @@ public class TblResultMonitorVolatility {
         this.partitionDate = partitionDate == null ? null : partitionDate.trim();
     }
 
+    public Integer getSqlId() {
+        return sqlId;
+    }
+
+    public void setSqlId(Integer sqlId) {
+        this.sqlId = sqlId;
+    }
+
     public String getCreateTime() {
         return createTime;
     }
@@ -80,4 +90,23 @@ public class TblResultMonitorVolatility {
     public void setCreateTime(String createTime) {
         this.createTime = createTime == null ? null : createTime.trim();
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", dbName=").append(dbName);
+        sb.append(", tbName=").append(tbName);
+        sb.append(", colName=").append(colName);
+        sb.append(", indicatorType=").append(indicatorType);
+        sb.append(", indicatorValue=").append(indicatorValue);
+        sb.append(", partitionDate=").append(partitionDate);
+        sb.append(", sqlId=").append(sqlId);
+        sb.append(", createTime=").append(createTime);
+        sb.append("]");
+        return sb.toString();
+    }
 }
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/domain/TblResultMonitorVolatilityCriteria.java

@@ -574,6 +574,66 @@ public class TblResultMonitorVolatilityCriteria {
             return (Criteria) this;
         }
 
+        public Criteria andSqlIdIsNull() {
+            addCriterion("sql_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIsNotNull() {
+            addCriterion("sql_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdEqualTo(Integer value) {
+            addCriterion("sql_id =", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotEqualTo(Integer value) {
+            addCriterion("sql_id <>", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThan(Integer value) {
+            addCriterion("sql_id >", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sql_id >=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThan(Integer value) {
+            addCriterion("sql_id <", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdLessThanOrEqualTo(Integer value) {
+            addCriterion("sql_id <=", value, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdIn(List<Integer> values) {
+            addCriterion("sql_id in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotIn(List<Integer> values) {
+            addCriterion("sql_id not in", values, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqlIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("sql_id not between", value1, value2, "sqlId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

src/main/java/com/gmei/data/dqmp/domain/TblCheckMultipleSql.java → src/main/java/com/gmei/data/dqmp/domain/TblRuleInfoDuplex.java

 package com.gmei.data.dqmp.domain;
 
-public class TblCheckMultipleSql {
+import java.util.Date;
+
+public class TblRuleInfoDuplex {
     private Integer id;
 
     private String checkType;
@@ -17,13 +19,15 @@ public class TblCheckMultipleSql {
 
     private String referColName;
 
+    private Double threshold;
+
     private Integer isValid;
 
     private String checkTime;
 
-    private String createTime;
+    private String comment;
 
-    private String sqlContent;
+    private Date createTime;
 
     public Integer getId() {
         return id;
@@ -89,6 +93,14 @@ public class TblCheckMultipleSql {
         this.referColName = referColName == null ? null : referColName.trim();
     }
 
+    public Double getThreshold() {
+        return threshold;
+    }
+
+    public void setThreshold(Double threshold) {
+        this.threshold = threshold;
+    }
+
     public Integer getIsValid() {
         return isValid;
     }
@@ -105,19 +117,19 @@ public class TblCheckMultipleSql {
         this.checkTime = checkTime == null ? null : checkTime.trim();
     }
 
-    public String getCreateTime() {
-        return createTime;
+    public String getComment() {
+        return comment;
     }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime == null ? null : createTime.trim();
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
     }
 
-    public String getSqlContent() {
-        return sqlContent;
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setSqlContent(String sqlContent) {
-        this.sqlContent = sqlContent == null ? null : sqlContent.trim();
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 }
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/domain/TblRuleDuplexInfoCriteria.java → src/main/java/com/gmei/data/dqmp/domain/TblRuleInfoDuplexCriteria.java

 package com.gmei.data.dqmp.domain;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
-public class TblRuleDuplexInfoCriteria {
+public class TblRuleInfoDuplexCriteria {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public TblRuleDuplexInfoCriteria() {
+    public TblRuleInfoDuplexCriteria() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -654,63 +655,63 @@ public class TblRuleDuplexInfoCriteria {
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedIsNull() {
-            addCriterion("is_partitioned is null");
+        public Criteria andThresholdIsNull() {
+            addCriterion("threshold is null");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedIsNotNull() {
-            addCriterion("is_partitioned is not null");
+        public Criteria andThresholdIsNotNull() {
+            addCriterion("threshold is not null");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedEqualTo(Integer value) {
-            addCriterion("is_partitioned =", value, "isPartitioned");
+        public Criteria andThresholdEqualTo(Double value) {
+            addCriterion("threshold =", value, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedNotEqualTo(Integer value) {
-            addCriterion("is_partitioned <>", value, "isPartitioned");
+        public Criteria andThresholdNotEqualTo(Double value) {
+            addCriterion("threshold <>", value, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedGreaterThan(Integer value) {
-            addCriterion("is_partitioned >", value, "isPartitioned");
+        public Criteria andThresholdGreaterThan(Double value) {
+            addCriterion("threshold >", value, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedGreaterThanOrEqualTo(Integer value) {
-            addCriterion("is_partitioned >=", value, "isPartitioned");
+        public Criteria andThresholdGreaterThanOrEqualTo(Double value) {
+            addCriterion("threshold >=", value, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedLessThan(Integer value) {
-            addCriterion("is_partitioned <", value, "isPartitioned");
+        public Criteria andThresholdLessThan(Double value) {
+            addCriterion("threshold <", value, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedLessThanOrEqualTo(Integer value) {
-            addCriterion("is_partitioned <=", value, "isPartitioned");
+        public Criteria andThresholdLessThanOrEqualTo(Double value) {
+            addCriterion("threshold <=", value, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedIn(List<Integer> values) {
-            addCriterion("is_partitioned in", values, "isPartitioned");
+        public Criteria andThresholdIn(List<Double> values) {
+            addCriterion("threshold in", values, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedNotIn(List<Integer> values) {
-            addCriterion("is_partitioned not in", values, "isPartitioned");
+        public Criteria andThresholdNotIn(List<Double> values) {
+            addCriterion("threshold not in", values, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedBetween(Integer value1, Integer value2) {
-            addCriterion("is_partitioned between", value1, value2, "isPartitioned");
+        public Criteria andThresholdBetween(Double value1, Double value2) {
+            addCriterion("threshold between", value1, value2, "threshold");
             return (Criteria) this;
         }
 
-        public Criteria andIsPartitionedNotBetween(Integer value1, Integer value2) {
-            addCriterion("is_partitioned not between", value1, value2, "isPartitioned");
+        public Criteria andThresholdNotBetween(Double value1, Double value2) {
+            addCriterion("threshold not between", value1, value2, "threshold");
             return (Criteria) this;
         }
 
@@ -844,6 +845,76 @@ public class TblRuleDuplexInfoCriteria {
             return (Criteria) this;
         }
 
+        public Criteria andCommentIsNull() {
+            addCriterion("comment is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentIsNotNull() {
+            addCriterion("comment is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentEqualTo(String value) {
+            addCriterion("comment =", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotEqualTo(String value) {
+            addCriterion("comment <>", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentGreaterThan(String value) {
+            addCriterion("comment >", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentGreaterThanOrEqualTo(String value) {
+            addCriterion("comment >=", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentLessThan(String value) {
+            addCriterion("comment <", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentLessThanOrEqualTo(String value) {
+            addCriterion("comment <=", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentLike(String value) {
+            addCriterion("comment like", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotLike(String value) {
+            addCriterion("comment not like", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentIn(List<String> values) {
+            addCriterion("comment in", values, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotIn(List<String> values) {
+            addCriterion("comment not in", values, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentBetween(String value1, String value2) {
+            addCriterion("comment between", value1, value2, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotBetween(String value1, String value2) {
+            addCriterion("comment not between", value1, value2, "comment");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
@@ -854,62 +925,52 @@ public class TblRuleDuplexInfoCriteria {
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeEqualTo(String value) {
+        public Criteria andCreateTimeEqualTo(Date value) {
             addCriterion("create_time =", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeNotEqualTo(String value) {
+        public Criteria andCreateTimeNotEqualTo(Date value) {
             addCriterion("create_time <>", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeGreaterThan(String value) {
+        public Criteria andCreateTimeGreaterThan(Date value) {
             addCriterion("create_time >", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
             addCriterion("create_time >=", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeLessThan(String value) {
+        public Criteria andCreateTimeLessThan(Date value) {
             addCriterion("create_time <", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
             addCriterion("create_time <=", value, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeLike(String value) {
-            addCriterion("create_time like", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotLike(String value) {
-            addCriterion("create_time not like", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<String> values) {
+        public Criteria andCreateTimeIn(List<Date> values) {
             addCriterion("create_time in", values, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeNotIn(List<String> values) {
+        public Criteria andCreateTimeNotIn(List<Date> values) {
             addCriterion("create_time not in", values, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeBetween(String value1, String value2) {
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
             addCriterion("create_time between", value1, value2, "createTime");
             return (Criteria) this;
         }
 
-        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
             addCriterion("create_time not between", value1, value2, "createTime");
             return (Criteria) this;
         }

src/main/java/com/gmei/data/dqmp/domain/TblRuleDuplexInfoWithBLOBs.java → src/main/java/com/gmei/data/dqmp/domain/TblRuleInfoDuplexWithBLOBs.java

 package com.gmei.data.dqmp.domain;
 
-public class TblRuleDuplexInfoWithBLOBs extends TblRuleDuplexInfo {
+public class TblRuleInfoDuplexWithBLOBs extends TblRuleInfoDuplex {
     private String checkFilters;
 
     private String referFilters;

src/main/java/com/gmei/data/dqmp/domain/TblRuleSimpleInfo.java → src/main/java/com/gmei/data/dqmp/domain/TblRuleInfoSimple.java

 package com.gmei.data.dqmp.domain;
 
-public class TblRuleSimpleInfo {
+import java.util.Date;
+
+public class TblRuleInfoSimple {
     private Integer id;
 
     private String checkType;
@@ -11,19 +13,21 @@ public class TblRuleSimpleInfo {
 
     private String colName;
 
+    private String timeColName;
+
     private String indicatorType;
 
     private String startTime;
 
-    private String endTime;
-
-    private Integer isPartitioned;
+    private Double threshold;
 
     private Integer isValid;
 
     private String checkTime;
 
-    private String createTime;
+    private String comment;
+
+    private Date createTime;
 
     private String filters;
 
@@ -67,6 +71,14 @@ public class TblRuleSimpleInfo {
         this.colName = colName == null ? null : colName.trim();
     }
 
+    public String getTimeColName() {
+        return timeColName;
+    }
+
+    public void setTimeColName(String timeColName) {
+        this.timeColName = timeColName == null ? null : timeColName.trim();
+    }
+
     public String getIndicatorType() {
         return indicatorType;
     }
@@ -83,20 +95,12 @@ public class TblRuleSimpleInfo {
         this.startTime = startTime == null ? null : startTime.trim();
     }
 
-    public String getEndTime() {
-        return endTime;
+    public Double getThreshold() {
+        return threshold;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime == null ? null : endTime.trim();
-    }
-
-    public Integer getIsPartitioned() {
-        return isPartitioned;
-    }
-
-    public void setIsPartitioned(Integer isPartitioned) {
-        this.isPartitioned = isPartitioned;
+    public void setThreshold(Double threshold) {
+        this.threshold = threshold;
     }
 
     public Integer getIsValid() {
@@ -115,12 +119,20 @@ public class TblRuleSimpleInfo {
         this.checkTime = checkTime == null ? null : checkTime.trim();
     }
 
-    public String getCreateTime() {
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
+    }
+
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime == null ? null : createTime.trim();
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public String getFilters() {

src/main/java/com/gmei/data/dqmp/domain/TblRuleDuplexInfo.java → src/main/java/com/gmei/data/dqmp/domain/TblSqlCheckDuplex.java

 package com.gmei.data.dqmp.domain;
 
-public class TblRuleDuplexInfo {
+import java.util.Date;
+
+public class TblSqlCheckDuplex {
     private Integer id;
 
     private String checkType;
@@ -17,13 +19,19 @@ public class TblRuleDuplexInfo {
 
     private String referColName;
 
-    private Integer isPartitioned;
+    private Double threshold;
 
     private Integer isValid;
 
     private String checkTime;
 
-    private String createTime;
+    private String comment;
+
+    private Integer parentId;
+
+    private Date createTime;
+
+    private String sqlContent;
 
     public Integer getId() {
         return id;
@@ -89,12 +97,12 @@ public class TblRuleDuplexInfo {
         this.referColName = referColName == null ? null : referColName.trim();
     }
 
-    public Integer getIsPartitioned() {
-        return isPartitioned;
+    public Double getThreshold() {
+        return threshold;
     }
 
-    public void setIsPartitioned(Integer isPartitioned) {
-        this.isPartitioned = isPartitioned;
+    public void setThreshold(Double threshold) {
+        this.threshold = threshold;
     }
 
     public Integer getIsValid() {
@@ -113,11 +121,35 @@ public class TblRuleDuplexInfo {
         this.checkTime = checkTime == null ? null : checkTime.trim();
     }
 
-    public String getCreateTime() {
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime == null ? null : createTime.trim();
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getSqlContent() {
+        return sqlContent;
+    }
+
+    public void setSqlContent(String sqlContent) {
+        this.sqlContent = sqlContent == null ? null : sqlContent.trim();
     }
 }
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/domain/TblCheckSingleSql.java → src/main/java/com/gmei/data/dqmp/domain/TblSqlCheckSingle.java

 package com.gmei.data.dqmp.domain;
 
-public class TblCheckSingleSql {
+import java.util.Date;
+
+public class TblSqlCheckSingle {
     private Integer id;
 
     private String checkType;
@@ -11,11 +13,17 @@ public class TblCheckSingleSql {
 
     private String colName;
 
+    private Double threshold;
+
     private Integer isValid;
 
     private String checkTime;
 
-    private String createTime;
+    private String comment;
+
+    private Integer parentId;
+
+    private Date createTime;
 
     private String sqlContent;
 
@@ -59,6 +67,14 @@ public class TblCheckSingleSql {
         this.colName = colName == null ? null : colName.trim();
     }
 
+    public Double getThreshold() {
+        return threshold;
+    }
+
+    public void setThreshold(Double threshold) {
+        this.threshold = threshold;
+    }
+
     public Integer getIsValid() {
         return isValid;
     }
@@ -75,12 +91,28 @@ public class TblCheckSingleSql {
         this.checkTime = checkTime == null ? null : checkTime.trim();
     }
 
-    public String getCreateTime() {
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime == null ? null : createTime.trim();
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public String getSqlContent() {

src/main/java/com/gmei/data/dqmp/domain/TblMonitorSpecialSql.java → src/main/java/com/gmei/data/dqmp/domain/TblSqlMonitorSpecial.java

 package com.gmei.data.dqmp.domain;
 
-public class TblMonitorSpecialSql {
+import java.util.Date;
+
+public class TblSqlMonitorSpecial {
     private Integer id;
 
     private String dbName;
 
     private String tbName;
 
+    private String colName;
+
     private String timeColName;
 
+    private String indicatorType;
+
     private String startTime;
 
-    private String endTime;
+    private Double threshold;
 
     private Integer isValid;
 
     private String checkTime;
 
-    private String createTime;
+    private String comment;
+
+    private Integer parentId;
+
+    private Date createTime;
 
     private String sqlContent;
 
@@ -45,6 +55,14 @@ public class TblMonitorSpecialSql {
         this.tbName = tbName == null ? null : tbName.trim();
     }
 
+    public String getColName() {
+        return colName;
+    }
+
+    public void setColName(String colName) {
+        this.colName = colName == null ? null : colName.trim();
+    }
+
     public String getTimeColName() {
         return timeColName;
     }
@@ -53,6 +71,14 @@ public class TblMonitorSpecialSql {
         this.timeColName = timeColName == null ? null : timeColName.trim();
     }
 
+    public String getIndicatorType() {
+        return indicatorType;
+    }
+
+    public void setIndicatorType(String indicatorType) {
+        this.indicatorType = indicatorType == null ? null : indicatorType.trim();
+    }
+
     public String getStartTime() {
         return startTime;
     }
@@ -61,12 +87,12 @@ public class TblMonitorSpecialSql {
         this.startTime = startTime == null ? null : startTime.trim();
     }
 
-    public String getEndTime() {
-        return endTime;
+    public Double getThreshold() {
+        return threshold;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime == null ? null : endTime.trim();
+    public void setThreshold(Double threshold) {
+        this.threshold = threshold;
     }
 
     public Integer getIsValid() {
@@ -85,12 +111,28 @@ public class TblMonitorSpecialSql {
         this.checkTime = checkTime == null ? null : checkTime.trim();
     }
 
-    public String getCreateTime() {
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime == null ? null : createTime.trim();
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public String getSqlContent() {

src/main/java/com/gmei/data/dqmp/domain/TblMonitorVolatilitySql.java → src/main/java/com/gmei/data/dqmp/domain/TblSqlMonitorVolatility.java

 package com.gmei.data.dqmp.domain;
 
-public class TblMonitorVolatilitySql {
-    private Integer id;
+import java.util.Date;
 
-    private String indicatorType;
+public class TblSqlMonitorVolatility {
+    private Integer id;
 
     private String dbName;
 
@@ -11,11 +11,19 @@ public class TblMonitorVolatilitySql {
 
     private String colName;
 
+    private String indicatorType;
+
+    private Double threshold;
+
     private Integer isValid;
 
     private String checkTime;
 
-    private String createTime;
+    private String comment;
+
+    private Integer parentId;
+
+    private Date createTime;
 
     private String sqlContent;
 
@@ -27,14 +35,6 @@ public class TblMonitorVolatilitySql {
         this.id = id;
     }
 
-    public String getIndicatorType() {
-        return indicatorType;
-    }
-
-    public void setIndicatorType(String indicatorType) {
-        this.indicatorType = indicatorType == null ? null : indicatorType.trim();
-    }
-
     public String getDbName() {
         return dbName;
     }
@@ -59,6 +59,22 @@ public class TblMonitorVolatilitySql {
         this.colName = colName == null ? null : colName.trim();
     }
 
+    public String getIndicatorType() {
+        return indicatorType;
+    }
+
+    public void setIndicatorType(String indicatorType) {
+        this.indicatorType = indicatorType == null ? null : indicatorType.trim();
+    }
+
+    public Double getThreshold() {
+        return threshold;
+    }
+
+    public void setThreshold(Double threshold) {
+        this.threshold = threshold;
+    }
+
     public Integer getIsValid() {
         return isValid;
     }
@@ -75,12 +91,28 @@ public class TblMonitorVolatilitySql {
         this.checkTime = checkTime == null ? null : checkTime.trim();
     }
 
-    public String getCreateTime() {
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime == null ? null : createTime.trim();
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public String getSqlContent() {

src/main/java/com/gmei/data/dqmp/domain/TblThresholdExceedAll.java

+package com.gmei.data.dqmp.domain;
+
+public class TblThresholdExceedAll {
+    private Integer id;
+
+    private String checkType;
+
+    private String dbName;
+
+    private String tbName;
+
+    private String colName;
+
+    private Long allNum;
+
+    private Long checkNum;
+
+    private Double checkRate;
+
+    private String partitionDate;
+
+    private Integer sqlId;
+
+    private String createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCheckType() {
+        return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType == null ? null : checkType.trim();
+    }
+
+    public String getDbName() {
+        return dbName;
+    }
+
+    public void setDbName(String dbName) {
+        this.dbName = dbName == null ? null : dbName.trim();
+    }
+
+    public String getTbName() {
+        return tbName;
+    }
+
+    public void setTbName(String tbName) {
+        this.tbName = tbName == null ? null : tbName.trim();
+    }
+
+    public String getColName() {
+        return colName;
+    }
+
+    public void setColName(String colName) {
+        this.colName = colName == null ? null : colName.trim();
+    }
+
+    public Long getAllNum() {
+        return allNum;
+    }
+
+    public void setAllNum(Long allNum) {
+        this.allNum = allNum;
+    }
+
+    public Long getCheckNum() {
+        return checkNum;
+    }
+
+    public void setCheckNum(Long checkNum) {
+        this.checkNum = checkNum;
+    }
+
+    public Double getCheckRate() {
+        return checkRate;
+    }
+
+    public void setCheckRate(Double checkRate) {
+        this.checkRate = checkRate;
+    }
+
+    public String getPartitionDate() {
+        return partitionDate;
+    }
+
+    public void setPartitionDate(String partitionDate) {
+        this.partitionDate = partitionDate == null ? null : partitionDate.trim();
+    }
+
+    public Integer getSqlId() {
+        return sqlId;
+    }
+
+    public void setSqlId(Integer sqlId) {
+        this.sqlId = sqlId;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", checkType=").append(checkType);
+        sb.append(", dbName=").append(dbName);
+        sb.append(", tbName=").append(tbName);
+        sb.append(", colName=").append(colName);
+        sb.append(", allNum=").append(allNum);
+        sb.append(", checkNum=").append(checkNum);
+        sb.append(", checkRate=").append(checkRate);
+        sb.append(", partitionDate=").append(partitionDate);
+        sb.append(", sqlId=").append(sqlId);
+        sb.append(", createTime=").append(createTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/dto/DqReferRuleDto.java

+package com.gmei.data.dqmp.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+
+import lombok.Data;
+
+@Data
+public class DqReferRuleDto extends BaseRowModel{
+	@ExcelProperty(value = "校验类型",index = 0) 
+	private String checkType;
+	@ExcelProperty(value = "是否启用",index = 1) 
+	private Integer isValid;
+	@ExcelProperty(value = "校验时间",index = 2) 
+	private String checkTime;
+	@ExcelProperty(value = "校验数据库名",index = 3) 
+	private String checkDbName;
+	@ExcelProperty(value = "校验数据表名",index = 4) 
+	private String checkTbName;
+	@ExcelProperty(value = "校验数据列名",index = 5) 
+	private String checkColName;
+	@ExcelProperty(value = "校验表过滤条件",index = 6) 
+	private String checkFilters;
+	@ExcelProperty(value = "参照数据库名",index = 7) 
+	private String referDbName;
+	@ExcelProperty(value = "参照数据表名",index = 8) 
+	private String referTbName;
+	@ExcelProperty(value = "参照数据列名",index = 9) 
+	private String referColName;
+	@ExcelProperty(value = "参照表过滤条件",index = 10) 
+	private String referFilters;
+	@ExcelProperty(value = "预警阈值",index = 11) 
+	private Double threshold;
+	@ExcelProperty(value = "备注", index = 12)
+	private String comment;
+}

src/main/java/com/gmei/data/dqmp/dto/DqSpecialRuleDto.java

+package com.gmei.data.dqmp.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+
+import lombok.Data;
+
+@Data
+public class DqSpecialRuleDto extends BaseRowModel {
+	@ExcelProperty(value = "校验类型", index = 0)
+	private String checkType;
+	@ExcelProperty(value = "是否启用", index = 1)
+	private Integer isValid;
+	@ExcelProperty(value = "校验时间", index = 2)
+	private String checkTime;
+	@ExcelProperty(value = "数据库名", index = 3)
+	private String dbName;
+	@ExcelProperty(value = "数据表名", index = 4)
+	private String tbName;
+	@ExcelProperty(value = "数据列名", index = 5)
+	private String colName;
+	@ExcelProperty(value = "数据时间列名", index = 6)
+	private String timeColName;
+	@ExcelProperty(value = "指标类型", index = 7)
+	private String indicatorType;
+	@ExcelProperty(value = "数据校验起始时间", index = 8)
+	private String startTime;
+	@ExcelProperty(value = "过滤条件", index = 9)
+	private String filters;
+	@ExcelProperty(value = "预警阈值",index = 10) 
+	private Double threshold;
+	@ExcelProperty(value = "备注", index = 11)
+	private String comment;
+}

src/main/java/com/gmei/data/dqmp/dto/DqUnblankRuleDto.java

+package com.gmei.data.dqmp.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+
+import lombok.Data;
+
+@Data
+public class DqUnblankRuleDto extends BaseRowModel{
+	@ExcelProperty(value = "校验类型", index = 0)
+	private String checkType;
+	@ExcelProperty(value = "是否启用", index = 1)
+	private Integer isValid;
+	@ExcelProperty(value = "校验时间", index = 2)
+	private String checkTime;
+	@ExcelProperty(value = "数据库名", index = 3)
+	private String dbName;
+	@ExcelProperty(value = "数据表名", index = 4)
+	private String tbName;
+	@ExcelProperty(value = "数据列名", index = 5)
+	private String colName;
+	@ExcelProperty(value = "过滤条件", index = 6)
+	private String filters;
+	@ExcelProperty(value = "预警阈值",index = 7) 
+	private Double threshold;
+	@ExcelProperty(value = "备注", index = 8)
+	private String comment;
+}

src/main/java/com/gmei/data/dqmp/dto/DqUniqueRuleDto.java

+package com.gmei.data.dqmp.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+
+import lombok.Data;
+
+@Data
+public class DqUniqueRuleDto extends BaseRowModel{
+	@ExcelProperty(value = "校验类型", index = 0)
+	private String checkType;
+	@ExcelProperty(value = "是否启用", index = 1)
+	private Integer isValid;
+	@ExcelProperty(value = "校验时间", index = 2)
+	private String checkTime;
+	@ExcelProperty(value = "数据库名", index = 3)
+	private String dbName;
+	@ExcelProperty(value = "数据表名", index = 4)
+	private String tbName;
+	@ExcelProperty(value = "数据列名", index = 5)
+	private String colName;
+	@ExcelProperty(value = "过滤条件", index = 6)
+	private String filters;
+	@ExcelProperty(value = "预警阈值",index = 7) 
+	private Double threshold;
+	@ExcelProperty(value = "备注", index = 8)
+	private String comment;
+}

src/main/java/com/gmei/data/dqmp/dto/DqVolatilityRuleDto.java

+package com.gmei.data.dqmp.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+
+import lombok.Data;
+
+@Data
+public class DqVolatilityRuleDto extends BaseRowModel{
+	@ExcelProperty(value = "校验类型", index = 0)
+	private String checkType;
+	@ExcelProperty(value = "是否启用", index = 1)
+	private Integer isValid;
+	@ExcelProperty(value = "校验时间", index = 2)
+	private String checkTime;
+	@ExcelProperty(value = "数据库名", index = 3)
+	private String dbName;
+	@ExcelProperty(value = "数据表名", index = 4)
+	private String tbName;
+	@ExcelProperty(value = "数据列名", index = 5)
+	private String colName;
+	@ExcelProperty(value = "指标类型", index = 6)
+	private String indicatorType;
+	@ExcelProperty(value = "过滤条件", index = 7)
+	private String filters;
+	@ExcelProperty(value = "预警阈值",index = 8) 
+	private Double threshold;
+	@ExcelProperty(value = "备注", index = 9)
+	private String comment;
+}

src/main/java/com/gmei/data/dqmp/dto/RuleTemplateDto.java

 package com.gmei.data.dqmp.dto;
 
+import lombok.Data;
+
+@Data
 public class RuleTemplateDto {
 	
 	private Integer id;
@@ -10,36 +13,4 @@ public class RuleTemplateDto {
 
     private String comment;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-	public String getCheckType() {
-		return checkType;
-	}
-
-	public void setCheckType(String checkType) {
-		this.checkType = checkType;
-	}
-
-	public String getTpltContent() {
-		return tpltContent;
-	}
-
-	public void setTpltContent(String tpltContent) {
-		this.tpltContent = tpltContent;
-	}
-
-	public String getComment() {
-		return comment;
-	}
-
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
 }

src/main/java/com/gmei/data/dqmp/listener/ReferExcelListener.java

+package com.gmei.data.dqmp.listener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.vo.DqRuleVo;
+
+public class ReferExcelListener extends AnalysisEventListener<Object> {
+ 
+	private DqRuleService dqRuleService;
+ 
+    public ReferExcelListener(DqRuleService dqRuleService) {
+        super();
+        this.dqRuleService = dqRuleService;
+    }
+ 
+    private List<Object>  data = new ArrayList<>();
+ 
+    @Override
+    public void invoke(Object object, AnalysisContext context) {
+        System.out.println(context.getCurrentSheet());
+        data.add(object);
+        if(data.size()>=100){
+            doSomething();
+            data.clear();
+        }
+    }
+ 
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        doSomething();
+    }
+ 
+    public void doSomething(){
+        for (Object o:data) {
+            String jsonString = JSONObject.toJSONString(o);
+            JSONObject jsonObject = JSONObject.parseObject(jsonString);
+            DqRuleVo dqRuleVo = JSON.toJavaObject(jsonObject, DqRuleVo.class);
+            dqRuleService.addDqRule(dqRuleVo);
+        }
+    }
+ 
+    public List<Object> getData() {
+        return data;
+    }
+ 
+    public void setData(List<Object> data) {
+        this.data = data;
+    }
+}

src/main/java/com/gmei/data/dqmp/listener/SpecialExcelListener.java

+package com.gmei.data.dqmp.listener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.vo.DqRuleVo;
+
+public class SpecialExcelListener extends AnalysisEventListener<Object> {
+ 
+	private DqRuleService dqRuleService;
+ 
+    public SpecialExcelListener(DqRuleService dqRuleService) {
+        super();
+        this.dqRuleService = dqRuleService;
+    }
+ 
+    private List<Object>  data = new ArrayList<>();
+ 
+    @Override
+    public void invoke(Object object, AnalysisContext context) {
+        System.out.println(context.getCurrentSheet());
+        data.add(object);
+        if(data.size()>=100){
+            doSomething();
+            data.clear();
+        }
+    }
+ 
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        doSomething();
+    }
+ 
+    public void doSomething(){
+        for (Object o:data) {
+            String jsonString = JSONObject.toJSONString(o);
+            JSONObject jsonObject = JSONObject.parseObject(jsonString);
+            DqRuleVo dqRuleVo = JSON.toJavaObject(jsonObject, DqRuleVo.class);
+            dqRuleService.addDqRule(dqRuleVo);
+        }
+    }
+ 
+    public List<Object> getData() {
+        return data;
+    }
+ 
+    public void setData(List<Object> data) {
+        this.data = data;
+    }
+}

src/main/java/com/gmei/data/dqmp/listener/UnblankExcelListener.java

+package com.gmei.data.dqmp.listener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.vo.DqRuleVo;
+
+public class UnblankExcelListener extends AnalysisEventListener<Object> {
+ 
+	private DqRuleService dqRuleService;
+ 
+    public UnblankExcelListener(DqRuleService dqRuleService) {
+        super();
+        this.dqRuleService = dqRuleService;
+    }
+ 
+    private List<Object>  data = new ArrayList<>();
+ 
+    @Override
+    public void invoke(Object object, AnalysisContext context) {
+        System.out.println(context.getCurrentSheet());
+        data.add(object);
+        if(data.size()>=100){
+            doSomething();
+            data.clear();
+        }
+    }
+ 
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        doSomething();
+    }
+ 
+    public void doSomething(){
+        for (Object o:data) {
+            String jsonString = JSONObject.toJSONString(o);
+            JSONObject jsonObject = JSONObject.parseObject(jsonString);
+            DqRuleVo dqRuleVo = JSON.toJavaObject(jsonObject, DqRuleVo.class);
+            dqRuleService.addDqRule(dqRuleVo);
+        }
+    }
+ 
+    public List<Object> getData() {
+        return data;
+    }
+ 
+    public void setData(List<Object> data) {
+        this.data = data;
+    }
+}

src/main/java/com/gmei/data/dqmp/listener/UniqueExcelListener.java

+package com.gmei.data.dqmp.listener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.vo.DqRuleVo;
+
+public class UniqueExcelListener extends AnalysisEventListener<Object> {
+ 
+	private DqRuleService dqRuleService;
+ 
+    public UniqueExcelListener(DqRuleService dqRuleService) {
+        super();
+        this.dqRuleService = dqRuleService;
+    }
+ 
+    private List<Object>  data = new ArrayList<>();
+ 
+    @Override
+    public void invoke(Object object, AnalysisContext context) {
+        System.out.println(context.getCurrentSheet());
+        data.add(object);
+        if(data.size()>=100){
+            doSomething();
+            data.clear();
+        }
+    }
+ 
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        doSomething();
+    }
+ 
+    public void doSomething(){
+        for (Object o:data) {
+            String jsonString = JSONObject.toJSONString(o);
+            System.out.println(jsonString);
+            JSONObject jsonObject = JSONObject.parseObject(jsonString);
+            DqRuleVo dqRuleVo = JSON.toJavaObject(jsonObject, DqRuleVo.class);
+            dqRuleService.addDqRule(dqRuleVo);
+        }
+    }
+ 
+    public List<Object> getData() {
+        return data;
+    }
+ 
+    public void setData(List<Object> data) {
+        this.data = data;
+    }
+}

src/main/java/com/gmei/data/dqmp/listener/VolatilityExcelListener.java

+package com.gmei.data.dqmp.listener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gmei.data.dqmp.service.DqRuleService;
+import com.gmei.data.dqmp.vo.DqRuleVo;
+
+public class VolatilityExcelListener extends AnalysisEventListener<Object> {
+ 
+	private DqRuleService dqRuleService;
+ 
+    public VolatilityExcelListener(DqRuleService dqRuleService) {
+        super();
+        this.dqRuleService = dqRuleService;
+    }
+ 
+    private List<Object>  data = new ArrayList<>();
+ 
+    @Override
+    public void invoke(Object object, AnalysisContext context) {
+        System.out.println(context.getCurrentSheet());
+        data.add(object);
+        if(data.size()>=100){
+            doSomething();
+            data.clear();
+        }
+    }
+ 
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        doSomething();
+    }
+ 
+    public void doSomething(){
+        for (Object o:data) {
+            String jsonString = JSONObject.toJSONString(o);
+            JSONObject jsonObject = JSONObject.parseObject(jsonString);
+            DqRuleVo dqRuleVo = JSON.toJavaObject(jsonObject, DqRuleVo.class);
+            dqRuleService.addDqRule(dqRuleVo);
+        }
+    }
+ 
+    public List<Object> getData() {
+        return data;
+    }
+ 
+    public void setData(List<Object> data) {
+        this.data = data;
+    }
+}

src/main/java/com/gmei/data/dqmp/mapper/TblCheckMultipleSqlMapper.java

-package com.gmei.data.dqmp.mapper;
-
-import com.gmei.data.dqmp.domain.TblCheckMultipleSql;
-import com.gmei.data.dqmp.domain.TblCheckMultipleSqlCriteria;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TblCheckMultipleSqlMapper {
-    int countByExample(TblCheckMultipleSqlCriteria example);
-
-    int deleteByExample(TblCheckMultipleSqlCriteria example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(TblCheckMultipleSql record);
-
-    int insertSelective(TblCheckMultipleSql record);
-
-    List<TblCheckMultipleSql> selectByExampleWithBLOBs(TblCheckMultipleSqlCriteria example);
-
-    List<TblCheckMultipleSql> selectByExample(TblCheckMultipleSqlCriteria example);
-
-    TblCheckMultipleSql selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") TblCheckMultipleSql record, @Param("example") TblCheckMultipleSqlCriteria example);
-
-    int updateByExampleWithBLOBs(@Param("record") TblCheckMultipleSql record, @Param("example") TblCheckMultipleSqlCriteria example);
-
-    int updateByExample(@Param("record") TblCheckMultipleSql record, @Param("example") TblCheckMultipleSqlCriteria example);
-
-    int updateByPrimaryKeySelective(TblCheckMultipleSql record);
-
-    int updateByPrimaryKeyWithBLOBs(TblCheckMultipleSql record);
-
-    int updateByPrimaryKey(TblCheckMultipleSql record);
-}
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/mapper/TblCheckSingleSqlMapper.java

-package com.gmei.data.dqmp.mapper;
-
-import com.gmei.data.dqmp.domain.TblCheckSingleSql;
-import com.gmei.data.dqmp.domain.TblCheckSingleSqlCriteria;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TblCheckSingleSqlMapper {
-    int countByExample(TblCheckSingleSqlCriteria example);
-
-    int deleteByExample(TblCheckSingleSqlCriteria example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(TblCheckSingleSql record);
-
-    int insertSelective(TblCheckSingleSql record);
-
-    List<TblCheckSingleSql> selectByExampleWithBLOBs(TblCheckSingleSqlCriteria example);
-
-    List<TblCheckSingleSql> selectByExample(TblCheckSingleSqlCriteria example);
-
-    TblCheckSingleSql selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") TblCheckSingleSql record, @Param("example") TblCheckSingleSqlCriteria example);
-
-    int updateByExampleWithBLOBs(@Param("record") TblCheckSingleSql record, @Param("example") TblCheckSingleSqlCriteria example);
-
-    int updateByExample(@Param("record") TblCheckSingleSql record, @Param("example") TblCheckSingleSqlCriteria example);
-
-    int updateByPrimaryKeySelective(TblCheckSingleSql record);
-
-    int updateByPrimaryKeyWithBLOBs(TblCheckSingleSql record);
-
-    int updateByPrimaryKey(TblCheckSingleSql record);
-}
\ No newline at end of file

src/main/java/com/gmei/data/dqmp/service/CheckService.java

@@ -12,6 +12,6 @@ public interface CheckService {
 	 * 校验并持久化复杂型校验结果
 	 * @param checkType
 	 */
-	void checkAndPersistMultipleResult(String checkType);
+	void checkAndPersistDeplexResult(String checkType);
 
 }

src/main/java/com/gmei/data/dqmp/service/DashbordService.java

+package com.gmei.data.dqmp.service;
+
+import com.gmei.data.dqmp.vo.DashbordVo;
+
+public interface DashbordService {
+
+	DashbordVo getDashbordInfo();
+
+}