Commit 01bc8030 authored by 赵建伟's avatar 赵建伟

update codes

parent ff008571
...@@ -29,7 +29,7 @@ public class DqReferRuleDto extends BaseRowModel{ ...@@ -29,7 +29,7 @@ public class DqReferRuleDto extends BaseRowModel{
private String referColName; private String referColName;
@ExcelProperty(value = "参照表过滤条件",index = 10) @ExcelProperty(value = "参照表过滤条件",index = 10)
private String referFilters; private String referFilters;
@ExcelProperty(value = "阈值",index = 11) @ExcelProperty(value = "预警阈值",index = 11)
private Double threshold; private Double threshold;
@ExcelProperty(value = "备注", index = 12) @ExcelProperty(value = "备注", index = 12)
private String comment; private String comment;
......
...@@ -27,7 +27,7 @@ public class DqSpecialRuleDto extends BaseRowModel { ...@@ -27,7 +27,7 @@ public class DqSpecialRuleDto extends BaseRowModel {
private String startTime; private String startTime;
@ExcelProperty(value = "过滤条件", index = 9) @ExcelProperty(value = "过滤条件", index = 9)
private String filters; private String filters;
@ExcelProperty(value = "阈值",index = 10) @ExcelProperty(value = "预警阈值",index = 10)
private Double threshold; private Double threshold;
@ExcelProperty(value = "备注", index = 11) @ExcelProperty(value = "备注", index = 11)
private String comment; private String comment;
......
...@@ -21,7 +21,7 @@ public class DqUnblankRuleDto extends BaseRowModel{ ...@@ -21,7 +21,7 @@ public class DqUnblankRuleDto extends BaseRowModel{
private String colName; private String colName;
@ExcelProperty(value = "过滤条件", index = 6) @ExcelProperty(value = "过滤条件", index = 6)
private String filters; private String filters;
@ExcelProperty(value = "阈值",index = 7) @ExcelProperty(value = "预警阈值",index = 7)
private Double threshold; private Double threshold;
@ExcelProperty(value = "备注", index = 8) @ExcelProperty(value = "备注", index = 8)
private String comment; private String comment;
......
...@@ -21,7 +21,7 @@ public class DqUniqueRuleDto extends BaseRowModel{ ...@@ -21,7 +21,7 @@ public class DqUniqueRuleDto extends BaseRowModel{
private String colName; private String colName;
@ExcelProperty(value = "过滤条件", index = 6) @ExcelProperty(value = "过滤条件", index = 6)
private String filters; private String filters;
@ExcelProperty(value = "阈值",index = 7) @ExcelProperty(value = "预警阈值",index = 7)
private Double threshold; private Double threshold;
@ExcelProperty(value = "备注", index = 8) @ExcelProperty(value = "备注", index = 8)
private String comment; private String comment;
......
...@@ -23,7 +23,7 @@ public class DqVolatilityRuleDto extends BaseRowModel{ ...@@ -23,7 +23,7 @@ public class DqVolatilityRuleDto extends BaseRowModel{
private String indicatorType; private String indicatorType;
@ExcelProperty(value = "过滤条件", index = 7) @ExcelProperty(value = "过滤条件", index = 7)
private String filters; private String filters;
@ExcelProperty(value = "阈值",index = 8) @ExcelProperty(value = "预警阈值",index = 8)
private Double threshold; private Double threshold;
@ExcelProperty(value = "备注", index = 9) @ExcelProperty(value = "备注", index = 9)
private String comment; private String comment;
......
...@@ -10,11 +10,13 @@ import org.apache.http.util.EntityUtils; ...@@ -10,11 +10,13 @@ import org.apache.http.util.EntityUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gmei.data.dqmp.service.DingdingService; import com.gmei.data.dqmp.service.DingdingService;
@Service
public class DingdingServiceImpl implements DingdingService { public class DingdingServiceImpl implements DingdingService {
@Value("${dingding.webhookToken}") @Value("${dingding.webhookToken}")
......
package com.gmei.data.dqmp.vo; package com.gmei.data.dqmp.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
......
...@@ -13,7 +13,7 @@ public class DqRuleVo extends BaseVo{ ...@@ -13,7 +13,7 @@ public class DqRuleVo extends BaseVo{
private String checkTime; private String checkTime;
@NotBlank(message = "校验规则备注") @NotBlank(message = "校验规则备注")
private String comment; private String comment;
@NotBlank(message = "阈值不能为空") @NotBlank(message = "预警阈值不能为空")
private Double threshold; private Double threshold;
//simple //simple
...@@ -159,6 +159,14 @@ public class DqRuleVo extends BaseVo{ ...@@ -159,6 +159,14 @@ public class DqRuleVo extends BaseVo{
public void setReferFilters(String referFilters) { public void setReferFilters(String referFilters) {
this.referFilters = referFilters; this.referFilters = referFilters;
} }
public Double getThreshold() {
return threshold;
}
public void setThreshold(Double threshold) {
this.threshold = threshold;
}
public String getComment() { public String getComment() {
return comment; return comment;
} }
...@@ -178,10 +186,11 @@ public class DqRuleVo extends BaseVo{ ...@@ -178,10 +186,11 @@ public class DqRuleVo extends BaseVo{
@Override @Override
public String toString() { public String toString() {
return "DqRuleVo [checkType=" + checkType + ", isValid=" + isValid + ", checkTime=" + checkTime + ", comment=" return "DqRuleVo [checkType=" + checkType + ", isValid=" + isValid + ", checkTime=" + checkTime + ", comment="
+ comment + ", dbName=" + dbName + ", tbName=" + tbName + ", colName=" + colName + ", timeColName=" + comment + ", threshold=" + threshold + ", dbName=" + dbName + ", tbName=" + tbName + ", colName="
+ timeColName + ", filters=" + filters + ", indicatorType=" + indicatorType + ", startTime=" + startTime + colName + ", timeColName=" + timeColName + ", filters=" + filters + ", indicatorType=" + indicatorType
+ ", checkDbName=" + checkDbName + ", checkTbName=" + checkTbName + ", checkColName=" + checkColName + ", startTime=" + startTime + ", checkDbName=" + checkDbName + ", checkTbName=" + checkTbName
+ ", referDbName=" + referDbName + ", referTbName=" + referTbName + ", referColName=" + referColName + ", checkColName=" + checkColName + ", referDbName=" + referDbName + ", referTbName=" + referTbName
+ ", checkFilters=" + checkFilters + ", referFilters=" + referFilters + "]"; + ", referColName=" + referColName + ", checkFilters=" + checkFilters + ", referFilters=" + referFilters
+ ", id=" + id + "]";
} }
} }
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<title>WT</title> <title>数据质量管理平台</title>
</head> </head>
<style type="text/css"> <style type="text/css">
.table { .table {
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<th>数据表名</th> <th>数据表名</th>
<th>数据列名</th> <th>数据列名</th>
<th>过滤条件</th> <th>过滤条件</th>
<th>预警阈值</th>
<th>当前状态</th> <th>当前状态</th>
<th>校验时间</th> <th>校验时间</th>
<th>备注</th> <th>备注</th>
...@@ -66,6 +67,7 @@ ...@@ -66,6 +67,7 @@
<td th:text="${dqRule.tbName}"></td> <td th:text="${dqRule.tbName}"></td>
<th th:text="${dqRule.colName}"></th> <th th:text="${dqRule.colName}"></th>
<th th:text="${dqRule.filters}"></th> <th th:text="${dqRule.filters}"></th>
<th th:text="${dqRule.threshold}"></th>
<th th:text="${dqRule.status}"></th> <th th:text="${dqRule.status}"></th>
<th th:text="${dqRule.checkTime}"></th> <th th:text="${dqRule.checkTime}"></th>
<th th:text="${dqRule.comment}"></th> <th th:text="${dqRule.comment}"></th>
...@@ -83,6 +85,7 @@ ...@@ -83,6 +85,7 @@
<th>数据表名</th> <th>数据表名</th>
<th>数据列名</th> <th>数据列名</th>
<th>过滤条件</th> <th>过滤条件</th>
<th>预警阈值</th>
<th>当前状态</th> <th>当前状态</th>
<th>校验时间</th> <th>校验时间</th>
<th>备注</th> <th>备注</th>
...@@ -95,6 +98,7 @@ ...@@ -95,6 +98,7 @@
<td th:text="${dqRule.tbName}"></td> <td th:text="${dqRule.tbName}"></td>
<th th:text="${dqRule.colName}"></th> <th th:text="${dqRule.colName}"></th>
<th th:text="${dqRule.filters}"></th> <th th:text="${dqRule.filters}"></th>
<th th:text="${dqRule.threshold}"></th>
<th th:text="${dqRule.status}"></th> <th th:text="${dqRule.status}"></th>
<th th:text="${dqRule.checkTime}"></th> <th th:text="${dqRule.checkTime}"></th>
<th th:text="${dqRule.comment}"></th> <th th:text="${dqRule.comment}"></th>
...@@ -116,6 +120,7 @@ ...@@ -116,6 +120,7 @@
<th>参照数据表名</th> <th>参照数据表名</th>
<th>参照数据列名</th> <th>参照数据列名</th>
<th>参照过滤条件</th> <th>参照过滤条件</th>
<th>预警阈值</th>
<th>当前状态</th> <th>当前状态</th>
<th>校验时间</th> <th>校验时间</th>
<th>备注</th> <th>备注</th>
...@@ -132,6 +137,7 @@ ...@@ -132,6 +137,7 @@
<td th:text="${dqRule.referTbName}"></td> <td th:text="${dqRule.referTbName}"></td>
<th th:text="${dqRule.referColName}"></th> <th th:text="${dqRule.referColName}"></th>
<th th:text="${dqRule.referFilters}"></th> <th th:text="${dqRule.referFilters}"></th>
<th th:text="${dqRule.threshold}"></th>
<th th:text="${dqRule.status}"></th> <th th:text="${dqRule.status}"></th>
<th th:text="${dqRule.checkTime}"></th> <th th:text="${dqRule.checkTime}"></th>
<th th:text="${dqRule.comment}"></th> <th th:text="${dqRule.comment}"></th>
...@@ -150,6 +156,7 @@ ...@@ -150,6 +156,7 @@
<th>数据列名</th> <th>数据列名</th>
<th>指标类型</th> <th>指标类型</th>
<th>过滤条件</th> <th>过滤条件</th>
<th>预警阈值</th>
<th>当前状态</th> <th>当前状态</th>
<th>校验时间</th> <th>校验时间</th>
<th>备注</th> <th>备注</th>
...@@ -163,6 +170,7 @@ ...@@ -163,6 +170,7 @@
<th th:text="${dqRule.colName}"></th> <th th:text="${dqRule.colName}"></th>
<th th:text="${dqRule.indicatorType}"></th> <th th:text="${dqRule.indicatorType}"></th>
<th th:text="${dqRule.filters}"></th> <th th:text="${dqRule.filters}"></th>
<th th:text="${dqRule.threshold}"></th>
<th th:text="${dqRule.status}"></th> <th th:text="${dqRule.status}"></th>
<th th:text="${dqRule.checkTime}"></th> <th th:text="${dqRule.checkTime}"></th>
<th th:text="${dqRule.comment}"></th> <th th:text="${dqRule.comment}"></th>
...@@ -183,6 +191,7 @@ ...@@ -183,6 +191,7 @@
<th>指标类型</th> <th>指标类型</th>
<th>数据校验起始时间</th> <th>数据校验起始时间</th>
<th>过滤条件</th> <th>过滤条件</th>
<th>预警阈值</th>
<th>当前状态</th> <th>当前状态</th>
<th>校验时间</th> <th>校验时间</th>
<th>备注</th> <th>备注</th>
...@@ -198,6 +207,7 @@ ...@@ -198,6 +207,7 @@
<th th:text="${dqRule.indicatorType}"></th> <th th:text="${dqRule.indicatorType}"></th>
<th th:text="${dqRule.startTime}"></th> <th th:text="${dqRule.startTime}"></th>
<th th:text="${dqRule.filters}"></th> <th th:text="${dqRule.filters}"></th>
<th th:text="${dqRule.threshold}"></th>
<th th:text="${dqRule.status}"></th> <th th:text="${dqRule.status}"></th>
<th th:text="${dqRule.checkTime}"></th> <th th:text="${dqRule.checkTime}"></th>
<th th:text="${dqRule.comment}"></th> <th th:text="${dqRule.comment}"></th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment