From fa3ec77225c230a44e107cd188d26e1d974d8029 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 05 一月 2024 15:59:43 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 e389694..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
@@ -1,13 +1,15 @@
package com.vci.ubcs.code.service.impl;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.annotation.MdmSerialAlgorithm;
-import com.vci.ubcs.code.service.CodeSerialAlgorithmServiceI;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.ApplicationContextProvider;
-import org.apache.commons.lang3.StringUtils;
+import com.vci.ubcs.code.service.ICodeSerialAlgorithmService;
import com.vci.ubcs.code.vo.pagemodel.CodeSerialAlgorithmVO;
+import com.vci.ubcs.starter.web.util.ApplicationContextProvider;
+import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
+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;
@@ -19,14 +21,14 @@
* @date 2022-2-17
*/
@Service
-public class CodeSerialAlgorithmServiceImpl implements CodeSerialAlgorithmServiceI {
+public class CodeSerialAlgorithmServiceImpl implements ICodeSerialAlgorithmService {
/**
* 鑾峰彇娴佹按绠楁硶鐨勫垪琛�
*
* @return 娴佹按绠楁硶鐨勪俊鎭�
*/
@Override
- public DataGrid<CodeSerialAlgorithmVO> gridSerialAlgorithm() {
+ public IPage<CodeSerialAlgorithmVO> gridSerialAlgorithm() {
//浣跨敤涓婚敭鍘绘壂鎻�
String[] beanNames = ApplicationContextProvider.getApplicationContext().getBeanNamesForAnnotation(MdmSerialAlgorithm.class);
List<CodeSerialAlgorithmVO> voList = new ArrayList<>();
@@ -35,9 +37,11 @@
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());
+ //algorithmVO.setClassFullName(beanName);
MdmSerialAlgorithm serialAlgorithm = targetClass.getDeclaredAnnotation(MdmSerialAlgorithm.class);
if(serialAlgorithm==null){
serialAlgorithm = targetClass.getAnnotation(MdmSerialAlgorithm.class);
@@ -46,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);
}
@@ -54,9 +59,9 @@
}
}
}
- DataGrid<CodeSerialAlgorithmVO> dataGrid = new DataGrid<>();
- dataGrid.setData(voList);
- dataGrid.setTotal(voList.size());
- return dataGrid;
+ Query query=new Query();
+ IPage<CodeSerialAlgorithmVO> queryIPage =Condition.getPage(query);
+ queryIPage.setRecords(voList);
+ return queryIPage;
}
}
--
Gitblit v1.9.3