feat(资源池): 增加单个任务并发数

backend/services/api-test/src/test/java/io/metersphere/api/service/RoundRobinServiceTests.java

@@ -25,10 +25,10 @@ public class RoundRobinServiceTests {
     @Order(1)
     public void testInit() throws Exception {
         List<TestResourceNodeDTO> nodes = new LinkedList<>();
-        nodes.add(new TestResourceNodeDTO("172.0.0.1", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.1", "8080", 10, 3));
-        nodes.add(new TestResourceNodeDTO("172.0.0.2", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.2", "8080", 10, 3));
-        nodes.add(new TestResourceNodeDTO("172.0.0.3", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.3", "8080", 10, 3));
-        nodes.add(new TestResourceNodeDTO("172.0.0.4", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.4", "8080", 10, 3));
 
         roundRobinService.initializeNodes("test", nodes);
     }
@@ -49,14 +49,14 @@ public class RoundRobinServiceTests {
     @Order(3)
     public void testInitAfter() throws Exception {
         List<TestResourceNodeDTO> nodes = new LinkedList<>();
-        nodes.add(new TestResourceNodeDTO("172.0.0.1", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.1", "8080", 10, 3));
-        nodes.add(new TestResourceNodeDTO("172.0.0.2", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.2", "8080", 10, 3));
-        nodes.add(new TestResourceNodeDTO("172.0.0.3", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.3", "8080", 10, 3));
         roundRobinService.initializeNodes("test", nodes);
 
-        nodes.add(new TestResourceNodeDTO("172.0.0.3", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.3", "8080", 10, 3));
-        nodes.add(new TestResourceNodeDTO("172.0.0.7", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.7", "8080", 10, 3));
-        nodes.add(new TestResourceNodeDTO("172.0.0.6", "8080", 10));
+        nodes.add(new TestResourceNodeDTO("172.0.0.6", "8080", 10, 3));
         roundRobinService.initializeNodes("test", nodes);
 
     }

backend/services/system-setting/src/main/java/io/metersphere/system/dto/pool/TestResourceNodeDTO.java

@@ -30,4 +30,10 @@ public class TestResourceNodeDTO {
     @Schema(description =  "接口测试,性能测试最大并发数")
     private Integer concurrentNumber;
 
+    /**
+     * 接口测试 性能测试 最大并发数
+     */
+    @Schema(description =  "接口测试,性能测试单个任务最大并发数，有可能为null，为null则置为3")
+    private Integer singleTaskConcurrentNumber = 3;
+
 }

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

@@ -45,6 +45,9 @@ public class NodeResourcePoolService {
                 if (testResourceNodeDTO.getConcurrentNumber() > 10) {
                     testResourceNodeDTO.setConcurrentNumber(10);
                 }
+                if (testResourceNodeDTO.getSingleTaskConcurrentNumber() > 3) {
+                    testResourceNodeDTO.setSingleTaskConcurrentNumber(3);
+                }
             }
 
             isValid = validateNode(testResourceNodeDTO);

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

@@ -204,6 +204,12 @@ public class TestResourcePoolService {
         TestResourceDTO testResourceDTO = JSON.parseObject(testResourceDTOStr, TestResourceDTO.class);
         if (CollectionUtils.isEmpty(testResourceDTO.getNodesList())) {
             testResourceDTO.setNodesList(new ArrayList<>());
+        } else {
+            for (TestResourceNodeDTO testResourceNodeDTO : testResourceDTO.getNodesList()) {
+                if (testResourceNodeDTO.getSingleTaskConcurrentNumber() == null) {
+                    testResourceNodeDTO.setSingleTaskConcurrentNumber(3);
+                }
+            }
         }
         TestResourceReturnDTO testResourceReturnDTO = new TestResourceReturnDTO();
         BeanUtils.copyBean(testResourceReturnDTO, testResourceDTO);

backend/services/system-setting/src/test/java/io/metersphere/system/controller/TestResourcePoolControllerTests.java

@@ -83,7 +83,8 @@ class TestResourcePoolControllerTests extends BaseTest {
             "       \"ip\":\"192.168.20.17\",\n" +
             "       \"port\": \"1194\",\n" +
             "       \"monitor\": \"9100\",\n" +
-            "       \"concurrentNumber\": 100\n" +
+            "       \"concurrentNumber\": \"100\",\n" +
+            "      \"singleTaskConcurrentNumber\": 3\n" +
             "   }],\n" +
             "\"ip\":\"172.2.130.1\",\n" +
             "\"token\":\"dsdfssdsvgsd\",\n" +
@@ -104,7 +105,8 @@ class TestResourcePoolControllerTests extends BaseTest {
             "      \"ip\": \"172.16.200.8\",\n" +
             "      \"port\": \"8082\",\n" +
             "      \"monitor\": \"9100\",\n" +
-            "      \"concurrentNumber\": 100\n" +
+            "      \"concurrentNumber\": \"100\",\n" +
+            "      \"singleTaskConcurrentNumber\": 3\n" +
             "    }\n" +
             "  ],\n" +
             "  \"orgIds\": [\"sys_default_organization_2\",\"sys_default_organization_3\"],\n" +
@@ -335,7 +337,7 @@ class TestResourcePoolControllerTests extends BaseTest {
         Assertions.assertTrue((CollectionUtils.isNotEmpty(testResourcePoolReturnDTO.getTestResourceReturnDTO().getOrgIdNameMap())));
 
 
-        Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getNodesList().size() > 0);
+        Assertions.assertFalse(testResourcePoolReturnDTO.getTestResourceReturnDTO().getNodesList().isEmpty());
         for (TestResourceNodeDTO testResourceNodeDTO : testResourcePoolReturnDTO.getTestResourceReturnDTO().getNodesList()) {
             Assertions.assertNotNull(testResourceNodeDTO.getIp());
             Assertions.assertNotNull(testResourceNodeDTO.getPort());