martin

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

@@ -53,51 +53,53 @@ public class ScenePackageService {
         po.setShare("0");
         // 查询个人私有唯一
         ScenePackageNewVO scenePackageNewVO = scenePackageMapper.querySelfOnly(scenePackageSublistVO.getSublistName(), AuthUtil.getCurrentUserId());
-        Optional.ofNullable(scenePackageNewVO).orElseThrow(() -> new RuntimeException("私有测试包 " + 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());
-        String uuId = StringUtil.getRandomUUID();
-        po.setPackageId(uuId);
-        po.setIsDeleted("0");
-        po.setCreateUserId(AuthUtil.getCurrentUserId());
-
-        List<ScenePackageSublistPO> poList = new ArrayList<>();
-        List<ScenePackageSublistPO> treeList;
-        if (isLcw == 1) {
-            treeList = instShareListTreeLCW(listSublistTree, uuId, uuId, poList, "0", 1);
+        if (Objects.nonNull(scenePackageNewVO)) {
+            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());
+            String uuId = StringUtil.getRandomUUID();
+            po.setPackageId(uuId);
+            po.setIsDeleted("0");
+            po.setCreateUserId(AuthUtil.getCurrentUserId());
+            List<ScenePackageSublistPO> poList = new ArrayList<>();
+            List<ScenePackageSublistPO> treeList;
+            if (isLcw == 1) {
+                treeList = instShareListTreeLCW(listSublistTree, uuId, uuId, poList, "0", 1);
 
-        } else {
-            treeList = instShareListTree(listSublistTree, uuId, uuId, poList, "0", 1);
-        }
-        //校验指标名称唯一
-        if (treeList == null || treeList.size() < 1) {
-            new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查。");
-            return;
-        }
-        Set<String> set = new HashSet<>();
-        Map<String, String> map = new HashMap<>();
-        for (ScenePackageSublistPO vo : treeList) {
-            Object sublistName = map.get(vo.getSublistName());
-            if (ObjectUtil.isNull(sublistName)) {
-                map.put(vo.getSublistName(), vo.getSublistName());
             } else {
-                set.add(vo.getSublistName());
+                treeList = instShareListTree(listSublistTree, uuId, uuId, poList, "0", 1);
             }
+            //校验指标名称唯一
+            if (treeList == null || treeList.size() < 1) {
+                new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查。");
+                return;
+            }
+            Set<String> set = new HashSet<>();
+            Map<String, String> map = new HashMap<>();
+            for (ScenePackageSublistPO vo : treeList) {
+                Object sublistName = map.get(vo.getSublistName());
+                if (ObjectUtil.isNull(sublistName)) {
+                    map.put(vo.getSublistName(), vo.getSublistName());
+                } else {
+                    set.add(vo.getSublistName());
+                }
+            }
+            if (ObjectUtil.isNotNull(set)) {
+                new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称 " + set + "重复，请检查。");
+                return;
+            }
+            scenePackageMapper.saveScenePackage(po);
+            scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
+            LogUtil.insert();
+        } else {
+            throw new RuntimeException("私有测试包 " + po.getPackageName() + " 已存在，请重新命名。");
         }
-        if (ObjectUtil.isNotNull(set)) {
-            new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称 " + set + "重复，请检查。");
-            return;
-        }
-        scenePackageMapper.saveScenePackage(po);
-        scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
-        LogUtil.insert();
-        new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+
     }
 
     //查询测试包主表列表