[collector]采集器支持mysql协议指标采集

common/src/main/java/com/usthe/common/entity/dto/Field.java

@@ -29,6 +29,6 @@ public class Field {
     private String unit;
 
     @ApiModelProperty(value = "是否是实例字段", position = 3)
-    private boolean instance;
+    private Boolean instance;
 
 }

common/src/main/java/com/usthe/common/entity/dto/Message.java

@@ -49,6 +49,11 @@ public class Message<T> {
         this.msg = msg;
     }
 
+    public Message(byte code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
     public Message(T data) {
         this.data = data;
     }

common/src/main/java/com/usthe/common/entity/dto/MetricsHistoryData.java

@@ -0,0 +1,39 @@
+package com.usthe.common.entity.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 历史单指标数据
+ * @author tom
+ * @date 2022/1/21 09:58
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(description = "历史单指标数据")
+public class MetricsHistoryData {
+
+    @ApiModelProperty(value = "监控ID", position = 0)
+    private Long id;
+
+    @ApiModelProperty(value = "监控类型", position = 1)
+    private String app;
+
+    @ApiModelProperty(value = "监控指标组", position = 2)
+    private String metric;
+
+    @ApiModelProperty(value = "监控指标", position = 4)
+    private Field field;
+
+    @ApiModelProperty(value = "监控指标历史值 instance<==>values", position = 5)
+    private Map<String, List<Value>> values;
+}

common/src/main/java/com/usthe/common/entity/dto/Value.java

@@ -23,18 +23,26 @@ public class Value {
         this.origin = origin;
     }
 
+    public Value(String origin, long time) {
+        this.origin = origin;
+        this.time = time;
+    }
+
     @ApiModelProperty(value = "原始值", position = 0)
     private String origin;
 
     @ApiModelProperty(value = "平均值", position = 1)
     private String mean;
 
-    @ApiModelProperty(value = "中位数值", position = 0)
+    @ApiModelProperty(value = "中位数值,暂不支持", position = 2)
     private String median;
 
-    @ApiModelProperty(value = "最小值", position = 0)
+    @ApiModelProperty(value = "最小值", position = 3)
     private String min;
 
-    @ApiModelProperty(value = "最大值", position = 0)
+    @ApiModelProperty(value = "最大值", position = 4)
     private String max;
+
+    @ApiModelProperty(value = "数据采集时间,此字段查历史数据时有效", position = 5)
+    private Long time;
 }

common/src/main/java/com/usthe/common/entity/job/protocol/JdbcProtocol.java

@@ -22,7 +22,7 @@ public class JdbcProtocol {
     /**
      * 端口号
      */
-    private Integer port;
+    private String port;
     /**
      * 数据库用户名(可选)
      */
@@ -32,7 +32,23 @@ public class JdbcProtocol {
      */
     private String password;
     /**
-     * 数据库链接url eg: jdbc:mysql://localhost:3306
+     * 数据库
+     */
+    private String database;
+    /**
+     * 数据库类型 mysql oracle ...
+     */
+    private String platform;
+    /**
+     * SQL查询方式： oneRow, multiRow, columns
+     */
+    private String queryType;
+    /**
+     * sql
+     */
+    private String sql;
+    /**
+     * 数据库链接url eg: jdbc:mysql://localhost:3306/usthe
      */
     private String url;
 }