lywsvip/JeeLowCode
1
0
Fork 0
mirror of https://gitee.com/jeelowcode/JeeLowCode.git synced 2026-06-08 15:34:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

JAVA增强执行失败修复

Browse Source
This commit is contained in:
JeeLowCode
2025-01-13 11:44:47 +08:00
parent 6f6e600c0f
commit 632e6c4dfd
2 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/JeeLowCodeAnnotationAspectjJAVA.java
View File

@@ -65,7 +65,7 @@ public class JeeLowCodeAnnotationAspectjJAVA {
@Before(value = EXPRESSION)
public void before(JoinPoint joinPoint) throws Throwable {
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins(joinPoint);
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins("start",joinPoint);//
if (FuncBase.isEmpty(buildEnhanceContext)) {
return;
}
@@ -89,7 +89,7 @@ public class JeeLowCodeAnnotationAspectjJAVA {
@AfterReturning(value = EXPRESSION, returning = "returnVal")
public Object afterReturning(JoinPoint joinPoint, Object returnVal) throws Throwable {
//获取参数
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins(joinPoint);
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins("end",joinPoint);
if (FuncBase.isEmpty(buildEnhanceContext)) {
return returnVal;
}
@@ -159,7 +159,7 @@ public class JeeLowCodeAnnotationAspectjJAVA {
@Around(value = EXPRESSION)
public Object aroudAdvice(ProceedingJoinPoint joinPoint) throws Throwable {
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins(joinPoint);
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins("around",joinPoint);
if (FuncBase.isEmpty(buildEnhanceContext)) {
return joinPoint.proceed();
}
@@ -169,14 +169,15 @@ public class JeeLowCodeAnnotationAspectjJAVA {
}
EnhanceContext context = buildEnhanceContext.getContext();
for (EnhanceJavaEntity enhanceJavaEntity : enhanceJavaEntityList) {
this.executeEnhance(enhanceJavaEntity, context, JavaEnhanceEventState.AROUND.getName(), joinPoint);
if (FuncBase.isNotEmpty(context.getResult()) && context.getResult().isExitFlag()) {
break;
}
}
if (Func.isEmpty(context.getResult())) {
if (Func.isEmpty(context.getResult()) || Func.isEmpty(context.getResult().getRecords())) {
return joinPoint.proceed();
}
@@ -185,7 +186,7 @@ public class JeeLowCodeAnnotationAspectjJAVA {
@AfterThrowing(value = EXPRESSION, throwing = "ex")
public void afterThrowing(JoinPoint joinPoint, Exception ex) throws Throwable {
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins(joinPoint);
BuildEnhanceContext buildEnhanceContext = this.getContextAndPlugins("throwing",joinPoint);
if (FuncBase.isEmpty(buildEnhanceContext)) {
return;
}
@@ -212,7 +213,13 @@ public class JeeLowCodeAnnotationAspectjJAVA {
aspectMethodNameMap = initAspectMethodNameMap;
}
public BuildEnhanceContext getContextAndPlugins(JoinPoint joinPoint) {
/**
*
* @param type start end around throwing
* @param joinPoint
* @return
*/
public BuildEnhanceContext getContextAndPlugins(String type,JoinPoint joinPoint) {
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
// 获取方法名称
String methodName = methodSignature.getName();
@@ -232,10 +239,42 @@ public class JeeLowCodeAnnotationAspectjJAVA {
Long dbFormId = (Long) paramMap.get("dbFormId");
String buttonCode = aspectMethodNameMap.get(methodName);
String key = dbFormId + "_" + buttonCode;
List<EnhanceJavaEntity> enhanceJavaEntityList = pluginNames.getOrDefault(key, null);
if (Func.isEmpty(enhanceJavaEntityList)) {//不存在增强
List<EnhanceJavaEntity> enhanceJavaEntityAllList = pluginNames.getOrDefault(key, null);
if (Func.isEmpty(enhanceJavaEntityAllList)) {//不存在增强
return null;
}
//获取专属增强
List<EnhanceJavaEntity> enhanceJavaEntityList=new ArrayList<>();
for(EnhanceJavaEntity javaEntity:enhanceJavaEntityAllList){
String javaClassUrl = javaEntity.getJavaClassUrl();//
BaseAdvicePlugin plugin = PluginManager.getPlugin(javaClassUrl);
switch (type) {
case "start"://前置增强
if (!(plugin instanceof BeforeAdvicePlugin)) {
break;
}
enhanceJavaEntityList.add(javaEntity);
break;
case "end"://后置增强
if (!(plugin instanceof AfterAdvicePlugin)) {
break;
}
enhanceJavaEntityList.add(javaEntity);
break;
case "around":
if (!(plugin instanceof AroundAdvicePlugin)) {
break;
}
enhanceJavaEntityList.add(javaEntity);
break;
case "throwing":
enhanceJavaEntityList.add(javaEntity);
break;
default:
break;
}
}
//判断是否是列表，导出增强
List<EnhanceJavaEntity> setOperation = enhanceJavaEntityList.stream()
@@ -308,7 +347,7 @@ public class JeeLowCodeAnnotationAspectjJAVA {
//环绕-前置
PluginManager.executeAroundBeforePlugin(plugin, context);
if (Func.isEmpty(context.getResult())) {
if (Func.isEmpty(context.getResult()) || Func.isEmpty(context.getResult().getRecords())) {
context.setResult(new EnhanceResult());
}
if (context.getResult().isExitFlag()) {//说明终止，不用往下走

3
jeelowcode-core/src/main/java/com/jeelowcode/core/framework/service/impl/EnhanceJavaServiceImpl.java
View File

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -54,6 +55,7 @@ public class EnhanceJavaServiceImpl extends ServiceImpl<EnhanceJavaMapper, Enhan
private HistoryDbFormMapper historyDbFormMapper;
//新增java增强
@Transactional(rollbackFor = Exception.class)
@Override
public void saveEnhanceJava(EnhanceJavaEntity enhanceJavaEntity){
long id = IdWorker.getId();
@@ -67,6 +69,7 @@ public class EnhanceJavaServiceImpl extends ServiceImpl<EnhanceJavaMapper, Enhan
}
//编辑java增强
@Transactional(rollbackFor = Exception.class)
@Override
public void updateEnhanceJava(EnhanceJavaEntity enhanceJavaEntity){
this.updateById(enhanceJavaEntity);