场景测试包个人私有唯一

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

@@ -33,7 +33,7 @@ public class SceneNaturalController {
     //查询列表
     @PostMapping("/querySceneNaturalList")
     @ResponseBody
-    public ResponseBodyVO<List<SceneNaturalVO>> querySceneNaturalList(@RequestBody SceneNaturalNewParam params) {
+    public ResponseBodyVO<PageInfo<SceneNaturalVO>> querySceneNaturalList(@RequestBody SceneNaturalNewParam params) {
         PageUtil.setPageInfo(params);
         List<SceneNaturalPO> list = sceneNaturalService.querySceneNaturalList(params);
         PageInfo<SceneNaturalPO> objectPageInfo = new PageInfo<>(list);
@@ -43,9 +43,9 @@ public class SceneNaturalController {
             BeanUtils.copyProperties(po, vo);
             list1.add(vo);
         }
-        PageInfo pageInfo = new PageInfo<>(list1);
+        PageInfo<SceneNaturalVO> pageInfo = new PageInfo<>(list1);
         pageInfo.setTotal(objectPageInfo.getTotal());
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, pageInfo);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);
     }
 
 
@@ -62,16 +62,14 @@ public class SceneNaturalController {
     @ResponseBody
     public ResponseBodyVO<String> deleteSceneNatural(@RequestBody SceneNaturalPO params) {
         if (ObjectUtil.isNull(params.getNaturalId())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
         }
         sceneNaturalService.deleteSceneNatural(params);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
     /**
      * 解析已经上传好的数据
-     * @param sceneImportParam
-     * @return
      */
     @PostMapping("/saveSceneNaturalBatch")
     @ResponseBody

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

@@ -12,6 +12,7 @@ import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.scene.service.ScenePackageService;
 import com.css.simulation.resource.system.service.ParameterService;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +26,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-//测试包
+
+@Slf4j
 @RestController
 @RequestMapping(value = "/ScenePackage", name = LogConstants.MODULE_SCENE_TEST_PACKAGE)
 public class ScenePackageController {
@@ -52,7 +54,7 @@ public class ScenePackageController {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);
     }
 
-    
+
     @PostMapping("/saveScenePackage")
     public ResponseBodyVO<String> saveScenePackage(@RequestBody Map<String, List<ScenePackageSublistVO>> map) {
         ResponseBodyVO<String> result = new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
@@ -62,19 +64,15 @@ public class ScenePackageController {
         }
         String packageId = params.get(0).getId();
         int packageLevel = params.get(0).getPackageLevel();
-        if ("1".equals(packageId)) {   // 新增场景测试包（传 id 为 1）
+        if ("1".equals(packageId)) {
+            log.info("saveScenePackage() 新增场景测试包（传 id 为 1）");
             params.get(0).setId("");
             result = scenePackageService.saveScenePackage(params, 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());
         }

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

@@ -99,7 +99,7 @@ public class ScoringRulesController {
             // 检查私有是否存在同名平分规则
             ScoringRulesPO tmPo = scoringRulesService.querySelfOnly(scoringRulesPO.getRuleName(), AuthUtil.getCurrentUserId());
             if (ObjectUtil.isNotNull(tmPo)) {
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则 " + tmPo.getRuleName() + " 已存在，请重新命名。");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "私有规则 " + tmPo.getRuleName() + " 已存在，请重新命名。");
             }
             scoringRulesService.saveScoringRules(scoringRulesPO);
         } else {

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

@@ -287,14 +287,13 @@ public class SceneNaturalService {
             ParamUtil.arrConvertObj(selfBehavior, po);
             for (String[] arr : selfBehavior) {
                 if (arr != null && arr.length == 1) {
-                    List list = po.getSelfBehavior();
+                    List<String> list = po.getSelfBehavior();
                     if (list == null) {
-                        List newList = new ArrayList();
+                        List<String> newList = new ArrayList<>();
                         newList.add(arr[0]);
                         po.setSelfBehavior(newList);
                         ;
                     } else {
-
                         list.add(arr[0]);
                         po.setSelfBehavior(list);
                     }
@@ -399,7 +398,7 @@ public class SceneNaturalService {
                     vo.setLabel(vo.getLabel() + ",隧道");
                 }
             }
-            if (vo.getTargetBehavior().indexOf("机动车从左侧切入成功") > -1 || vo.getTargetBehavior().indexOf("机动车从右侧切入成功") > -1) {
+            if (vo.getTargetBehavior().contains("机动车从左侧切入成功") || vo.getTargetBehavior().contains("机动车从右侧切入成功")) {
                 if (ObjectUtil.isNull(vo.getLabel())) {
                     vo.setLabel("切入");
                 } else {
@@ -413,14 +412,14 @@ public class SceneNaturalService {
                     vo.setLabel(vo.getLabel() + ",切出");
                 }
             }
-            if (vo.getSelfBehavior().indexOf("直路掉头") > -1 || vo.getSelfBehavior().indexOf("路口掉头") > -1) {
+            if (vo.getSelfBehavior().contains("直路掉头") || vo.getSelfBehavior().contains("路口掉头")) {
                 if (ObjectUtil.isNull(vo.getLabel())) {
                     vo.setLabel("掉头");
                 } else {
                     vo.setLabel(vo.getLabel() + ",掉头");
                 }
             }
-            if (vo.getSelfBehavior().indexOf("向左变道成功") > -1 || vo.getSelfBehavior().equals("向右变道成功") || vo.getSelfBehavior().indexOf("向左连续变道") > -1 || vo.getSelfBehavior().indexOf("向右连续变道") > -1 || vo.getSelfBehavior().indexOf("向左变道超车") > -1 || vo.getSelfBehavior().indexOf("向右变道超车") > -1) {
+            if (vo.getSelfBehavior().contains("向左变道成功") || vo.getSelfBehavior().equals("向右变道成功") || vo.getSelfBehavior().contains("向左连续变道") || vo.getSelfBehavior().indexOf("向右连续变道") > -1 || vo.getSelfBehavior().indexOf("向左变道超车") > -1 || vo.getSelfBehavior().indexOf("向右变道超车") > -1) {
                 if (ObjectUtil.isNull(vo.getLabel())) {
                     vo.setLabel("变道");
                 } else {
@@ -436,13 +435,11 @@ public class SceneNaturalService {
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         sceneNaturalMapper.deleteSceneNatural(params);
-        Map map = new HashMap();
+        Map<String, String> map = new HashMap<>();
         map.put("sceneId", params.getNaturalId());
         map.put("sceneName", params.getNaturalName());
         map.put("type", DictConstants.SCENE_NATURAL);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
-
-        // systemUserSceneService.deleteSystemUserSceneBySceneId(params.getNaturalId());
     }
 
     public Integer querySceneNumBySy() {

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

@@ -51,7 +51,7 @@ public class ScenePackageService {
         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() + " 已存在，请重新命名。");