场景测试包个人私有唯一

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

@@ -23,7 +23,7 @@ import java.util.Map;
 
 //测试包
 @RestController
-@RequestMapping(value ="/ScenePackage" ,name = LogConstants.MODULE_SCENE_TEST_PACKAGE)
+@RequestMapping(value = "/ScenePackage", name = LogConstants.MODULE_SCENE_TEST_PACKAGE)
 public class ScenePackageController {
 
     @Resource
@@ -54,13 +54,14 @@ public class ScenePackageController {
     @PostMapping("/saveScenePackage")
     @ResponseBody
     public ResponseBodyVO<String> saveScenePackage(@RequestBody Map<String, List<ScenePackageSublistVO>> map) {
-
         List<ScenePackageSublistVO> params = map.get("params");
-        if (params == null || params.size() < 1) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数不能为空，请检查");
-        } else if (params.get(0).getId() == null || params.get(0).getPackageLevel() == 1) {
+        if (params == null || params.size() < 1) {  // 参数错误
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数不能为空，请检查");
+        } else if (params.get(0).getId() == null    // 新增场景测试包
+                || params.get(0).getPackageLevel() == 1 // level 是 1 表示是场景测试包
+        ) {
             params.get(0).setId("");
-            return scenePackageService.saveScenePackage(params,params.get(0).getPackageLevel());
+            return scenePackageService.saveScenePackage(params, params.get(0).getPackageLevel());
         } else {
             return scenePackageService.updateScenePackage(params);
         }
@@ -107,13 +108,14 @@ public class ScenePackageController {
         scenePackageService.deleteList(parms);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
+
     //查询测试包数量
     @PostMapping("/queryPackageCount")
     @ResponseBody
     public ResponseBodyVO<Map> queryPackageCount() {
 
-       Map map= scenePackageService.queryPackageCount();
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,map);
+        Map map = scenePackageService.queryPackageCount();
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map);
     }
 
     /**
@@ -121,24 +123,24 @@ public class ScenePackageController {
      */
     @PostMapping("/getSceneParam")
     @ResponseBody
-    public ResponseBodyVO<Map>  getSceneParam() {
+    public ResponseBodyVO<Map> getSceneParam() {
         HashMap<String, Integer> map = parameterService.getSceneParam();
-        ScenePackageParam parms=new ScenePackageParam();
+        ScenePackageParam parms = new ScenePackageParam();
         parms.setShare("0");
         List<ScenePackagePO> list = scenePackageService.queryScenePackageList(parms);
-        Integer creatNum=0;
-        if(ObjectUtil.isNotNull(list)){
-            creatNum=list.size();
+        Integer creatNum = 0;
+        if (ObjectUtil.isNotNull(list)) {
+            creatNum = list.size();
         }
-        if(ObjectUtil.isNotNull(map)){
-            map.put("creatNum",creatNum);
-        }else{
-            Map map1=new HashMap();
-            map1.put("creatNum",0);
-            map1.put("numCreateScenePackage",0);
-            map1.put("numScenePerPackage",0);
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,map1);
+        if (ObjectUtil.isNotNull(map)) {
+            map.put("creatNum", creatNum);
+        } else {
+            Map map1 = new HashMap();
+            map1.put("creatNum", 0);
+            map1.put("numCreateScenePackage", 0);
+            map1.put("numScenePerPackage", 0);
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map1);
         }
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,map);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map);
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageMapper.java

@@ -4,7 +4,9 @@ import api.common.pojo.param.scene.ScenePackageParam;
 import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.vo.scene.ScenePackageNewVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
+
 import java.util.List;
 
 
@@ -28,6 +30,9 @@ public interface ScenePackageMapper {
 
     //测试包名查唯一
     ScenePackageNewVO queryByPackageName(ScenePackagePO params);
+
+    ScenePackageNewVO querySelfOnly(@Param("packageName") String packageName, @Param("createUserId") String createUserId);
+
     //测试包数量
     Integer queryPackageCount(ScenePackagePO params);
 

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

@@ -51,12 +51,10 @@ public class ScenePackageService {
         List<ScenePackageSublistVO> listSublictTree = new ArrayList<>();
         ScenePackagePO po = new ScenePackagePO();
         for (ScenePackageSublistVO vo : params) {
-            po.setPackageName(vo.getSublistName());
-            po.setCreateUserId(AuthUtil.getCurrentUserId());
-            po.setShare("0");
-            ScenePackageNewVO scenePackageNewVO = scenePackageMapper.queryByPackageName(po);
+            // 个人私有唯一
+            ScenePackageNewVO scenePackageNewVO = scenePackageMapper.querySelfOnly(vo.getSublistName(), AuthUtil.getCurrentUserId());
             if (ObjectUtil.isNotNull(scenePackageNewVO)) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "测试包名称:" + po.getPackageName() + "已存在，请重新命名");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "测试包名称:" + po.getPackageName() + "已存在，请重新命名");
             }
             po.setWeight(vo.getWeight());
             po.setRemarks(vo.getRemarks());
@@ -73,7 +71,7 @@ public class ScenePackageService {
         po.setCreateUserId(AuthUtil.getCurrentUserId());
 
         List<ScenePackageSublistPO> poList = new ArrayList<>();
-        List<ScenePackageSublistPO> treeList = new ArrayList<>();
+        List<ScenePackageSublistPO> treeList;
         if (isLcw == 1) {
             treeList = instShareListTreeLCW(listSublictTree, uuId, uuId, poList, "0", 1);
 
@@ -85,8 +83,8 @@ public class ScenePackageService {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查");
         }
         if (treeList.size() > 1) {
-            Set set = new HashSet();
-            Map map = new HashMap<>();
+            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)) {
@@ -127,7 +125,7 @@ public class ScenePackageService {
             po.setPackageId(vo.getId());
             ScenePackageNewVO scenePackageNewVO = scenePackageMapper.queryByPackageName(po);
             if (ObjectUtil.isNotNull(scenePackageNewVO)) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "测试包名称:" + po.getPackageName() + "已存在，请重新命名");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "测试包名称:" + po.getPackageName() + "已存在，请重新命名");
             }
             po.setWeight(vo.getWeight());
             po.setRemarks(vo.getRemarks());
@@ -146,8 +144,8 @@ public class ScenePackageService {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查");
         }
         if (treeList.size() > 1) {
-            Set set = new HashSet();
-            Map map = new HashMap<>();
+            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)) {

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageMapper.xml

@@ -5,14 +5,15 @@
 
     <insert id="saveScenePackage" parameterType="api.common.pojo.po.scene.ScenePackagePO">
         insert into simulation.scene_package
-        (package_id,package_code,package_name,weight,
-        package_and_rules,scene_num,remarks,
-        create_user_id,create_time,modify_user_id,modify_time,
-         is_deleted,share,tree_node)
-        values (#{packageId,jdbcType=VARCHAR},#{packageCode,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},
-        #{packageAndRules,jdbcType=VARCHAR},#{sceneNum},#{remarks,jdbcType=VARCHAR},
-         #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
-        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR})
+        (package_id, package_code, package_name, weight,
+         package_and_rules, scene_num, remarks,
+         create_user_id, create_time, modify_user_id, modify_time,
+         is_deleted, share, tree_node)
+        values (#{packageId,jdbcType=VARCHAR}, #{packageCode,jdbcType=VARCHAR}, #{packageName,jdbcType=VARCHAR},
+                #{weight,jdbcType=VARCHAR},
+                #{packageAndRules,jdbcType=VARCHAR}, #{sceneNum}, #{remarks,jdbcType=VARCHAR},
+                #{createUserId,jdbcType=VARCHAR}, #{createTime}, #{modifyUserId,jdbcType=VARCHAR}, #{modifyTime},
+                #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR})
     </insert>
 
 
@@ -172,6 +173,18 @@
         </where>
     </select>
 
+    <select id="querySelfOnly" parameterType="api.common.pojo.po.scene.ScenePackagePO"
+            resultType="api.common.pojo.vo.scene.ScenePackageNewVO">
+        select package_id,
+               package_name,
+               package_code
+        from simulation.scene_package
+        where is_deleted = '0'
+          and share = '0'
+          and create_user_id = #{createUserId}
+          and package_name = #{packageName}
+    </select>
+
     <select id="queryPackageCount" parameterType="api.common.pojo.po.scene.ScenePackagePO"
             resultType="java.lang.Integer">
         select