From d4c25c812ef5f8a15587a29ee4dd66cb30183d0e Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Wed, 31 May 2023 23:54:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(web):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=20yarn=20=E9=98=9F=E5=88=97=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=9B=86=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/forest/service/YarnClusterService.java            | 4 ++++
 .../lanyuanxiaoyao/service/web/controller/YarnController.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java
index 3017f51..6cc04c9 100644
--- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java
+++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java
@@ -60,6 +60,10 @@ public class YarnClusterService {
         return servicesMap.valuesView().toList().toImmutable();
     }
 
+    public ImmutableList<YarnService> services(ImmutableSet<String> clusters) {
+        return clusters.toList().collect(this::service).toImmutable();
+    }
+
     public ImmutableMap<String, YarnService> servicesMap() {
         return servicesMap;
     }
diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java
index 71ce288..223dddf 100644
--- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java
+++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java
@@ -109,7 +109,7 @@ public class YarnController extends BaseController {
     public AmisResponse queueList(@RequestParam("clusters") List<String> clusters, @RequestParam(value = "names", defaultValue = "") String names) {
         boolean isFilterNames = StrUtil.isNotBlank(names);
         ImmutableList<String> filterNames = Lists.immutable.of(names.split(","));
-        ImmutableList<YarnClusterVO> results = yarnClusterService.services()
+        ImmutableList<YarnClusterVO> results = yarnClusterService.services(Sets.immutable.ofAll(clusters))
                 .asParallel(EXECUTOR, 1)
                 .collect(yarnService -> {
                     YarnRootQueue cluster = yarnService.cluster();