评分规则个人私有唯一

api-common/src/main/java/api/common/pojo/po/scene/ScoringRulesPO.java

@@ -8,7 +8,6 @@ import java.sql.Timestamp;
 /**
  * 打分规则
  */
-@EqualsAndHashCode()
 @Data
 @Builder
 @NoArgsConstructor
@@ -21,36 +20,10 @@ public class ScoringRulesPO implements Serializable {
     private String ruleDescription ; //打分规则描述
     private String ruleDetails;//打分规则详情
     private String share ; //是否分析  1为分享
-    /**
-     * 记录创建时间
-     */
-    public Timestamp createTime;
-    /**
-     * 记录最后更新时间（包括删除）
-     */
-    public Timestamp modifyTime;
-    /**
-     * 记录创建人（用户id）
-     */
-    public String createUserId;
-    /**
-     * 记录最后更新人（包括删除）（用户id）
-     */
-    public String modifyUserId;
-    /**
-     * 是否已删除
-     */
-    public String isDeleted;
-
-
-
-
-
-
-
-
-
-
-
+    public Timestamp createTime; // 记录创建时间
+    public Timestamp modifyTime;    // 记录最后更新时间（包括删除）
+    public String createUserId; // 记录创建人（用户id）
+    public String modifyUserId; // 记录最后更新人（包括删除）（用户id）
+    public String isDeleted;    // 是否已删除
 
 }

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

@@ -7,6 +7,7 @@ import api.common.pojo.po.scene.ScoringRulesPO;
 import api.common.pojo.vo.scene.ScoringRulesVO;
 import api.common.util.ObjectUtil;
 import api.common.util.PythonUtil;
+import api.common.util.StringUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.scene.service.ScoringRulesService;
@@ -77,15 +78,7 @@ public class ScoringRulesController {
     @PostMapping("/saveScoringRules")
     @ResponseBody
     public ResponseBodyVO<String> saveScoringRules(@RequestBody ScoringRulesPO scoringRulesPO) {
-        ScoringRulesParam vo = new ScoringRulesParam();
-        BeanUtils.copyProperties(scoringRulesPO, vo);
-        vo.setShare("0");
-        //1 检查是否存在同名平分规则
-        ScoringRulesPO tmPo = scoringRulesService.querySelfOnly(vo.getRuleName(), AuthUtil.getCurrentUserId());
-        if (ObjectUtil.isNotNull(tmPo)) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则 " + tmPo.getRuleName() + " 已存在，请重新命名。");
-        }
-        //2 校验 python 语法错误
+        //1 校验 python 语法错误
         String pylint = PythonUtil.pylint(scoringRulesPO.getRuleDetails(),
                 PythonUtil.C,
                 PythonUtil.R,
@@ -96,11 +89,23 @@ public class ScoringRulesController {
         if (!pylint.contains(PythonUtil.PASS)) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "代码格式错误，请检查。");
         }
-
-        //3 保存
-        if (ObjectUtil.isNull(scoringRulesPO.getRulesId())) {
+        //2 判断 ruleId 是否为空
+        if (StringUtil.isEmpty(scoringRulesPO.getRulesId())) {
+            /*
+                1 共有另存为私有
+                2 私有另存为私有
+                3 新增
+             */
+            // 检查私有是否存在同名平分规则
+            ScoringRulesPO tmPo = scoringRulesService.querySelfOnly(scoringRulesPO.getRuleName(), AuthUtil.getCurrentUserId());
+            if (ObjectUtil.isNotNull(tmPo)) {
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则 " + tmPo.getRuleName() + " 已存在，请重新命名。");
+            }
             scoringRulesService.saveScoringRules(scoringRulesPO);
         } else {
+            /*
+                修改保存
+             */
             scoringRulesService.updateScoringRules(scoringRulesPO);
         }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);

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

@@ -48,7 +48,7 @@ public class ScenePackageService {
      */
     @SneakyThrows
     public ResponseBodyVO<String> saveScenePackage(List<ScenePackageSublistVO> params, Integer isLcw) {
-        List<ScenePackageSublistVO> listSublictTree = new ArrayList<>();
+        List<ScenePackageSublistVO> listSublistTree = new ArrayList<>();
         ScenePackagePO po = new ScenePackagePO();
         for (ScenePackageSublistVO vo : params) {
             // 个人私有唯一
@@ -60,7 +60,7 @@ public class ScenePackageService {
             po.setRemarks(vo.getRemarks());
             po.setSceneNum(vo.getSceneNum());
             po.setTreeNode(vo.getTreeNode());
-            listSublictTree = vo.getChildren();
+            listSublistTree = vo.getChildren();
         }
         po.setCreateTime(TimeUtil.getNowForMysql());
         po.setModifyTime(TimeUtil.getNowForMysql());
@@ -73,10 +73,10 @@ public class ScenePackageService {
         List<ScenePackageSublistPO> poList = new ArrayList<>();
         List<ScenePackageSublistPO> treeList;
         if (isLcw == 1) {
-            treeList = instShareListTreeLCW(listSublictTree, uuId, uuId, poList, "0", 1);
+            treeList = instShareListTreeLCW(listSublistTree, uuId, uuId, poList, "0", 1);
 
         } else {
-            treeList = instShareListTree(listSublictTree, uuId, uuId, poList, "0", 1);
+            treeList = instShareListTree(listSublistTree, uuId, uuId, poList, "0", 1);
         }
         //校验指标名称唯一
         if (treeList == null || treeList.size() < 1) {

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

@@ -55,15 +55,13 @@ public class ScoringRulesService {
         if (params != null && params.getShare() != null && params.getShare().equals("0")) {
             params.setCreateUserId(AuthUtil.getCurrentUserId());
         }
-        List<ScoringRulesPO> list = scoringRulesMapper.queryScoringRulesList(params);
-        return list;
+        return scoringRulesMapper.queryScoringRulesList(params);
     }
 
 
     @SneakyThrows
     public ScoringRulesPO queryScoringRules(ScoringRulesParam params) {
-        ScoringRulesPO Po = scoringRulesMapper.queryScoringRules(params);
-        return Po;
+        return scoringRulesMapper.queryScoringRules(params);
     }
 
     @SneakyThrows