martin

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

@@ -27,11 +27,10 @@ import java.util.Map;
 public class ScoringRulesController {
 
     @Resource
-    ScoringRulesService scoringRulesService;
+    private ScoringRulesService scoringRulesService;
 
     //查询列表
     @PostMapping("/queryScoringRulesList")
-    @ResponseBody
     public ResponseBodyVO<PageInfo<ScoringRulesVO>> queryScoringRulesList(@RequestBody ScoringRulesParam parms) {
         PageUtil.setPageInfo(parms);
         List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesList(parms);
@@ -51,7 +50,6 @@ public class ScoringRulesController {
 
     //查询详情
     @PostMapping("/queryScoringRules")
-    @ResponseBody
     public ResponseBodyVO<ScoringRulesPO> queryScoringRules(@RequestBody ScoringRulesParam parms) {
         if (ObjectUtil.isNull(parms.getRulesId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数RulesId不能为空，请检查");
@@ -63,7 +61,6 @@ public class ScoringRulesController {
 
     //查唯一
     @PostMapping("/queryScoringRulesCount")
-    @ResponseBody
     public ResponseBodyVO<ScoringRulesPO> queryScoringRulesCount(@RequestBody ScoringRulesParam parms) {
         if (ObjectUtil.isNull(parms.getRuleName())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数RulesName不能为空，请检查");
@@ -77,7 +74,6 @@ public class ScoringRulesController {
      * 新增打分规则
      */
     @PostMapping("/saveScoringRules")
-    @ResponseBody
     public ResponseBodyVO<String> saveScoringRules(@RequestBody ScoringRulesPO scoringRulesPO) {
         //1 校验 python 语法错误
         String pylint = PythonUtil.pylint(scoringRulesPO.getRuleDetails(),
@@ -115,7 +111,6 @@ public class ScoringRulesController {
     //分享
     @PostMapping("/fxScoringRules")
     @PreAuthorize("@AuthorityCheck.admin()")
-    @ResponseBody
     public ResponseBodyVO<String> fxScoringRules(@RequestBody ScoringRulesParam params) {
         if (ObjectUtil.isNull(params.getRulesId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 RulesId 不能为空，请检查", "");
@@ -137,7 +132,6 @@ public class ScoringRulesController {
 
     //删除
     @PostMapping("/deleteScoringRules")
-    @ResponseBody
     public ResponseBodyVO<String> deleteScoringRules(@RequestBody ScoringRulesPO params) {
         scoringRulesService.deleteScoringRules(params);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
@@ -145,17 +139,16 @@ public class ScoringRulesController {
 
     //测试包里面对应查询打分规则列表
     @PostMapping("/queryCsb")
-    @ResponseBody
     public ResponseBodyVO<List<ScoringRulesPO>> queryCsb() {
         ScoringRulesParam params = new ScoringRulesParam();
         params.setShare("0");
         List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesListCSB(params);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
     }
+
     //测试包里面对应查询打分规则列表
     @PostMapping("/queryCsbNew")
-    @ResponseBody
-    public ResponseBodyVO<List<Map>> queryCsbNew() {
+    public ResponseBodyVO<List<Map<String, Object>>> queryCsbNew() {
         ScoringRulesParam params = new ScoringRulesParam();
         params.setShare("0");
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, scoringRulesService.queryScoringRulesListCSBNew(params));
@@ -163,7 +156,6 @@ public class ScoringRulesController {
 
     //该打分规则是否被引用
     @PostMapping("/queryCsbById")
-    @ResponseBody
     public ResponseBodyVO<Integer> queryCsbById(@RequestBody ScoringRulesParam params) {
         if (ObjectUtil.isNull(params.getRulesId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "rulesId 为空，请检查");
@@ -173,4 +165,4 @@ public class ScoringRulesController {
     }
 
 
-}
+}

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

@@ -22,7 +22,7 @@ public class ScoringRulesService {
     @Resource
     private ScoringRulesMapper scoringRulesMapper;
     @Resource
-    private  ScenePackageMapper scenePackageMapper;
+    private ScenePackageMapper scenePackageMapper;
 
     /**
      * 打分规则数据录入：
@@ -105,12 +105,12 @@ public class ScoringRulesService {
     }
 
     @SneakyThrows
-    @SuppressWarnings("all")
-    public List<Map> queryScoringRulesListCSBNew(ScoringRulesParam params) {
-        if (params != null && params.getShare() != null && params.getShare().equals("0")) {
+    public List<Map<String, Object>> queryScoringRulesListCSBNew(ScoringRulesParam params) {
+        Optional.ofNullable(params).orElseThrow(() -> new RuntimeException("参数为空。"));
+        if (params.getShare() != null && params.getShare().equals("0")) {
             params.setCreateUserId(AuthUtil.getCurrentUserId());
         }
-        List<Map> treeList = new ArrayList<>();
+        List<Map<String, Object>> treeList = new ArrayList<>();
         List<ScoringRulesPO> listSy = scoringRulesMapper.queryScoringRulesList(params);
 
         //查询共有
@@ -118,24 +118,24 @@ public class ScoringRulesService {
         params.setShare("1");
         List<ScoringRulesPO> listGy = scoringRulesMapper.queryScoringRulesList(params);
 
-        Map typeMap = new HashMap();
+        Map<String, Object> typeMap = new HashMap<>();
         typeMap.put("code", "公有");
         typeMap.put("name", "公有");
-        List<Map> colourList = new LinkedList();
+        List<Map<String, Object>> colourList = new LinkedList<>();
         listGy.forEach(vo -> {
-            Map colourMap = new HashMap();
+            Map<String, Object> colourMap = new HashMap<>();
             colourMap.put("code", vo.getRulesId());
             colourMap.put("name", vo.getRuleName());
             colourMap.put("vo", vo);
             colourList.add(colourMap);
         });
         typeMap.put("children", colourList);
-        Map typeMap1 = new HashMap();
+        Map<String, Object> typeMap1 = new HashMap<>();
         typeMap1.put("code", "私有");
         typeMap1.put("name", "私有");
-        List<Map> colourList1 = new LinkedList();
+        List<Map<String, Object>> colourList1 = new LinkedList<>();
         listSy.forEach(vo -> {
-            Map colourMap = new HashMap();
+            Map<String, Object> colourMap = new HashMap<>();
             colourMap.put("code", vo.getRulesId());
             colourMap.put("name", vo.getRuleName());
             colourMap.put("vo", vo);