Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java
@@ -5,8 +5,6 @@ import org.springblade.core.mp.support.Query; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.HashMap; import java.util.Map; Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
@@ -70,6 +70,11 @@ public static final String CODE_REVISION_RULE = "revisionrule"; /** * 版本值 */ public static final String CODE_REVISION_VALUE = "revisionvalue"; /** * 版本步长 */ public static final String CODE_REVISION_SEQ = "revisionseq"; @@ -169,6 +174,7 @@ add(CODE_COPYFORMVERSION); add(CODE_OID); add(CODE_VISION_VLUE); add(CODE_REVISION_VALUE); }}; /** @@ -204,6 +210,7 @@ add(CODE_COPYFORMVERSION); add(CODE_OID); add(CODE_VISION_VLUE); add(CODE_REVISION_VALUE); }}; /** Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -430,6 +430,7 @@ throw new VciBaseException("模板没有配置属性"); } } //剔除掉默认的属性,以及表单不显示的属性 List<CodeClassifyTemplateAttrVO> templateAttrVOS = codeClassifyTemplateAttrVOList.stream().filter(s -> !DEFAULT_ATTR_LIST.contains(s.getId()) && StringUtils.isBlank(s.getComponentRule()) @@ -4456,7 +4457,7 @@ if (Func.isNotEmpty(codeSynonymMaps)) { codeSynonymMaps.keySet().stream().forEach(item -> { synonymResString.append(item); synonymResString.append(","); synonymResString.append(","); }); } resultVO.setSynonymRuleInfo(Func.isEmpty(codeSynonymMaps) ? "" : String.format("以下[%s]被设置了近义词查询规则的关键属性,中出现了重复:", synonymResString)); @@ -4481,7 +4482,7 @@ // ,所以暂时将parallelStream改成了stream,改成了stream之后发现巨慢 // customForkJoinPool控制并发度 final List<ClientBusinessObject> finalCboList = cboList; Map<String, List<CodeSynonym>> finalCodeSynonymMaps = codeSynonymMaps; final Map<String, List<CodeSynonym>> finalCodeSynonymMaps = codeSynonymMaps; List<ClientBusinessObject> repeatDataMap = (List<ClientBusinessObject>) customForkJoinPool.submit(() -> { finalCboList.parallelStream().filter(cbo -> { //每行都得查询.如果其中出现了错误,我们就直接抛出异常,其余的显示 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
@@ -191,6 +191,9 @@ if(Func.isNotEmpty(strategy.getRequiredType()) && (strategy.getMinPwdLen() < strategy.getRequiredType() || strategy.getMaxPwdLen() < strategy.getRequiredType())){ throw new ServiceException("密码最小长度不能小于必填种类的值!"); } if(strategy.getExpirationTime() <= strategy.getReminderTime()){ throw new ServiceException("过期时间不能小于提醒时间!"); } //判断前端是否未提交,是否默认字段 if(Func.isEmpty(strategy.getIsDefault())){ strategy.setIsDefault(0L);