评分规则个人私有唯一

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

@@ -33,7 +33,6 @@ public class ScenePackageController {
 
     //查询主表列表
     @PostMapping("/queryScenePackageList")
-    @ResponseBody
     public ResponseBodyVO<PageInfo<ScenePackageVO>> queryScenePackageList(@RequestBody ScenePackageParam parms) {
         PageUtil.setPageInfo(parms);
         List<ScenePackagePO> list = scenePackageService.queryScenePackageList(parms);
@@ -52,7 +51,6 @@ 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) {  // 参数错误
@@ -69,7 +67,6 @@ public class ScenePackageController {
 
     //修改
     @PostMapping("/updateScenePackage")
-    @ResponseBody
     public ResponseBodyVO<String> updateScenePackage(@RequestBody Map<String, List<ScenePackageSublistVO>> map) {
         List<ScenePackageSublistVO> params = map.get("params");
         return scenePackageService.updateScenePackage(params);
@@ -77,33 +74,30 @@ public class ScenePackageController {
 
     //查询一个测试包列表
     @PostMapping("/queryScenePackageSublistList")
-    @ResponseBody
     public ResponseBodyVO<List<ScenePackageSublistVO>> queryScenePackageSublistList(@RequestBody ScenePackageParam parms) {
         if (ObjectUtil.isNull(parms.getPackageId())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数PackageId不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 packageId 不能为空，请检查");
         }
         List<ScenePackageSublistVO> list = scenePackageService.queryScenePackageSublistList(parms);
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
     }
 
     //测试包分享
     @PostMapping("/instShareList")
     @PreAuthorize("@AuthorityCheck.admin()")
-    @ResponseBody
     public ResponseBodyVO<String> instShareList(@RequestBody ScenePackageParam parms) {
         if (ObjectUtil.isNull(parms.getPackageId())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数PackageId不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数PackageId不能为空，请检查");
         }
         return scenePackageService.instShareList(parms);
     }
 
     //测试包删除
     @PostMapping("/deleteList")
-    @ResponseBody
     public ResponseBodyVO<String> deleteList(@RequestBody ScenePackageParam parms) {
         if (ObjectUtil.isNull(parms.getPackageId())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数PackageId不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 packageId 不能为空，请检查");
         }
         scenePackageService.deleteList(parms);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
@@ -111,31 +105,27 @@ public class ScenePackageController {
 
     //查询测试包数量
     @PostMapping("/queryPackageCount")
-    @ResponseBody
-    public ResponseBodyVO<Map> queryPackageCount() {
-
-        Map map = scenePackageService.queryPackageCount();
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map);
+    public ResponseBodyVO<Map<String,Integer>> queryPackageCount() {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, scenePackageService.queryPackageCount());
     }
 
     /**
      * 查询场景分配配置信息
      */
     @PostMapping("/getSceneParam")
-    @ResponseBody
-    public ResponseBodyVO<Map> getSceneParam() {
-        HashMap<String, Integer> map = parameterService.getSceneParam();
+    public ResponseBodyVO<Map<String, Integer>> getSceneParam() {
+        Map<String, Integer> map = parameterService.getSceneParam();
         ScenePackageParam parms = new ScenePackageParam();
         parms.setShare("0");
         List<ScenePackagePO> list = scenePackageService.queryScenePackageList(parms);
-        Integer creatNum = 0;
+        int creatNum = 0;
         if (ObjectUtil.isNotNull(list)) {
             creatNum = list.size();
         }
         if (ObjectUtil.isNotNull(map)) {
             map.put("creatNum", creatNum);
         } else {
-            Map map1 = new HashMap();
+            Map<String, Integer> map1 = new HashMap<>();
             map1.put("creatNum", 0);
             map1.put("numCreateScenePackage", 0);
             map1.put("numScenePerPackage", 0);

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

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

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

@@ -584,7 +584,7 @@ public class ScenePackageService {
 
     //查询个人测试包数量
     @SneakyThrows
-    public Map queryPackageCount() {
+    public Map<String,Integer> queryPackageCount() {
         ScenePackagePO params = new ScenePackagePO();
         params.setCreateUserId(AuthUtil.getCurrentUserId());
         params.setShare("0");