Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
@@ -193,6 +193,11 @@ private String customCodeSerialClass; /** * 自定义的流水算法类 */ private String customCodeSerialClassText; /** * 是否自动匹配分类值 */ private String matchClassifyValueFlag; @@ -661,6 +666,14 @@ this.referCodeClassifyOidName = referCodeClassifyOidName; } public String getCustomCodeSerialClassText() { return customCodeSerialClassText; } public void setCustomCodeSerialClassText(String customCodeSerialClassText) { this.customCodeSerialClassText = customCodeSerialClassText; } @Override public String toString() { return "CodeBasicSecDTO{" + Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
@@ -237,6 +237,12 @@ */ private String customCodeSerialClass; /** * 自定义的流水算法类 */ private String customCodeSerialClassText; /** * 是否自动匹配分类值 */ Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
@@ -200,6 +200,11 @@ private String customCodeSerialClass; /** * 自定义的流水算法类 */ private String customCodeSerialClassText; /** * 是否自动匹配分类值 */ private String matchClassifyValueFlag; Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -1475,6 +1475,22 @@ } return sum; } /*** * 校验是否是罗马数字 * @param s * @return */ public static boolean isRoman(String s) { // 检查输入的字符串是否为空 if (s == null || s.length() == 0) { return false; } // 将输入的字符串转换为大写字母 s = s.toUpperCase(); // 返回结果 Pattern pattern = Pattern.compile("^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$"); return pattern.matcher(s ).matches(); } public static String intToRomanTwo(int num) { String M[] = {"", "M", "MM", "MMM"}; Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java
@@ -9,6 +9,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springframework.aop.framework.Advised; import org.springframework.aop.support.AopUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -36,8 +37,9 @@ Object bean = ApplicationContextProvider.getApplicationContext().getBean(beanName); if(bean!=null){ CodeSerialAlgorithmVO algorithmVO = new CodeSerialAlgorithmVO(); Advised advised = (Advised)bean; Class<?> targetClass = advised.getTargetSource().getTargetClass(); //Advised advised = (Advised)bean; Class<?> targetClass = AopUtils.getTargetClass(bean); //Class<?> targetClass = advised.getTargetSource().getTargetClass(); algorithmVO.setClassFullName(targetClass.getName()); MdmSerialAlgorithm serialAlgorithm = targetClass.getDeclaredAnnotation(MdmSerialAlgorithm.class); if(serialAlgorithm==null){ @@ -57,6 +59,7 @@ } Query query=new Query(); IPage<CodeSerialAlgorithmVO> queryIPage =Condition.getPage(query); queryIPage.setRecords(voList); return queryIPage; } } Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
@@ -55,6 +55,7 @@ <result property="codeFillLimit" column="CODEFILLLIMIT" jdbcType="INTEGER"/> <result property="codeFillFlag" column="CODEFILLFLAG" jdbcType="VARCHAR"/> <result property="customCodeSerialClass" column="CUSTOMCODESERIALCLASS" jdbcType="VARCHAR"/> <result property="customCodeSerialClassText" column="CUSTOMCODESERIALCLASSTEXT" jdbcType="VARCHAR"/> <result property="matchClassifyValueFlag" column="MATCHCLASSIFYVALUEFLAG" jdbcType="VARCHAR"/> <result property="parentClassifySecOid" column="PARENTCLASSIFYSECOID" jdbcType="VARCHAR"/> <result property="parentClassifySecText" column="b__name" jdbcType="VARCHAR"/> @@ -123,6 +124,7 @@ PL_CODE_BASICSEC.codelevelvalue, PL_CODE_BASICSEC.codefilllength, PL_CODE_BASICSEC.customcodeserialclass, PL_CODE_BASICSEC.customCodeSerialClassText, PL_CODE_BASICSEC.matchclassifyvalueflag, PL_CODE_BASICSEC.sectype, PL_CODE_BASICSEC.pkcoderule,