Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -23,46 +23,58 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.mapper.CodeRuleMapper;
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.ICodeAllCodeService;
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.service.*;
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;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.entity.Strategy;
import com.vci.ubcs.system.feign.ISysClient;
import com.vci.ubcs.system.user.entity.User;
import com.vci.ubcs.system.user.feign.IUserClient;
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;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.rmi.ServerException;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING;
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST;
@@ -97,12 +109,23 @@
   private ICodeAllCodeService codeAllcodeService;
   @Resource
   private ICodeBasicSecService codeBasicSecService;
   @Resource
   private ICodeClassifyValueService iCodeClassifyValueService;
   /**
    * 对象的操作
    */
   @Resource
   private RevisionModelUtil revisionModelUtil;
   @Resource
   private ICodeFixedValueService codeFixedValueService;
   /**
    * 系统服务
    */
   @Resource
   private IUserClient userClient;
   /**
    * 分页查询
@@ -111,7 +134,15 @@
    * @return
    */
   @Override
   public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) {
   public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) throws VciBaseException {
      //int i = 1 / 0;
      //如果等于自己配置的管理组租户id和管理组超管账号,就不需要按照规则所有者来进行查询
      /*if(!(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())
         && AuthUtil.getUserId().toString().equals(NacosConfigCache.getAdminUserInfo().getUserId().toString()))
      ){
         // 按照规则所有者来查询
         conidtionMap.put("owner",AuthUtil.getUserId().toString());
      }*/
      IPage<CodeRule> codeRuleIPage = this.codeRuleMapper.selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapper(conidtionMap, CodeRule.class));
      //do转vo同时setLcStatusText生命周期值,并包装成分页对象返回
      return CodeRuleWrapper.build().pageVO(codeRuleIPage);
@@ -125,15 +156,46 @@
    * @throws VciBaseException 参数为空,唯一项,必输项不通过时会抛出异常
    */
   @Override
   public boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
   public R addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
      VciBaseUtil.alertNotNull(codeRuleDTO, "需要添加的数据对象");
      //将DTO转换为DO
      if(checkCodeRuleRepeat(codeRuleDTO)){
         return R.fail("规则编号已存在!");
      }
      // 将DTO转换为DO
      CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
      String userId = AuthUtil.getUserId().toString();
      // 填充默认值
      DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
      codeRule.setLctid(CODE_RULE_LC);
      codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
      return codeRuleMapper.insert(codeRule)>0;
      codeRule.setOwnerText(AuthUtil.getUserAccount()+"("+AuthUtil.getNickName()+")");
      return R.status(codeRuleMapper.insert(codeRule)>0);
   }
   /**
    * 检查id编号是否重复
    * @param codeRuleDTO 当前判断是否重复的对象
    * @return 返回false表示未重复
    */
   @Override
   public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO)throws VciBaseException {
      LambdaQueryWrapper<CodeRule> wrapper = Wrappers.<CodeRule>query()
         .lambda().eq(CodeRule::getId, codeRuleDTO.getId());
      if(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())){
         wrapper.eq(CodeRule::getTenantId,AuthUtil.getTenantId());
      }
      // 根据规则id查询编号
      List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(wrapper);
      if(!codeRulesList.isEmpty()){
         return codeRulesList.parallelStream().anyMatch(codeRule -> {
            if(StringUtils.isNotBlank(codeRuleDTO.getOid())){
               // 代表是修改规则,不是将编号修改为已存在的的编号
               return !codeRule.getOid().equals(codeRuleDTO.getOid());
            }else {
               return true;
            }
         });
      }
      return false;
   }
   /**
@@ -143,7 +205,7 @@
    * @return true表示可以编辑或删除,false表示不可以
    */
   @Override
   public boolean checkEditDelStatus(String lcStatus) {
   public boolean checkEditDelStatus(String lcStatus) throws VciBaseException {
      if (CodeRuleLC.RELEASED.getValue().equals(lcStatus) || CodeRuleLC.DISABLED.getValue().equals(lcStatus)) {
         return false;
      }
@@ -158,16 +220,28 @@
    * @throws VciBaseException 参数为空,唯一项,必输项不通过时会抛出异常
    */
   @Override
   public boolean editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException{
   public R editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException{
      VciBaseUtil.alertNotNull(codeRuleDTO, "数据对象", codeRuleDTO.getOid(), "主数据编码规则主键");
      if(checkCodeRuleRepeat(codeRuleDTO)){
         return R.fail("规则编号已存在!");
      }
      if (!checkEditDelStatus(codeRuleDTO.getLcStatus())) {
         throw new VciBaseException("编码规则已发布,不允许编辑或删除");
      }
      //将DTO转换为DO
      CodeRule codeRule = selectByOid(codeRuleDTO.getOid());
      revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
      if(!codeRule.getOwner().equals(codeRuleDTO.getOwner())){
         codeRule.setOwner(codeRuleDTO.getOwner());
         R<User> userR = userClient.userInfoById(Func.toLong(codeRuleDTO.getOwner()));
         if(!userR.isSuccess() || Func.isEmpty(userR.getData())){
            codeRule.setOwnerText(codeRuleDTO.getOwner());
         }else{
            codeRule.setOwnerText(userR.getData().getAccount()+"("+userR.getData().getRealName()+")");
         }
      }
      DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
      return codeRuleMapper.updateById(codeRule)>0;
      return R.status(codeRuleMapper.updateById(codeRule)>0);
   }
   /**
@@ -189,7 +263,6 @@
            return R.fail("编码规则已被引用,不允许编辑或删除!");
         }
      }
      List<CodeAllCode> codeDOList = codeAllcodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCodeRuleOid, codeRuleDTO.getOid()));
      if (!CollectionUtils.isEmpty(codeDOList)) {
         return R.fail("编码规则已生成编码,不允许删除");
@@ -271,7 +344,7 @@
    * @return true表示已经使用,false表示未被使用
    */
   @Override
   public boolean isAlreadyInUse(String oid) {
   public boolean isAlreadyInUse(String oid) throws VciBaseException {
      Collection<CodeClassifyVO> codeClassifyVOS = listUseRangeInCodeClassify(oid);
      if (codeClassifyVOS.size() > 0) {
         return true;
@@ -287,7 +360,7 @@
    * @return 主题库分类使用到该编码规则的所有集合
    */
   @Override
   public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
   public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) throws VciBaseException {
      List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getCodeRuleOid, oid));
      return CodeClassifyWrapper.build().listVO(codeClassifies);
   }
@@ -316,7 +389,7 @@
   public Collection<CodeRuleVO> listCodeRuleByOids(Collection<String> oidCollections) throws VciBaseException {
      VciBaseUtil.alertNotNull(oidCollections, "数据对象主键集合");
      List<CodeRule> codeRuleDOList = listCodeRuleDOByOidCollections(oidCollections);
      return CodeRuleWrapper.build().listVO(codeRuleDOList);
      return codeRuleDO2VOs(codeRuleDOList,true);
   }
   /**
@@ -330,8 +403,8 @@
   @Override
   public Collection<CodeRuleVO> listCodeRuleByIds(Collection<String> oidCollections, boolean hasSec) throws VciBaseException {
      VciBaseUtil.alertNotNull(oidCollections, "数据对象主键集合");
      List<CodeRule> codeRuleDOList = listCodeRuleDOByOidCollections(oidCollections);
      return codeRuleDO2VOs(codeRuleDOList, true);
      List<CodeRule> codeRuleDOList = listCodeRuleDOByIdCollections(oidCollections);
      return codeRuleDO2VOs(codeRuleDOList, hasSec);
   }
   /**
@@ -340,12 +413,35 @@
    * @param oidCollections 主键的集合
    * @return 数据对象列表
    */
   private List<CodeRule> listCodeRuleDOByOidCollections(Collection<String> oidCollections) {
   private List<CodeRule> listCodeRuleDOByOidCollections(Collection<String> oidCollections) throws VciBaseException {
      List<CodeRule> codeRuleDOList = new ArrayList<CodeRule>();
      if (!CollectionUtils.isEmpty(oidCollections)) {
         Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
         for (Collection<String> oids : oidCollectionsList) {
            List<CodeRule> tempDOList = codeRuleMapper.selectBatchIds(oids);
            if (!CollectionUtils.isEmpty(tempDOList)) {
               codeRuleDOList.addAll(tempDOList);
            }
         }
      }
      return codeRuleDOList;
   }
   /**
    * 使用规则id集合查询数据对象
    *
    * @param idCollections id的集合
    * @return 数据对象列表
    */
   private List<CodeRule> listCodeRuleDOByIdCollections(Collection<String> idCollections) throws VciBaseException {
      List<CodeRule> codeRuleDOList = new ArrayList<CodeRule>();
      if (!CollectionUtils.isEmpty(idCollections)) {
         Collection<Collection<String>> idCollectionsList = VciBaseUtil.switchCollectionForOracleIn(idCollections);
         for (Collection<String> ids : idCollectionsList) {
            List<CodeRule> tempDOList = codeRuleMapper.selectList(
               Wrappers.<CodeRule>query()
                  .lambda().in(CodeRule::getId,ids)
            );
            if (!CollectionUtils.isEmpty(tempDOList)) {
               codeRuleDOList.addAll(tempDOList);
            }
@@ -374,7 +470,7 @@
    * @return 执行结果
    */
   @Override
   public R updateStatus(String oid, String update) {
   public R updateStatus(String oid, String update) throws VciBaseException {
      int count = 0;
      //先查询对象
      CodeRule codeRuleDO = selectByOid(oid);
@@ -396,7 +492,9 @@
         if (!CodeRuleLC.EDITING.getValue().equals(codeRuleDO.getLcStatus())) {
            return R.fail("非编辑状态的编码规则无法发布");
         }
         count = codeRuleMapper.update(null,wrapper.set(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue()));
         // 发布时将码段类型按照字符串分隔的形式拼接并存储
         String secTypeStr = codeBasicSecService.listCodeBasicSecByRuleOid(codeRuleDO.getOid()).stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
         count = codeRuleMapper.update(null,wrapper.set(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue()).set(CodeRule::getBasicSecTypes,secTypeStr));
      } else {
         return R.fail("暂不支持的操作类型");
      }
@@ -415,14 +513,22 @@
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public R cloneCodeRule(CodeRuleDTO codeRuleDTO) {
   public R cloneCodeRule(CodeRuleDTO codeRuleDTO) throws ServerException {
      if(checkCodeRuleRepeat(codeRuleDTO)){
         return R.fail("规则编号已存在!");
      }
      VciBaseUtil.alertNotNull(codeRuleDTO, "需要添加的数据对象");
      CodeRule codeRuleDO = new CodeRule();
      BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDTO, codeRuleDO);
      boolean exFlag = codeRuleMapper.insert(codeRuleDO)>0;
      DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE);
      boolean exFlag = SqlHelper.retBool(codeRuleMapper.insert(codeRuleDO));
      List<CodeBasicSecDTO> secList = codeRuleDTO.getElements();
      List<CodeBasicSec> codeBasicSecs = new ArrayList<>();
      secList.forEach(codeBasicSecDTO -> {
      List<CodeBasicSec> codeClassifySec = new ArrayList<>();
      // 固定码值映射关系
      Map<String,List<CodeFixedValue>> codeFixedValueMaps = new HashMap<>();
      for (CodeBasicSecDTO codeBasicSecDTO : secList) {
         codeBasicSecDTO.setPkCodeRule(codeRuleDO.getOid());
         KeyValue attrKv = codeBasicSecService.checkAttrNullableBySecType(codeBasicSecDTO);
         if (!"success".equals(attrKv.getKey())) {
@@ -430,15 +536,44 @@
         }
         CodeBasicSec codeBasicSecDO = new CodeBasicSec();
         BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDTO, codeBasicSecDO);
         codeBasicSecDO.setOid("");
         codeBasicSecDO.setRevisionOid("");
         codeBasicSecDO.setNameOid("");
         String oldBasicOid = codeBasicSecDO.getOid(); //被克隆的码段的oid
         // 判断是否是分类码段
         if(codeBasicSecDO.getSecType().equals(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue())){
            // 存储旧的码段oid和新的码段的oid的关联关系
            codeClassifySec.add(codeBasicSecDO);
            continue;
         }
         // 更改创建时间,修改时间等默认值
         DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC);
         // 固定码段
         if(codeBasicSecDO.getSecType().equals(CodeSecTypeEnum.CODE_FIXED_SEC.getValue())){
            // 固定码段存储好oid和码值的关联关系
            codeFixedValueMaps.put(codeBasicSecDO.getOid(),codeFixedValueService.list(Wrappers.<CodeFixedValue>query()
               .lambda().eq(CodeFixedValue::getCodeFixedSecOid, oldBasicOid)
            ));
         }
         codeBasicSecs.add(codeBasicSecDO);
      });
      }
      // 处理分类码段的oid,因为oid关联parentClassifyOid,与码值codeClassifyOid,码值又需要通过旧的码段oid来查询,所以不能直接改变oid
      boolean resChangeAssn = codeBasicSecService.changeParentOidAssnOid(codeClassifySec);
      // 将处理过的分类码段也添加进要做新增处理的码段集合中
      codeBasicSecs.addAll(codeClassifySec);
      // 新增码段
      boolean exFlag1 = this.codeBasicSecService.saveBatch(codeBasicSecs);
      return R.data(exFlag&&exFlag1);
      // 最终要存入码值表中的,码值对象
      List<CodeFixedValue> codeFixedDOValues = new ArrayList<>();
      // 构造码值对象,与码段主键关联关系,以及改变码值的oid
      codeFixedValueMaps.forEach((key, value) -> {
         value.stream().forEach(item -> {
            item.setOid("");
            item.setCodeFixedSecOid(key);
            DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item);
            codeFixedDOValues.add(item);
         });
      });
      boolean exFlag2 = codeFixedValueService.saveBatch(codeFixedDOValues) && resChangeAssn;
      return R.data(exFlag&&exFlag1&&exFlag2);
   }
   /**
    * 使用主键获取编码规则的内容
@@ -447,9 +582,135 @@
    * @return 规则的显示对象
    */
   @Override
   public CodeRuleVO getObjectHasSecByOid(String oid) {
   public CodeRuleVO getObjectHasSecByOid(String oid) throws VciBaseException {
      CodeRule ruleDO = selectByOid(oid);
      return codeRuleDO2VO(ruleDO, true);
   }
   /**
    * 检查相似编码规则,并返回对应的结果
    * @param oid 主键
    * @return 执行结果
    */
   @Override
   public R checkLikeCodeRule(String oid) throws VciBaseException {
      // 1、查询出当前要发布的规则
      CodeRuleVO releaseCodeRule = getObjectHasSecByOid(oid);
      // 当前发布的规则不存在码段信息,直接空信息返回
      if(Func.isEmpty(releaseCodeRule.getSecVOList())){
         return R.fail("规则信息不存在,请刷新后重试!");
      }
      // 2、找出与当前发布的规则码段顺序一致的规则
      String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
      // 查询出所有已发布的编码规则中码段类型顺序与当前要发布的规则顺序一致的编码规则,此时已近过滤掉大部分规则,运算量减小
      List<CodeRule> codeRuleList = codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda()
         .eq(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue())
         .eq(CodeRule::getBasicSecTypes,secTypes)
      );
      // 为空,证明不存在类同的编码规则直接返回
      if(Func.isEmpty(codeRuleList)){
         return R.data(new ResultDataVO(true));
      }
      // 查询出基础码段列表(按照orderNum升序排序)
      List<CodeRuleVO> codeRuleVOS = codeRuleDO2VOs(codeRuleList, true);
      // 3、各类码段分别进行比对
      List<CodeRuleVO> lastCodeRule = new ArrayList<>();
      codeRuleVOS.stream().forEach(item->{
         List<CodeBasicSecVO> secVOList = item.getSecVOList();
         boolean flag = true;
         for (int index = 0; index < secVOList.size(); index++) {
            // 当前要发布的规则包含的码段信息
            CodeBasicSecVO releaseBasicSec = releaseCodeRule.getSecVOList().get(index);
            // 已发布的规则包含的码段信息
            CodeBasicSecVO releasedBasicSec = secVOList.get(index);
            // 因为码段顺序都是按照OrderNum排序的,所以直接按照下标两两比较就可以了
            switch (releasedBasicSec.getSecType()){
               // 属性码段,比对属性和属性所在分类(referCodeClassifyOid)
               case "codeattrsec":
                  if(!releasedBasicSec.getReferCodeClassifyOid().equals(releaseBasicSec.getReferCodeClassifyOid())){
                     flag = false;
                  }
                  break;
               // 可变码段,比对码段长度,编码补位方式和补位时的字符
               case "codevariablesec":
                  if(!(releasedBasicSec.getCodeSecLength().equals(releaseBasicSec.getCodeSecLength())
                     && releasedBasicSec.getCodeFillType().equals(releaseBasicSec.getCodeFillType())
                     && releasedBasicSec.getCodeFillSeparator().equals(releaseBasicSec.getCodeFillSeparator()))){
                     flag = false;
                  }
                  break;
               // 固定码段比对按升序排序的码值,
               case "codefixedsec":
                  if(Func.isNotEmpty(releasedBasicSec.getFixedValueVOList()) && Func.isNotEmpty(releaseBasicSec.getFixedValueVOList())){
                     // 将fixedValue按照逗号分隔拼接起来,以便比较,由于查询时已按照orderNum排过序了,所以不需要再次排序
                     String reledFixedValues = releasedBasicSec.getFixedValueVOList().stream().map(CodeFixedValueVO::getId).collect(Collectors.joining(","));
                     String releFixedValues = releaseBasicSec.getFixedValueVOList().stream().map(CodeFixedValueVO::getId).collect(Collectors.joining(","));
                     if(reledFixedValues.equals(releFixedValues)){
                        flag = false;
                     }
                  }
                  break;
               // 分类码段比对按升序排序码值
               case "codeclassifysec":
                  String classifyValueStr = this.iCodeClassifyValueService.getClassifyValueStr(releasedBasicSec.getOid());
                  String classifyValueStr1 = this.iCodeClassifyValueService.getClassifyValueStr(releaseBasicSec.getOid());
                  if(classifyValueStr.equals(classifyValueStr1)){
                     flag = false;
                  }
                  break;
               // 日期码段比对日期格式
               case "codedatesec":
                  if(!releasedBasicSec.getCodeDateFormatStr().equals(releaseBasicSec.getCodeDateFormatStr())){
                     flag = false;
                  }
                  break;
               // 引用码段,比对参照引用的业务类型
               case "coderefersec":
                  if(!releasedBasicSec.getReferBtmId().equals(releaseBasicSec.getReferBtmId())){
                     flag = false;
                  }
                  break;
               // 层级码段,比对层级类型、层级的值、字符截取类型、取值类型
               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()))){
                     flag = false;
                  }
                  break;
               // 流水码段比对码段的长度
               case "codeserialsec":
                  if(!releasedBasicSec.getCodeFillLength().equals(releaseBasicSec.getCodeFillLength())){
                     flag = false;
                  }
                  break;
            }
            if (!flag) {
               break;
            }
         }
         // 满足所有码段类型比对条件的规则
         if (flag) {
            lastCodeRule.add(item);
         }
      });
      // 为空时说明步骤3没比对出类似的编码规则
      if(lastCodeRule.isEmpty()){
         return R.data(new ResultDataVO(true));
      }
      StringBuffer resMsg = new StringBuffer();
      resMsg.append("存在如下相似规则,是否继续发布?\n");
      // 最后将结果进行处理并返回
      lastCodeRule.stream().forEach(item->{
         resMsg.append(item.getName());
         resMsg.append(item.getId());
         resMsg.append("编码规则;\n");
      });
      ResultDataVO resultDataVO = new ResultDataVO(false,resMsg.toString());
      return R.data(resultDataVO);
   }
   /**
@@ -488,8 +749,9 @@
         //如果有lcstatus的类的话
         vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
         if (hasSec) {
            List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid());
            //查询码段
            vo.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid()));
            vo.setSecVOList(codeBasicSecVOS);
         }
      }
      return vo;