From 79ca2cfcc2ab542f8baece5c27223a585e76c9e4 Mon Sep 17 00:00:00 2001
From: bayuzhen <bayuzhen@beyondcent.com>
Date: Thu, 30 May 2024 16:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=A4=A7=E5=B1=8F=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=B5=84=E6=BA=90=E4=BD=BF=E7=94=A8=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ResourceScreenServiceImpl.java    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/bocloud.cos.service/src/main/java/com/bocloud/cos/service/ResourceScreenServiceImpl.java b/bocloud.cos.service/src/main/java/com/bocloud/cos/service/ResourceScreenServiceImpl.java
index 106e64f..7db4155 100644
--- a/bocloud.cos.service/src/main/java/com/bocloud/cos/service/ResourceScreenServiceImpl.java
+++ b/bocloud.cos.service/src/main/java/com/bocloud/cos/service/ResourceScreenServiceImpl.java
@@ -87,12 +87,16 @@ public class ResourceScreenServiceImpl implements ResourceScreenService {
             List<CloudServer> cloudServers = imsInternalService.listVmsByVendor(null, false, requestContext);
             //私有云平台
             List<CloudVendor> cloudVendors = imsInternalService.listCloudVendor(null);
-            Set<String> vendors =
-                    cloudVendors.stream().filter(cloudVendor -> !cloudVendor.getIsPublic())
-                            .map(CloudVendor::getType).collect(Collectors.toSet());
-            Set<Long> vendorIds =
-                    cloudVendors.stream().filter(cloudVendor -> !cloudVendor.getIsPublic())
-                            .map(CloudVendor::getId).collect(Collectors.toSet());
+            Set<String> vendors = new HashSet<>();
+            Set<Long> vendorIds = new HashSet<>();
+            List<CloudVendor> noPublicVendors = new ArrayList<>();
+            for (CloudVendor cloudVendor : cloudVendors) {
+                if (!cloudVendor.getIsPublic()) {
+                    noPublicVendors.add(cloudVendor);
+                    vendors.add(cloudVendor.getType());
+                    vendorIds.add(cloudVendor.getId());
+                }
+            }
             List<CloudServer> priServers = cloudServers.stream().filter(
                             cloudServer -> null != cloudServer.getVendorType() && vendors.contains(cloudServer.getVendorType()))
                     .collect(Collectors.toList());
@@ -116,8 +120,8 @@ public class ResourceScreenServiceImpl implements ResourceScreenService {
             hosts.removeIf(server -> null == server.getVendorId());
             Map<Long, List<com.bocloud.ims.entity.resource.Server>> hostMap = hosts.stream().filter(server -> null != server.getVendorId())
                     .collect(Collectors.groupingBy(com.bocloud.ims.entity.resource.Server::getVendorId));
-            List<CloudVendor> vmVendors = imsInternalService.listCloudVendor(VendorType.VMWARE.name());
-            for (CloudVendor vendor : vmVendors) {
+//            List<CloudVendor> vmVendors = imsInternalService.listCloudVendor(VendorType.VMWARE.name());
+            for (CloudVendor vendor : noPublicVendors) {
                 List<com.bocloud.ims.entity.resource.Server> servers = Optional.ofNullable(hostMap.get(vendor.getId())).orElse(new ArrayList<>());
                 for (com.bocloud.ims.entity.resource.Server server : servers) {
                     com.bocloud.ims.entity.resource.ServerConfig config = server.getConfig();