fix:修改异步注解名称2

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/aspect/AsyncAnnotationAspect.java

@@ -9,6 +9,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.launch.constant.AppConstant;
@@ -39,16 +40,15 @@ public class AsyncAnnotationAspect {
 	 * 定义一个切点，匹配所有带有@LogpmAsync("asyncExecutor")注解的方法。
 	 * 注意：实际上Spring Framework自带对@LogpmAsync("asyncExecutor")的处理，直接这样配置可能会导致预期之外的行为。
 	 */
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if(StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")){
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -60,9 +60,7 @@ public class AsyncAnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		}else{
-			return joinPoint.proceed();
-		}
+	
 
 	}
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -20,22 +20,19 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.aftersales.bean.Resp;
-import com.logpm.aftersales.dto.AftersalesPackageScanDTO;
-import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO;
-import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
-import com.logpm.aftersales.dto.AftersalesPersonResponsibleDTO;
-import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
+import com.logpm.aftersales.dto.*;
 import com.logpm.aftersales.entity.*;
+import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.logpm.aftersales.mapper.AftersalesAbnormalPackageMapper;
 import com.logpm.aftersales.mapper.AftersalesAppealMapper;
 import com.logpm.aftersales.mapper.AftersalesCustomerMallMapper;
+import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
 import com.logpm.aftersales.service.*;
 import com.logpm.aftersales.vo.*;
-import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
-import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -49,21 +46,18 @@ import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.DictTimeoutEnum;
 import org.springblade.common.constant.aftersales.*;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserSearchClient;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;

blade-service/logpm-basic/src/main/java/com/logpm/basic/aspect/AsyncAnnotationAspect.java

@@ -5,6 +5,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.scheduling.annotation.Async;
@@ -20,16 +21,15 @@ public class AsyncAnnotationAspect {
 	 * 定义一个切点，匹配所有带有@LogpmAsync("asyncExecutor")注解的方法。
 	 * 注意：实际上Spring Framework自带对@LogpmAsync("asyncExecutor")的处理，直接这样配置可能会导致预期之外的行为。
 	 */
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if(StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")){
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -41,9 +41,7 @@ public class AsyncAnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		}else{
-			return joinPoint.proceed();
-		}
+
 
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/AsyncAnnotationAspect.java

@@ -9,6 +9,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.launch.constant.AppConstant;
@@ -39,16 +40,15 @@ public class AsyncAnnotationAspect {
 	 * 定义一个切点，匹配所有带有@LogpmAsync("asyncExecutor")注解的方法。
 	 * 注意：实际上Spring Framework自带对@LogpmAsync("asyncExecutor")的处理，直接这样配置可能会导致预期之外的行为。
 	 */
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if(StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")){
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -60,9 +60,6 @@ public class AsyncAnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		}else{
-			return joinPoint.proceed();
-		}
 
 	}
 

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/aspect/AnnotationAspect.java

@@ -9,6 +9,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.redis.cache.BladeRedis;
@@ -40,16 +41,15 @@ public class AnnotationAspect {
 	 * 定义一个切点，匹配所有带有@LogpmAsync("asyncExecutor")注解的方法。
 	 * 注意：实际上Spring Framework自带对@LogpmAsync("asyncExecutor")的处理，直接这样配置可能会导致预期之外的行为。
 	 */
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object asyncAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if (StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")) {
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -61,9 +61,7 @@ public class AnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		} else {
-			return joinPoint.proceed();
-		}
+
 
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/aspect/AsyncAnnotationAspect.java

@@ -15,6 +15,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.launch.constant.AppConstant;
@@ -44,16 +45,15 @@ public class AsyncAnnotationAspect {
 	private final BladeRedis bladeRedis;
 	private final Environment environment;
 
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if(StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")){
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -65,9 +65,7 @@ public class AsyncAnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		}else{
-			return joinPoint.proceed();
-		}
+	
 
 	}
 

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/aspect/AsyncAnnotationAspect.java

@@ -5,6 +5,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.scheduling.annotation.Async;
@@ -20,16 +21,15 @@ public class AsyncAnnotationAspect {
 	 * 定义一个切点，匹配所有带有@LogpmAsync("asyncExecutor")注解的方法。
 	 * 注意：实际上Spring Framework自带对@LogpmAsync("asyncExecutor")的处理，直接这样配置可能会导致预期之外的行为。
 	 */
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if(StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")){
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -41,9 +41,7 @@ public class AsyncAnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		}else{
-			return joinPoint.proceed();
-		}
+
 
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/aspect/AsyncAnnotationAspect.java

@@ -5,6 +5,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.scheduling.annotation.Async;
@@ -20,16 +21,15 @@ public class AsyncAnnotationAspect {
 	 * 定义一个切点，匹配所有带有@LogpmAsync("asyncExecutor")注解的方法。
 	 * 注意：实际上Spring Framework自带对@LogpmAsync("asyncExecutor")的处理，直接这样配置可能会导致预期之外的行为。
 	 */
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if(StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")){
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -41,9 +41,7 @@ public class AsyncAnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		}else{
-			return joinPoint.proceed();
-		}
+
 
 	}
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/aspect/AsyncAnnotationAspect.java

@@ -5,6 +5,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.LogpmAsync;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.scheduling.annotation.Async;
@@ -20,16 +21,15 @@ public class AsyncAnnotationAspect {
 	 * 定义一个切点，匹配所有带有@LogpmAsync("asyncExecutor")注解的方法。
 	 * 注意：实际上Spring Framework自带对@LogpmAsync("asyncExecutor")的处理，直接这样配置可能会导致预期之外的行为。
 	 */
-	@Around("@annotation(org.springframework.scheduling.annotation.Async)")
+	@Around("@annotation(org.springblade.common.annotations.LogpmAsync)")
 	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
 
 		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
 		Method method = signature.getMethod();
 
-		Async myAsync = method.getAnnotation(Async.class);
+		LogpmAsync myAsync = method.getAnnotation(LogpmAsync.class);
 		String annotationValue = myAsync.value();
 
-		if(StringUtil.isNotBlank(annotationValue) && annotationValue.equals("asyncExecutor")){
 			// 在方法执行前的操作
 			String tenantId = AuthUtil.getTenantId();
 			DynamicDataSourceContextHolder.push(tenantId);
@@ -41,9 +41,6 @@ public class AsyncAnnotationAspect {
 			DynamicDataSourceContextHolder.poll();
 
 			return result;
-		}else{
-			return joinPoint.proceed();
-		}
 
 	}