Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleApiServiceImpl.java

@@ -5,6 +5,7 @@ import com.gic.bizdict.api.dto.BizdictDTO;
 import com.gic.bizdict.api.service.BizdictService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.constant.DeleteFlagConstants;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.rule.*;
 import com.gic.enterprise.entity.*;
@@ -165,7 +166,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，分类不存在");
         }
-        if (TWO.equals(record.getRuleLevel())) {
+        if (isNotRightRuleLevel(record.getRuleLevel(), TWO)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，不是分类类型");
         }
         dto.setParentRuleId(record.getParentRuleId());
@@ -208,7 +209,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "场景ID错误，场景不存在");
         }
-        if (THREE.equals(record.getRuleLevel())) {
+        if (isNotRightRuleLevel(record.getRuleLevel(), THREE)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "场景ID错误，不是场景类型");
         }
         dto.setParentRuleId(record.getParentRuleId());
@@ -237,15 +238,15 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，分类不存在");
         }
-        if (TWO.equals(record.getRuleLevel())) {
+        if (isNotRightRuleLevel(record.getRuleLevel(), TWO)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，不是分类类型");
         }
-        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(0));
+        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(DeleteFlagConstants.DELETE_STATUS));
         //删除下面的场景
         List<TabConfigRule> list = configRuleService.listRule(null, 3, ruleId);
         if (CollectionUtils.isNotEmpty(list)) {
             for (TabConfigRule tabConfigRule : list) {
-                configRuleService.update(new TabConfigRule().setRuleId(tabConfigRule.getRuleId()).setDeleteFlag(0));
+                configRuleService.update(new TabConfigRule().setRuleId(tabConfigRule.getRuleId()).setDeleteFlag(DeleteFlagConstants.DELETE_STATUS));
             }
         }
         return ServiceResponse.success(record.getRuleName());
@@ -257,10 +258,10 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "场景ID错误，场景不存在");
         }
-        if (THREE.equals(record.getRuleLevel())) {
+        if (isNotRightRuleLevel(record.getRuleLevel(), THREE)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "场景ID错误，不是场景类型");
         }
-        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(0));
+        configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(DeleteFlagConstants.DELETE_STATUS));
         return ServiceResponse.success(record.getRuleName());
     }
 
@@ -626,7 +627,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (StringUtils.isBlank(dto.getMarketName())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "手动输入名称不能为空");
         }
-        if (TWO.equals(record.getRuleLevel())) {
+        if (isNotRightRuleLevel(record.getRuleLevel(), TWO)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，不是分类类型");
         }
         if (StringUtils.isBlank(dto.getMarketScene())) {
@@ -666,4 +667,8 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         return result;
 
     }
+
+    private static boolean isNotRightRuleLevel(Integer ruleLevel, Integer constants) {
+        return !constants.equals(ruleLevel);
+    }
 }