refactor(系统管理): 资源池列表不显示剩余并发数了

backend/services/system-setting/src/main/java/io/metersphere/system/service/TestResourcePoolService.java

@@ -18,7 +18,6 @@ import io.metersphere.system.log.dto.LogDTO;
 import io.metersphere.system.mapper.*;
 import io.metersphere.system.uid.IDGenerator;
 import io.metersphere.system.utils.TaskRunnerClient;
-import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -30,12 +29,8 @@ import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
-import java.util.concurrent.ExecutionException;
+import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -54,8 +49,6 @@ public class TestResourcePoolService {
     @Resource
     private ExtResourcePoolMapper extResourcePoolMapper;
 
-    private final ExecutorService executor = Executors.newFixedThreadPool(5);
-
     private final static String poolControllerUrl = "http://%s:%s/metric";
 
 
@@ -135,9 +128,6 @@ public class TestResourcePoolService {
     public List<TestResourcePoolDTO> listResourcePools(QueryResourcePoolRequest request) {
         List<TestResourcePool> testResourcePools = extResourcePoolMapper.getResourcePoolList(request);
         List<TestResourcePoolDTO> testResourcePoolDTOS = new ArrayList<>();
-        Map<String, List<TestResourceNodeDTO>> nodeMap = new HashMap<>();
-        Map<String, TestResourcePoolDTO> poolDTOMap = new HashMap<>();
-        Set<String> nodeSets = new HashSet<>();
         testResourcePools.forEach(pool -> {
             TestResourcePoolBlob testResourcePoolBlob = testResourcePoolBlobMapper.selectByPrimaryKey(pool.getId());
             byte[] configuration = testResourcePoolBlob.getConfiguration();
@@ -165,58 +155,15 @@ public class TestResourcePoolService {
             }
             //获取最大并发
             if (StringUtils.equalsIgnoreCase(pool.getType(), ResourcePoolTypeEnum.NODE.getName())) {
-                nodeMap.put(pool.getId(), testResourceDTO.getNodesList());
+                int maxConcurrentNumber = 0;
-                poolDTOMap.put(pool.getId(), testResourcePoolDTO);
+                for (TestResourceNodeDTO testResourceNodeDTO : testResourceDTO.getNodesList()) {
-                if (pool.getEnable()) {
+                    maxConcurrentNumber = maxConcurrentNumber + testResourceNodeDTO.getConcurrentNumber();
-                    Set<String> nodeSet = testResourceDTO.getNodesList().stream()
-                            .map(node -> node.getIp() + ":" + node.getPort())
-                            .collect(Collectors.toSet());
-                    nodeSets.addAll(nodeSet);
                 }
+                testResourcePoolDTO.setMaxConcurrentNumber(maxConcurrentNumber);
             } else {
                 //处理k8s资源池
                 testResourcePoolDTO.setMaxConcurrentNumber(testResourceDTO.getConcurrentNumber());
-                testResourcePoolDTOS.add(testResourcePoolDTO);
             }
-        });
-        //处理node资源池
-        Map<String, Integer> lastConcurrentNumberMap = new HashMap<>();
-
-        List<Future<Map<String, Integer>>> futures = new ArrayList<>();
-        for (String nodeSet : nodeSets) {
-            futures.add(executor.submit(() -> {
-                String[] split = nodeSet.split(":");
-                ResourcePoolNodeMetric nodeMetric = getNodeMetric(split[0], split[1]);
-                Map<String, Integer> resultMap = new HashMap<>();
-                if (nodeMetric != null) {
-                    resultMap.put(nodeSet, nodeMetric.getConcurrentNumber() - nodeMetric.getOccupiedConcurrentNumber());
-                }
-                return resultMap;
-            }));
-        }
-
-        for (Future<Map<String, Integer>> future : futures) {
-            try {
-                lastConcurrentNumberMap.putAll(future.get());
-            } catch (InterruptedException | ExecutionException e) {
-                // 处理异常
-                LogUtils.error("获取剩余并发数失败：" + e);
-            }
-        }
-        nodeMap.forEach((poolId, nodeList) -> {
-            int lastConcurrentNumber = 0;
-            int maxConcurrentNumber = 0;
-            for (TestResourceNodeDTO testResourceNodeDTO : nodeList) {
-                if (lastConcurrentNumberMap.get(testResourceNodeDTO.getIp() + ":" + testResourceNodeDTO.getPort()) != null) {
-                    lastConcurrentNumber = lastConcurrentNumber + lastConcurrentNumberMap.get(testResourceNodeDTO.getIp() + ":" + testResourceNodeDTO.getPort());
-                }
-                maxConcurrentNumber = maxConcurrentNumber + testResourceNodeDTO.getConcurrentNumber();
-            }
-            TestResourcePoolDTO testResourcePoolDTO = poolDTOMap.get(poolId);
-            if (testResourcePoolDTO.getEnable()) {
-                testResourcePoolDTO.setLastConcurrentNumber(lastConcurrentNumber);
-            }
-            testResourcePoolDTO.setMaxConcurrentNumber(maxConcurrentNumber);
             testResourcePoolDTOS.add(testResourcePoolDTO);
         });
 
@@ -356,9 +303,4 @@ public class TestResourcePoolService {
         }
         return getNodeMetric(request.getIp(), request.getPort());
     }
-
-    @PreDestroy
-    public void shutdownExecutor() {
-        executor.shutdown();
-    }
 }