场景库模块代码 测试包

api-common/src/main/java/api/common/pojo/vo/scene/ScenePackageSublistVO.java

@@ -30,6 +30,5 @@ public class ScenePackageSublistVO implements Serializable {
     private int packageLevel;//级别
     private String remarks;//备注
     private int seq;//在当前层级下的顺序，由小到大
-    private boolean hasChildren;
     private List<ScenePackageSublistVO>  children;
 }

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

@@ -49,7 +49,7 @@ public class ScenePackageController {
     //新增测试包
     @PostMapping("/saveScenePackage")
     @ResponseBody
-    public ResponseBodyVO<String> saveScoringRules(@RequestBody ScenePackageNewParam parms) {
+    public ResponseBodyVO<String> saveScoringRules(@RequestBody List<ScenePackageSublistVO> parms) {
 
         return scenePackageService.saveScenePackage(parms);
     }
@@ -57,9 +57,8 @@ public class ScenePackageController {
     //修改
     @PostMapping("/updateScenePackage")
     @ResponseBody
-    public ResponseBodyVO<String> updateScenePackage(@RequestBody ScenePackageNewParam params)  {
-        scenePackageService.updateScenePackage(params);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+    public ResponseBodyVO<String> updateScenePackage(@RequestBody List<ScenePackageSublistVO> params)  {
+        return  scenePackageService.updateScenePackage(params);
     }
 
     //查询一个测试包列表

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

@@ -40,15 +40,24 @@ public class ScenePackageService {
      * 测试包数据录入大保存：
      */
     @SneakyThrows
-    public ResponseBodyVO<String> saveScenePackage(ScenePackageNewParam params){
+    public ResponseBodyVO<String> saveScenePackage(List<ScenePackageSublistVO> params){
+        List<ScenePackageSublistVO> listSublictTree=new ArrayList<>();
         ScenePackagePO po=new ScenePackagePO();
-        BeanUtils.copyProperties(params,po);
-        po.setCreateUserId(AuthUtil.getCurrentUserId());
-        po.setShare("0");
-        List<ScenePackageNewVO> listName=scenePackageMapper.queryByPackageName(po);
-        if(listName!=null && listName.size()>0){
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"测试包名称packName="+po.getPackageName()+"已存在，请重新命名");
+        for (ScenePackageSublistVO vo:params) {
+           //判断唯一
+             po.setPackageName(vo.getSublistName());
+            po.setCreateUserId(AuthUtil.getCurrentUserId());
+            po.setShare("0");
+            List<ScenePackageNewVO> listName=scenePackageMapper.queryByPackageName(po);
+            if(listName!=null && listName.size()>0){
+                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"测试包名称packName="+po.getPackageName()+"已存在，请重新命名");
+            }
+             po.setWeight(vo.getWeight());
+             po.setRemarks(vo.getRemarks());
+             po.setSceneNum(vo.getSceneNum());
+            listSublictTree= vo.getChildren();
         }
+
         po.setCreateTime(TimeUtil.getNowForMysql());
         po.setModifyTime(TimeUtil.getNowForMysql());
         po.setPackageCode(StringUtil.getRandomCode());
@@ -56,9 +65,8 @@ public class ScenePackageService {
         po.setPackageId(uuId);
         po.setIsDeleted("0");
         scenePackageMapper.saveScenePackage(po);
-        List<ScenePackageSublistVO> list=params.getList();
         List<ScenePackageSublistPO>  poList=new ArrayList<>();
-        List<ScenePackageSublistPO> treeList =instShareListTree(list,uuId,uuId,poList,"0");
+        List<ScenePackageSublistPO> treeList =instShareListTree(listSublictTree,uuId,uuId,poList,"0");
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
@@ -71,20 +79,36 @@ public class ScenePackageService {
 
     //修改主表数据
     @SneakyThrows
-    public   void updateScenePackage(ScenePackageNewParam params) {
+    public   ResponseBodyVO<String> updateScenePackage(List<ScenePackageSublistVO> params) {
+        List<ScenePackageSublistVO> listSublictTree=new ArrayList<>();
         ScenePackagePO po=new ScenePackagePO();
-        BeanUtils.copyProperties(params,po);
-        po.setCreateTime(TimeUtil.getNowForMysql());
+        for (ScenePackageSublistVO vo:params) {
+            //判断唯一
+            po.setPackageName(vo.getSublistName());
+            po.setCreateUserId(AuthUtil.getCurrentUserId());
+            po.setShare("0");
+            List<ScenePackageNewVO> listName=scenePackageMapper.queryByPackageName(po);
+            if(listName!=null && listName.size()>0){
+                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"测试包名称packName="+po.getPackageName()+"已存在，请重新命名");
+            }
+            po.setWeight(vo.getWeight());
+            po.setRemarks(vo.getRemarks());
+            po.setSceneNum(vo.getSceneNum());
+            listSublictTree= vo.getChildren();
+        }
+
+
         po.setModifyTime(TimeUtil.getNowForMysql());
-        po.setCreateUserId(AuthUtil.getCurrentUserId());
+        po.setModifyUserId(AuthUtil.getCurrentUserId());
         po.setIsDeleted("0");
         po.setShare("0");
         scenePackageMapper.updateScenePackage(po);
-        scenePackageSublistMapper.deleteScenePackageSublist(params.getPackageId());
-        List<ScenePackageSublistVO> list=params.getList();
+        scenePackageSublistMapper.deleteScenePackageSublist(po.getPackageId());
+        //List<ScenePackageSublistVO> list=params.getList();
         List<ScenePackageSublistPO>  poList=new ArrayList<>();
-        List<ScenePackageSublistPO> treeList =instShareListTree(list,params.getPackageId(),params.getPackageId(),poList,"0");
+        List<ScenePackageSublistPO> treeList =instShareListTree(listSublictTree,po.getPackageId(),po.getPackageId(),poList,"0");
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
     //删除测试包
@@ -173,7 +197,7 @@ public class ScenePackageService {
                 if(cvoList != null && cvoList.size() > 0){
                     //存入父节点集合中
                     pvo.setChildren(cvoList);
-                    pvo.setHasChildren(true);
+                  //  pvo.setHasChildren(true);
                     //继续查找下一节点
                     selectScenePackageSubListTree(cvoList,false, null);
                 }