From f3186c5a2673c316ec685726652bf54b3aa629ed Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Mon, 6 Dec 2021 00:41:12 +0800
Subject: [PATCH] =?UTF-8?q?[manager]=20=E6=9F=A5=E8=AF=A2=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9Emetrics=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/usthe/manager/pojo/dto/MonitorDto.java  | 8 +++++++-
 .../usthe/manager/service/impl/MonitorServiceImpl.java    | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java b/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java
index 58803a9..45ba02c 100644
--- a/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java
+++ b/manager/src/main/java/com/usthe/manager/pojo/dto/MonitorDto.java
@@ -10,6 +10,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
+import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_ONLY;
 import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 
 /**
@@ -37,9 +38,14 @@ public class MonitorDto {
     @Valid
     private List<Param> params;
 
+    @ApiModelProperty(value = "指标组列表", accessMode = READ_ONLY, position = 2)
+    @NotNull
+    @Valid
+    private List<String> metrics;
+
     /**
      * 是否探测
      */
-    @ApiModelProperty(value = "是否进行探测", accessMode = READ_WRITE, position = 2)
+    @ApiModelProperty(value = "是否进行探测", accessMode = READ_WRITE, position = 3)
     private boolean detected;
 }
diff --git a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
index 733da49..cc08610 100644
--- a/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
+++ b/manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
@@ -2,6 +2,7 @@ package com.usthe.manager.service.impl;
 
 import com.usthe.common.entity.job.Configmap;
 import com.usthe.common.entity.job.Job;
+import com.usthe.common.entity.job.Metrics;
 import com.usthe.common.entity.message.CollectRep;
 import com.usthe.common.util.AesUtil;
 import com.usthe.common.util.CommonConstants;
@@ -275,10 +276,14 @@ public class MonitorServiceImpl implements MonitorService {
     public MonitorDto getMonitor(long id) throws RuntimeException {
         Optional<Monitor> monitorOptional = monitorDao.findById(id);
         if (monitorOptional.isPresent()) {
+            Monitor monitor = monitorOptional.get();
             MonitorDto monitorDto = new MonitorDto();
-            monitorDto.setMonitor(monitorOptional.get());
+            monitorDto.setMonitor(monitor);
             List<Param> params = paramDao.findParamsByMonitorId(id);
             monitorDto.setParams(params);
+            Job job = appService.getAppDefine(monitor.getApp());
+            List<String> metrics = job.getMetrics().stream().map(Metrics::getName).collect(Collectors.toList());
+            monitorDto.setMetrics(metrics);
             return monitorDto;
         } else {
             return null;