Merge branch 'auto'

src/main/java/cn/qg/holmes/controller/auto/SceneTestcaseController.java

 package cn.qg.holmes.controller.auto;
 
 import cn.qg.holmes.common.JsonResult;
+import cn.qg.holmes.entity.auto.AutoModule;
+import cn.qg.holmes.entity.auto.Interface;
 import cn.qg.holmes.entity.auto.SceneTestcase;
+import cn.qg.holmes.entity.auto.SceneTestcaseUpdateVo;
+import cn.qg.holmes.service.auto.AutoModuleService;
+import cn.qg.holmes.service.auto.InterfaceService;
 import cn.qg.holmes.service.auto.SceneTestcaseService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,6 +25,12 @@ public class SceneTestcaseController {
     @Autowired
     SceneTestcaseService sceneTestcaseService;
 
+    @Autowired
+    InterfaceService interfaceService;
+
+    @Autowired
+    AutoModuleService autoModuleService;
+
     /**
      * 获取场景用例列表
      * @param sceneId 场景id
@@ -31,6 +42,11 @@ public class SceneTestcaseController {
             return JsonResult.buildErrorStateResult("请传入场景id", false);
         }
         List<SceneTestcase> sceneTestcaseList = sceneTestcaseService.getSceneTestcaseListBySceneId(sceneId);
+        for (SceneTestcase sceneTestcase: sceneTestcaseList) {
+            Interface anInterface = interfaceService.getById(sceneTestcase.getInterfaceId());
+            sceneTestcase.setInterfaceName(anInterface.getName());
+            sceneTestcase.setModuleName(autoModuleService.getById(anInterface.getModuleId()).getName());
+        }
         return JsonResult.buildSuccessResult(sceneTestcaseList);
     }
 
@@ -75,6 +91,36 @@ public class SceneTestcaseController {
         return JsonResult.buildSuccessResult(sceneTestcaseService.updateBatchById(sceneTestcaseList));
     }
 
+    /**
+     * 新增或批量修改场景用例列表
+     * @param sceneTestcaseUpdateVo 场景用例列表
+     * @return
+     */
+    @PostMapping("/saveOrUpdate")
+    public JsonResult saveOrUpdateSceneTestcaseList(@RequestBody SceneTestcaseUpdateVo sceneTestcaseUpdateVo) {
+        List<SceneTestcase> sceneTestcaseList = sceneTestcaseUpdateVo.getSceneTestcaseList();
+        Integer sceneId = sceneTestcaseUpdateVo.getSceneId();
+        List<SceneTestcase> sceneTestcaseListInDB = sceneTestcaseService.getSceneTestcaseListBySceneId(sceneId);
+        if (sceneTestcaseListInDB.size() > 0) {
+            for (SceneTestcase sceneTestcaseInDB: sceneTestcaseListInDB) {
+                Integer DBId = sceneTestcaseInDB.getId();
+                boolean flag = false;
+                for (SceneTestcase sceneTestcase: sceneTestcaseList) {
+                    if (sceneTestcase.getId().equals(DBId)) {
+                        flag = true;
+                    }
+                }
+                if (!flag) {
+                    sceneTestcaseService.removeById(sceneTestcaseInDB.getId());
+                }
+            }
+        }
+        if (sceneTestcaseList.size() > 0) {
+            return JsonResult.buildSuccessResult(sceneTestcaseService.saveOrUpdateBatch(sceneTestcaseList));
+        }
+        return JsonResult.buildSuccessResult(true);
+    }
+
     /**
      * 删除单个场景用例
      * @param sceneTestcaseId 单个场景用例id

src/main/java/cn/qg/holmes/entity/auto/SceneTestcaseUpdateVo.java

+package cn.qg.holmes.entity.auto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SceneTestcaseUpdateVo {
+    Integer sceneId;
+    List<SceneTestcase> sceneTestcaseList;
+}

src/main/resources/application.yml

@@ -26,4 +26,9 @@ mybatis-plus:
   mapper-locations: classpath:mapper/*/*.xml
   type-aliases-package: cn.qg.holmes.entity
   configuration:
-    map-underscore-to-camel-case: true
+    map-underscore-to-camel-case: true
\ No newline at end of file
+
+spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
\ No newline at end of file