From 4e92b5415301a791283db433501d1ebc2dd4933d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 29 Mar 2023 13:39:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A5=E5=8F=A3=E5=AF=BC=E5=85=A5=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E5=86=85=E5=AE=B9=E5=8F=98=E5=8C=96=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E5=8F=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024797 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001024797
---
 .../ApiDefinitionImportUtilService.java          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java
index f738e8a156..1188e7c3f2 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java
@@ -267,7 +267,7 @@ public class ApiDefinitionImportUtilService {
             if (item.getVersionId() == null || (!item.getVersionId().equals("new") && !item.getVersionId().equals("update"))) {
                 item.setNum(num++);
             }
-            //如果EsbData需要存储,则需要进行接口是否更新的判断
+
             ApiDefinitionImportParamDTO apiDefinitionImportParam = new ApiDefinitionImportParamDTO(item, request, apiImport.getMocks(), toUpdateList, caseList);
             apiDefinitionImportParam.setRepeatList(sameRefIds);
             ApiImportSendNoticeDTO apiImportSendNoticeDTO = importCreate(batchMapper, apiDefinitionImportParam);
@@ -754,17 +754,13 @@ public class ApiDefinitionImportUtilService {
         if (CollectionUtils.isEmpty(repeatList)) {
             return;
         }
-        if (apiDefinition.getLatest()) {
-            for (ApiDefinitionWithBLOBs apiDefinitionWithBLOBs : repeatList) {
-                if (apiDefinitionWithBLOBs.getLatest() && !apiDefinition.getId().equalsIgnoreCase(apiDefinitionWithBLOBs.getId())) {
+        for (ApiDefinitionWithBLOBs apiDefinitionWithBLOBs : repeatList) {
+            if (!apiDefinition.getId().equalsIgnoreCase(apiDefinitionWithBLOBs.getId())) {
+                if (apiDefinition.getLatest() && apiDefinitionWithBLOBs.getLatest()) {
                     apiDefinitionWithBLOBs.setLatest(false);
                 }
                 batchMapper.updateByPrimaryKey(apiDefinitionWithBLOBs);
             }
-        } else {
-            for (ApiDefinitionWithBLOBs apiDefinitionWithBLOBs : repeatList) {
-                batchMapper.updateByPrimaryKey(apiDefinitionWithBLOBs);
-            }
         }
     }
 
@@ -947,7 +943,9 @@ public class ApiDefinitionImportUtilService {
                                    Map<String, ApiDefinitionWithBLOBs> methodPathMap, Map<String, List<ApiDefinitionWithBLOBs>> repeatDataMap,
                                    String updateVersionId, List<ApiTestCaseWithBLOBs> optionDataCases,
                                    Map<String, List<ApiTestCaseWithBLOBs>> oldCaseMap) {
+        //要去覆盖接口的集合
         List<ApiDefinitionWithBLOBs> coverApiList = new ArrayList<>();
+        //记录已存在数据可以被更新的集合
         List<ApiDefinitionWithBLOBs> updateApiList = new ArrayList<>();
         repeatDataMap.forEach((k, v) -> {
             ApiDefinitionWithBLOBs apiDefinitionWithBLOBs = methodPathMap.get(k);
@@ -956,11 +954,13 @@ public class ApiDefinitionImportUtilService {
                 Map<String, List<ApiTestCaseWithBLOBs>> definitionIdCaseMAp = optionDataCases.stream().collect(Collectors.groupingBy(ApiTestCase::getApiDefinitionId));
                 Map<String, ApiTestCaseWithBLOBs> caseNameMap = getDistinctCaseNameMap(definitionIdCaseMAp, apiDefinitionWithBLOBs);
                 int i = 0;
+                //定义最新版本
                 ApiDefinitionWithBLOBs latestApi = null;
                 for (ApiDefinitionWithBLOBs definitionWithBLOBs : v) {
                     if (definitionWithBLOBs.getLatest()) {
                         latestApi = definitionWithBLOBs;
                     }
+                    //为了记录指定版本是否有数据
                     if (!definitionWithBLOBs.getVersionId().equals(updateVersionId)) {
                         i += 1;
                         continue;