[monitor] 完成查询监控类型的参数结构,新增和查询监控接口编码

collector/server/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java

@@ -96,7 +96,7 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
      * @param collectData 采集数据
      */
     private void calculateFields(Metrics metrics, CollectRep.MetricsData.Builder collectData) {
-        collectData.addAllFields(metrics.getFields());
+        collectData.addAllFields(metrics.getFields().stream().map(Metrics.Field::getField).collect(Collectors.toSet()));
         // 若不存在需要计算的表达式,则 别名指标aliasFields 的数据就是真正指标 fields的数据
         if (metrics.getCalculates() == null || metrics.getCalculates().isEmpty()) {
             return;
@@ -116,7 +116,7 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
                     return new Object[]{field, expression}; })
                 .collect(Collectors.toMap(arr -> (String)arr[0], arr -> (Expression) arr[1]));
 
-        List<String> fields = metrics.getFields();
+        List<Metrics.Field> fields = metrics.getFields();
         List<String> aliasFields = metrics.getAliasFields();
         Map<String, Object> aliasFieldValueMap = new HashMap<>(16);
         for (int index = 0; index < aliasRowList.size(); index++) {
@@ -127,7 +127,7 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
             ProtocolStringList columnList = aliasRow.getColumnsList();
             columnList.clear();
             for (int realIndex = 0; realIndex < fields.size(); realIndex++) {
-                String realField = fields.get(realIndex);
+                String realField = fields.get(realIndex).getField();
                 Expression expression = fieldExpressionMap.get(realField);
                 String value = "";
                 if (expression != null) {

collector/server/src/main/resources/application.yml

@@ -5,6 +5,8 @@ spring:
     name: ${HOSTNAME:@collecor@}${PID}
   profiles:
     active: dev
+  jackson:
+    default-property-inclusion: NON_EMPTY
 collector:
   dispatch:
     entrance: