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

@@ -32,10 +32,7 @@
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.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;
@@ -45,6 +42,7 @@
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.UBCSCondition;
@@ -103,6 +101,8 @@
   private ICodeAllCodeService codeAllcodeService;
   @Resource
   private ICodeBasicSecService codeBasicSecService;
   @Resource
   private ICodeClassifyValueService iCodeClassifyValueService;

   /**
    * 对象的操作
@@ -516,7 +516,7 @@
      String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
      // 查询出所有已发布的编码规则中码段类型顺序与当前要发布的规则顺序一致的编码规则，此时已近过滤掉大部分规则，运算量减小
      List<CodeRule> codeRuleList = codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda()
         .eq(CodeRule::getLcStatus, FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED)
         .eq(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue())
         .eq(CodeRule::getBasicSecTypes,secTypes)
      );
      // 为空，证明不存在类同的编码规则直接返回
@@ -596,16 +596,24 @@
                  }
                  break;
            }
            if (flag) {
               break;
            }
         }
         // 满足所有码段类型比对条件的规则
         if (flag) {
            lastCodeRule.add(item);
         }
      });
      StringBuffer resMsg = new StringBuffer();
      resMsg.append("存在如下相似规则，是否继续发布？\n");
      // 最后将结果进行处理并返回


      return null;
      lastCodeRule.stream().forEach(item->{
         resMsg.append(item.getName());
         resMsg.append(item.getId());
         resMsg.append("编码规则;\n");
      });
      return R.fail(resMsg.toString());
   }

   /**