Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java

@@ -33,10 +33,7 @@
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
import com.vci.ubcs.omd.cache.EnumCache;
@@ -54,7 +51,9 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.api.ResultCode;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
@@ -514,7 +513,7 @@
      CodeRuleVO releaseCodeRule = getObjectHasSecByOid(oid);
      // 当前发布的规则不存在码段信息，直接空信息返回
      if(Func.isEmpty(releaseCodeRule.getSecVOList())){
         return R.success("");
         return R.fail("规则信息不存在，请刷新后重试！");
      }
      // 2、找出与当前发布的规则码段顺序一致的规则
      String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
@@ -525,7 +524,7 @@
      );
      // 为空，证明不存在类同的编码规则直接返回
      if(Func.isEmpty(codeRuleList)){
         return R.success("");
         return R.data(new ResultDataVO());
      }
      // 查询出基础码段列表（按照orderNum升序排序）
      List<CodeRuleVO> codeRuleVOS = codeRuleDO2VOs(codeRuleList, true);
@@ -589,6 +588,8 @@
               // 层级码段，比对层级类型、层级的值、字符截取类型、取值类型
               case "codelevelsec":
                  if(!(releasedBasicSec.getCodeLevelType().equals(releaseBasicSec.getCodeLevelType())
                     /*先做非空判断，因为改属性不是必填属性*/
                     && (Func.isNotEmpty(releasedBasicSec.getCodeLevelValue()) && Func.isNotEmpty(releaseBasicSec.getCodeLevelValue()))
                     && releasedBasicSec.getCodeLevelValue().equals(releaseBasicSec.getCodeLevelValue())
                     && releasedBasicSec.getValueCutType().equals(releaseBasicSec.getValueCutType())
                     && releasedBasicSec.getCodeGetValueType().equals(releaseBasicSec.getCodeGetValueType()))){
@@ -611,6 +612,10 @@
            lastCodeRule.add(item);
         }
      });
      // 为空时说明步骤3没比对出类似的编码规则
      if(lastCodeRule.isEmpty()){
         return R.data(new ResultDataVO());
      }
      StringBuffer resMsg = new StringBuffer();
      resMsg.append("存在如下相似规则，是否继续发布？\n");
      // 最后将结果进行处理并返回
@@ -619,7 +624,8 @@
         resMsg.append(item.getId());
         resMsg.append("编码规则;\n");
      });
      return R.fail(resMsg.toString());
      ResultDataVO resultDataVO = new ResultDataVO(false,resMsg.toString());
      return R.data(resultDataVO);
   }

   /**