diff --git a/common/src/main/java/com/usthe/common/entity/job/Job.java b/common/src/main/java/com/usthe/common/entity/job/Job.java index a9338a6..e4799d2 100644 --- a/common/src/main/java/com/usthe/common/entity/job/Job.java +++ b/common/src/main/java/com/usthe/common/entity/job/Job.java @@ -66,6 +66,12 @@ public class Job { */ private List configmap; + /** + * collector使用 - 任务被时间轮开始调度的时间戳 + */ + @JsonIgnore + private transient long dispatchTime; + /** * collector使用 - 任务版本,此字段不存储于etcd */ @@ -88,7 +94,7 @@ public class Job { * collector使用 - 临时存储一次性任务指标组响应数据 */ @JsonIgnore - private transient List metricsDataTemps; + private transient List responseDataTemp; /** * collector使用 - 构造初始化指标组执行视图 @@ -100,13 +106,9 @@ public class Job { if (metric.getAliasFields() == null || metric.getAliasFields().isEmpty()) { metric.setAliasFields(metric.getFields().stream().map(Metrics.Field::getField).collect(Collectors.toList())); } - // 设置默认的指标组执行优先级 + // 设置默认的指标组执行优先级,不填则默认最后优先级 if (metric.getPriority() == null) { - if (AVAILABILITY.equals(metric.getName())) { - metric.setPriority((byte)0); - } else { - metric.setPriority(Byte.MAX_VALUE); - } + metric.setPriority(Byte.MAX_VALUE); } }) .collect(Collectors.groupingBy(Metrics::getPriority)); @@ -167,9 +169,9 @@ public class Job { } public void addCollectMetricsData(CollectRep.MetricsData metricsData) { - if (metricsDataTemps == null) { - metricsDataTemps = new LinkedList<>(); + if (responseDataTemp == null) { + responseDataTemp = new LinkedList<>(); } - metricsDataTemps.add(metricsData); + responseDataTemp.add(metricsData); } } diff --git a/common/src/main/java/com/usthe/common/entity/job/Metrics.java b/common/src/main/java/com/usthe/common/entity/job/Metrics.java index 76efa3e..fce17c1 100644 --- a/common/src/main/java/com/usthe/common/entity/job/Metrics.java +++ b/common/src/main/java/com/usthe/common/entity/job/Metrics.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; +import java.util.Objects; /** * 监控采集的指标集合详情 eg: cpu | memory | health @@ -68,6 +69,23 @@ public class Metrics { */ private JdbcProtocol jdbc; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Metrics metrics = (Metrics) o; + return name.equals(metrics.name); + } + + @Override + public int hashCode() { + return Objects.hash(name); + } + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java b/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java index 56a48d2..a4ec83e 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java +++ b/manager/src/main/java/com/usthe/manager/pojo/entity/Monitor.java @@ -73,7 +73,7 @@ public class Monitor { /** * 监控状态 0:未监控,1:可用,2:不可用,3:不可达,4:挂起 */ - @ApiModelProperty(value = "监控状态 0:未监控,1:可用,2:不可用,3:不可达,4:挂起", example = "1", accessMode = READ_WRITE, position = 6) + @ApiModelProperty(value = "监控状态 0:未监控,1:可用,2:不可用,3:不可达,4:挂起", accessMode = READ_WRITE, position = 6) @Min(0) @Max(4) private byte status; diff --git a/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java b/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java index 20144dc..4d901fa 100644 --- a/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java +++ b/manager/src/main/java/com/usthe/manager/pojo/entity/Param.java @@ -62,7 +62,7 @@ public class Param { /** * 参数类型 0:数字 1:字符串 2:加密串 */ - @ApiModelProperty(value = "参数类型 0:数字 1:字符串 2:加密串", example = "0", accessMode = READ_WRITE, position = 4) + @ApiModelProperty(value = "参数类型 0:数字 1:字符串 2:加密串", accessMode = READ_WRITE, position = 4) @Min(0) @Max(2) private byte type;