场景测试包个人私有唯一

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -62,19 +62,20 @@ public class ScenePackageController {
         if (CollectionUtil.isEmpty(params)) {  // 参数错误
             result = new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数不能为空，请检查");
         }
-        String packageId = params.get(0).getId();
-        int packageLevel = params.get(0).getPackageLevel();
+        ScenePackageSublistVO scenePackageSublistVO = params.get(0);
+        String packageId = scenePackageSublistVO.getId();
+        int packageLevel = scenePackageSublistVO.getPackageLevel();
         if ("1".equals(packageId)) {
             log.info("saveScenePackage() 新增场景测试包（传 id 为 1）");
             params.get(0).setId("");
-            result = scenePackageService.saveScenePackage(params, params.get(0).getPackageLevel());
+            result = scenePackageService.saveScenePackage(scenePackageSublistVO, params.get(0).getPackageLevel());
         } else if (0 == packageLevel) {
             log.info("saveScenePackage() 修改保存");
             result = scenePackageService.updateScenePackage(params);
         } else if (1 == packageLevel) {
             log.info("saveScenePackage() 私有另存为成私有 或 公有另存为成私有");
             params.get(0).setId("");
-            result = scenePackageService.saveScenePackage(params, params.get(0).getPackageLevel());
+            result = scenePackageService.saveScenePackage(scenePackageSublistVO, params.get(0).getPackageLevel());
         }
         return result;
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -47,21 +47,22 @@ public class ScenePackageService {
      * 测试包数据录入大保存：
      */
     @SneakyThrows
-    public ResponseBodyVO<String> saveScenePackage(List<ScenePackageSublistVO> params, Integer isLcw) {
+    public ResponseBodyVO<String> saveScenePackage(ScenePackageSublistVO scenePackageSublistVO, Integer isLcw) {
         List<ScenePackageSublistVO> listSublistTree = new ArrayList<>();
         ScenePackagePO po = new ScenePackagePO();
-        for (ScenePackageSublistVO vo : params) {
-            // 查询个人私有唯一
-            ScenePackageNewVO scenePackageNewVO = scenePackageMapper.querySelfOnly(vo.getSublistName(), AuthUtil.getCurrentUserId());
-            if (ObjectUtil.isNotNull(scenePackageNewVO)) {
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "私有测试包 " + po.getPackageName() + " 已存在，请重新命名。");
-            }
-            po.setWeight(vo.getWeight());
-            po.setRemarks(vo.getRemarks());
-            po.setSceneNum(vo.getSceneNum());
-            po.setTreeNode(vo.getTreeNode());
-            listSublistTree = vo.getChildren();
+        po.setPackageName(scenePackageSublistVO.getSublistName());
+        po.setCreateUserId(AuthUtil.getCurrentUserId());
+        po.setShare("0");
+        // 查询个人私有唯一
+        ScenePackageNewVO scenePackageNewVO = scenePackageMapper.querySelfOnly(scenePackageSublistVO.getSublistName(), AuthUtil.getCurrentUserId());
+        if (ObjectUtil.isNotNull(scenePackageNewVO)) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "私有测试包 " + po.getPackageName() + " 已存在，请重新命名。");
         }
+        po.setWeight(scenePackageSublistVO.getWeight());
+        po.setRemarks(scenePackageSublistVO.getRemarks());
+        po.setSceneNum(scenePackageSublistVO.getSceneNum());
+        po.setTreeNode(scenePackageSublistVO.getTreeNode());
+        listSublistTree = scenePackageSublistVO.getChildren();
         po.setCreateTime(TimeUtil.getNowForMysql());
         po.setModifyTime(TimeUtil.getNowForMysql());
         po.setPackageCode(StringUtil.getRandomCode());
@@ -584,7 +585,7 @@ public class ScenePackageService {
 
     //查询个人测试包数量
     @SneakyThrows
-    public Map<String,Integer> queryPackageCount() {
+    public Map<String, Integer> queryPackageCount() {
         ScenePackagePO params = new ScenePackagePO();
         params.setCreateUserId(AuthUtil.getCurrentUserId());
         params.setShare("0");