From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 16 四月 2024 20:56:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java index 8b6e805..101b634 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java @@ -37,10 +37,11 @@ Object bean = ApplicationContextProvider.getApplicationContext().getBean(beanName); if(bean!=null){ CodeSerialAlgorithmVO algorithmVO = new CodeSerialAlgorithmVO(); - //Advised advised = (Advised)bean; + //Advised advised = (Advised)bean; Class<?> targetClass = AopUtils.getTargetClass(bean); //Class<?> targetClass = advised.getTargetSource().getTargetClass(); algorithmVO.setClassFullName(targetClass.getName()); + //algorithmVO.setClassFullName(beanName); MdmSerialAlgorithm serialAlgorithm = targetClass.getDeclaredAnnotation(MdmSerialAlgorithm.class); if(serialAlgorithm==null){ serialAlgorithm = targetClass.getAnnotation(MdmSerialAlgorithm.class); @@ -49,6 +50,7 @@ algorithmVO.setName(serialAlgorithm.text()); algorithmVO.setDescription(serialAlgorithm.description()); algorithmVO.setId(serialAlgorithm.value()); + algorithmVO.setSerialType(serialAlgorithm.serialType()); if(StringUtils.isBlank(algorithmVO.getId())){ algorithmVO.setId(beanName); } -- Gitblit v1.9.3