Merge branch 'master' of github.com:metersphere/metersphere

backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java

@@ -5,6 +5,7 @@ import io.metersphere.api.service.*;
 import io.metersphere.base.domain.ApiDefinitionExecResult;
 import io.metersphere.base.domain.ApiScenarioReport;
 import io.metersphere.base.domain.ApiTestReport;
+import io.metersphere.base.domain.TestPlanReport;
 import io.metersphere.commons.constants.*;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
@@ -14,6 +15,7 @@ import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.SystemParameterService;
 import io.metersphere.track.service.TestPlanReportService;
+import io.metersphere.track.service.TestPlanService;
 import io.metersphere.track.service.TestPlanTestCaseService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java

@@ -403,17 +403,24 @@ public class ApiDefinitionService {
 
     private void importMsCase(ApiDefinitionImport apiImport, SqlSession sqlSession, ApiTestCaseMapper apiTestCaseMapper) {
         List<ApiTestCaseWithBLOBs> cases = apiImport.getCases();
+        List<String> caseNames = apiTestCaseService.listPorjectAllCaseName(SessionUtils.getCurrentProjectId());
+        Set<String> existCaseName = new HashSet<>();
+        caseNames.forEach(item -> {
+            existCaseName.add(item);
+        });
         if (CollectionUtils.isNotEmpty(cases)) {
             int batchCount = 0;
             cases.forEach(item -> {
-                item.setId(UUID.randomUUID().toString());
+                if(!existCaseName.contains(item.getName())) {
-                item.setCreateTime(System.currentTimeMillis());
+                    item.setId(UUID.randomUUID().toString());
-                item.setUpdateTime(System.currentTimeMillis());
+                    item.setCreateTime(System.currentTimeMillis());
-                item.setCreateUserId(SessionUtils.getUserId());
+                    item.setUpdateTime(System.currentTimeMillis());
-                item.setUpdateUserId(SessionUtils.getUserId());
+                    item.setCreateUserId(SessionUtils.getUserId());
-                item.setProjectId(SessionUtils.getCurrentProjectId());
+                    item.setUpdateUserId(SessionUtils.getUserId());
-                item.setNum(getNextNum(item.getApiDefinitionId()));
+                    item.setProjectId(SessionUtils.getCurrentProjectId());
-                apiTestCaseMapper.insert(item);
+                    item.setNum(getNextNum(item.getApiDefinitionId()));
+                    apiTestCaseMapper.insert(item);
+                }
             });
             if (batchCount % 300 == 0) {
                 sqlSession.flushStatements();
@@ -628,12 +635,7 @@ public class ApiDefinitionService {
         }
 
         if (!CollectionUtils.isEmpty(apiImport.getCases())) {
-            for (int i = 0; i < apiImport.getCases().size(); i++) {
+            importMsCase(apiImport, sqlSession, apiTestCaseMapper);
-                importMsCase(apiImport, sqlSession, apiTestCaseMapper);
-                if (i % 300 == 0) {
-                    sqlSession.flushStatements();
-                }
-            }
         }
         sqlSession.flushStatements();
     }

backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java

@@ -80,6 +80,10 @@ public class ApiTestCaseService {
 
     private static final String BODY_FILE_DIR = FileUtils.BODY_FILE_DIR;
 
+    public List<String> listPorjectAllCaseName(String projectId) {
+        return extApiTestCaseMapper.listPorjectAllCaseName(projectId);
+    }
+
     public List<ApiTestCaseResult> list(ApiTestCaseRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         List<ApiTestCaseResult> returnList = extApiTestCaseMapper.list(request);

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java

@@ -12,6 +12,8 @@ import java.util.List;
 
 public interface ExtApiTestCaseMapper {
 
+    List<String> listPorjectAllCaseName(@Param("projectId") String projectId);
+
     List<ApiTestCaseResult> list(@Param("request") ApiTestCaseRequest request);
 
     List<ApiTestCaseDTO> listSimple(@Param("request") ApiTestCaseRequest request);

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml

@@ -391,6 +391,8 @@
     <select id="getNextNum" resultType="io.metersphere.base.domain.ApiTestCase">
         SELECT * FROM api_test_case WHERE api_test_case.api_definition_id = #{definitionId} ORDER BY num DESC LIMIT 1;
     </select>
-
+    <select id="listPorjectAllCaseName" resultType="java.lang.String">
+        select name from api_test_case where project_id = #{projectId}
+    </select>
 
 </mapper>

frontend/src/business/components/track/plan/components/TestPlanList.vue

@@ -86,7 +86,7 @@
           show-overflow-tooltip
           :key="index">
           <template v-slot:default="scope">
-            <el-progress :percentage="scope.row.passRate.substring(0, scope.row.passRate.length-1)"></el-progress>
+            <el-progress :percentage="calPassRate(scope)"></el-progress>
           </template>
         </el-table-column>
         <el-table-column
@@ -293,6 +293,10 @@ export default {
     this.initTableData();
   },
   methods: {
+    calPassRate(scope) {
+      let passRate = scope.row.passRate.substring(0, scope.row.passRate.length-1);
+      return Number.parseInt(passRate, 10);
+    },
     customHeader() {
       this.$refs.headerCustom.open(this.tableLabel)
     },