Merge branch 'zhaojianwei' into 'master'

update special monitor codes

See merge request !3

docs/readme.txt

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

pom.xml

@@ -48,7 +48,6 @@
 		<dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.3.2</version>
         </dependency>
 		<!-- 集成mysql驱动 -->
 		<dependency>
@@ -75,7 +74,6 @@
 		<dependency>
             <groupId>net.sourceforge.nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
-            <version>1.9.22</version>
         </dependency>
 		<!-- 集成热部署插件 -->
 		<dependency>

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

@@ -40,6 +40,12 @@ public class DqRuleController extends BaseController{
 		}
     }
 
+	/**
+	 * 校验规则删除
+	 * @param dqRuleVo
+	 * @param model
+	 * @return
+	 */
 	@RequestMapping(value = "/del", method = RequestMethod.GET)
     public String delDqRule(DqRuleVo dqRuleVo, Model model) {
 		if(dqRuleVo.getId() == null || StringUtils.isBlank(dqRuleVo.getCheckType())) {

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

@@ -118,7 +118,7 @@ public class DqRuleImportController extends BaseController{
 			return false;
 		} else {
 			if (!originalFilename.contains(type)) {
-				logger.error("导入的不是非空性校验规则文件：{}", originalFilename);
+				logger.error("导入的文件错误，请核实：{}", originalFilename);
 				return false;
 			}
 		}

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

@@ -130,7 +130,6 @@ public class DqRuleServiceImpl implements DqRuleService {
 					logger.error("Param is illegal! {}", dqRuleVo);
 					return false;
 				}
-				dqRuleVo.setStartTime(DateUtils.getZeroTimeStrsMap().get(dqRuleVo.getStartTime()));
 				TblSqlMonitorSpecial tblSqlMonitorSpecial = BeanUtils.map(dqRuleVo, TblSqlMonitorSpecial.class);
 				tblSqlMonitorSpecial.setSqlContent(genSqlByTemplate(dqRuleVo));
 				tblSqlMonitorSpecial.setParentId(record.getId());
@@ -229,8 +228,6 @@ public class DqRuleServiceImpl implements DqRuleService {
 				.replaceAll("#tb_name", dqRuleVo.getTbName()).replaceAll("#indicator_type", indicatorType)
 				.replaceAll("#indicator_expre", indicatorMap.get(indicatorType))
 				.replaceAll("#col_name", dqRuleVo.getColName())
-				.replaceAll("#start_time", "'" + dqRuleVo.getStartTime() + "'")
-				.replaceAll("#end_time", "'" + DateUtils.getTodayZeroTimeStr() + "'")
 				.replaceAll("#check_db_name", dqRuleVo.getCheckDbName())
 				.replaceAll("#check_tb_name", dqRuleVo.getCheckTbName())
 				.replaceAll("#check_col_name", dqRuleVo.getCheckColName())

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

@@ -19,7 +19,6 @@ public class FormatServiceImpl implements FormatService {
 			Pattern p = Pattern.compile("\\s{1,}|\t|\r|\n");
 			Matcher m = p.matcher(str);
 			dest = m.replaceAll(" ");
-			
 		}
 		return dest;
 	}

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

@@ -109,8 +109,9 @@ public class MonitorServiceImpl implements MonitorService {
 			String sql = tblCheckSql.getSqlContent();
 			Integer id = tblCheckSql.getId();
 			Double threshold = tblCheckSql.getThreshold();
+			String startTime = tblCheckSql.getStartTime();
 			int rs = 0;
-			TblResultMonitorSpecial tblResultMonitorSpecial = getMonitorSpecialResult(sql);
+			TblResultMonitorSpecial tblResultMonitorSpecial = getMonitorSpecialResult(sql,startTime);
 			if (tblResultMonitorSpecial == null) {
 				logger.error("Find result is empty!");
 				continue;
@@ -173,8 +174,10 @@ public class MonitorServiceImpl implements MonitorService {
 	 * @param sql
 	 * @return
 	 */
-	private TblResultMonitorSpecial getMonitorSpecialResult(String sql) {
-		sql = sql.replaceAll("#partition_date", String.format("'%s'", DateUtils.getYesterdayDateStr()));
+	private TblResultMonitorSpecial getMonitorSpecialResult(String sql,String startTime) {
+		sql = sql.replaceAll("#partition_date", String.format("'%s'", DateUtils.getYesterdayDateStr()))
+				 .replaceAll("#start_time", "'" + DateUtils.getZeroTimeStrsMap().get(startTime) + "'")
+				 .replaceAll("#end_time", "'" + DateUtils.getTodayZeroTimeStr() + "'");
 		logger.info("Sql content : {}", sql);
 		TblResultMonitorSpecial tblResultMonitorSpecial = null;
 		if (StringUtils.isBlank(sql)) {

src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
\ No newline at end of file
+    active: prod
\ No newline at end of file