fix(接口自动化): 修复回收站恢复缺陷

backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java

@@ -59,8 +59,8 @@ public class ApiAutomationController {
     }
 
     @PostMapping("/reduction")
-    public void reduction(@RequestBody List<String> ids) {
+    public void reduction(@RequestBody List<SaveApiScenarioRequest> requests) {
-        apiAutomationService.reduction(ids);
+        apiAutomationService.reduction(requests);
     }
 
     @GetMapping("/getApiScenario/{id}")

backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java

@@ -63,8 +63,8 @@ public class ApiDefinitionController {
     }
 
     @PostMapping("/reduction")
-    public void reduction(@RequestBody List<String> ids) {
+    public void reduction(@RequestBody List<SaveApiDefinitionRequest> requests) {
-        apiDefinitionService.reduction(ids);
+        apiDefinitionService.reduction(requests);
     }
 
     @GetMapping("/get/{id}")

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

@@ -179,7 +179,12 @@ public class ApiAutomationService {
         extApiScenarioMapper.removeToGc(apiIds);
     }
 
-    public void reduction(List<String> apiIds) {
+    public void reduction(List<SaveApiScenarioRequest> requests) {
+        List<String> apiIds = new ArrayList<>();
+        requests.forEach(item->{
+            checkNameExist(item);
+            apiIds.add(item.getId());
+        });
         extApiScenarioMapper.reduction(apiIds);
     }
 

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

@@ -158,7 +158,12 @@ public class ApiDefinitionService {
         extApiDefinitionMapper.removeToGc(apiIds);
     }
 
-    public void reduction(List<String> apiIds) {
+    public void reduction(List<SaveApiDefinitionRequest> requests) {
+        List<String> apiIds = new ArrayList<>();
+        requests.forEach(item -> {
+            checkNameExist(item);
+            apiIds.add(item.getId());
+        });
         extApiDefinitionMapper.reduction(apiIds);
     }
 
@@ -386,6 +391,7 @@ public class ApiDefinitionService {
 
     /**
      * 数据统计-接口类型
+     *
      * @param projectId 项目ID
      * @return
      */
@@ -395,6 +401,7 @@ public class ApiDefinitionService {
 
     /**
      * 统计本周创建的数据总量
+     *
      * @param projectId
      * @return
      */
@@ -404,10 +411,10 @@ public class ApiDefinitionService {
         Date firstTime = startAndEndDateInWeek.get("firstTime");
         Date lastTime = startAndEndDateInWeek.get("lastTime");
 
-        if(firstTime==null || lastTime == null){
+        if (firstTime == null || lastTime == null) {
-            return  0;
+            return 0;
-        }else {
+        } else {
-            return extApiDefinitionMapper.countByProjectIDAndCreateInThisWeek(projectId,firstTime.getTime(),lastTime.getTime());
+            return extApiDefinitionMapper.countByProjectIDAndCreateInThisWeek(projectId, firstTime.getTime(), lastTime.getTime());
         }
     }
 }

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f
+Subproject commit 61397c16728a63493507679f7e0940d9099f337f

frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue

@@ -219,8 +219,9 @@
         this.$emit('edit', row);
       },
       reductionApi(row) {
-        let obj = [row.id];
+        row.scenarioDefinition = null;
-        this.$post("/api/automation/reduction", obj, response => {
+        let rows = [row];
+        this.$post("/api/automation/reduction", rows, response => {
           this.$success(this.$t('commons.save_success'));
           this.search();
         })

frontend/src/business/components/api/definition/components/list/ApiList.vue

@@ -6,10 +6,10 @@
       <el-input placeholder="搜索" @blur="search" class="search-input" size="small" v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
-        border
+                border
-        :data="tableData" row-key="id" class="test-content adjust-table"
+                :data="tableData" row-key="id" class="test-content adjust-table"
-        @select-all="handleSelectAll"
+                @select-all="handleSelectAll"
-        @select="handleSelect" :height="screenHeight">
+                @select="handleSelect" :height="screenHeight">
         <el-table-column type="selection"/>
         <el-table-column width="40" :resizable="false" align="center">
           <template v-slot:default="scope">
@@ -268,8 +268,10 @@
         this.$emit('editApi', row);
       },
       reductionApi(row) {
-        let ids = [row.id];
+        row.request = null;
-        this.$post('/api/definition/reduction/', ids, () => {
+        row.response = null;
+        let rows = [row];
+        this.$post('/api/definition/reduction/', rows, () => {
           this.$success(this.$t('commons.save_success'));
           this.search();
         });