huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!200 修复导出 Excel 时，报结果码不能为空的错误

Browse Source 
Merge pull request !200 from 李树桐/result_code_pr
This commit is contained in:
芋道源码 2022-06-30 05:21:26 +00:00 committed by Gitee
commit df868109c1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
View File

@ -44,7 +44,7 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
* 满足如下任一条件，则会进行记录： * 满足如下任一条件，则会进行记录：
* 1. 使用 @ApiOperation + 非 @GetMapping * 1. 使用 @ApiOperation + 非 @GetMapping
* 2. 使用 @OperateLog 注解 * 2. 使用 @OperateLog 注解
* * <p>
* 但是，如果声明 @OperateLog 注解时，将 enable 属性设置为 false 时，强制不记录。 * 但是，如果声明 @OperateLog 注解时，将 enable 属性设置为 false 时，强制不记录。
* *
* @author 芋道源码 * @author 芋道源码
@ -77,7 +77,8 @@ public class OperateLogAspect {
return around0(joinPoint, operateLog, apiOperation); return around0(joinPoint, operateLog, apiOperation);
} }
@Around("!@annotation(io.swagger.annotations.ApiOperation) && @annotation(operateLog)") // 兼容处理，只添加 @OperateLog 注解的情况 @Around("!@annotation(io.swagger.annotations.ApiOperation) && @annotation(operateLog)")
// 兼容处理，只添加 @OperateLog 注解的情况
public Object around(ProceedingJoinPoint joinPoint, public Object around(ProceedingJoinPoint joinPoint,
cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog) throws Throwable { cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog) throws Throwable {
return around0(joinPoint, operateLog, null); return around0(joinPoint, operateLog, null);
@ -236,14 +237,12 @@ public class OperateLogAspect {
} }
operateLogObj.setDuration((int) (System.currentTimeMillis() - startTime.getTime())); operateLogObj.setDuration((int) (System.currentTimeMillis() - startTime.getTime()));
// （正常）处理 resultCode 和 resultMsg 字段 // （正常）处理 resultCode 和 resultMsg 字段
if (result != null) { if (result instanceof CommonResult) {
if (result instanceof CommonResult) { CommonResult<?> commonResult = (CommonResult<?>) result;
CommonResult<?> commonResult = (CommonResult<?>) result; operateLogObj.setResultCode(commonResult.getCode());
operateLogObj.setResultCode(commonResult.getCode()); operateLogObj.setResultMsg(commonResult.getMsg());
operateLogObj.setResultMsg(commonResult.getMsg()); } else {
} else { operateLogObj.setResultCode(SUCCESS.getCode());
operateLogObj.setResultCode(SUCCESS.getCode());
}
} }
// （异常）处理 resultCode 和 resultMsg 字段 // （异常）处理 resultCode 和 resultMsg 字段
if (exception != null) { if (exception != null) {
@ -267,9 +266,9 @@ public class OperateLogAspect {
return null; return null;
} }
return Arrays.stream(requestMethods).filter(requestMethod -> return Arrays.stream(requestMethods).filter(requestMethod ->
requestMethod == RequestMethod.POST requestMethod == RequestMethod.POST
|| requestMethod == RequestMethod.PUT || requestMethod == RequestMethod.PUT
|| requestMethod == RequestMethod.DELETE) || requestMethod == RequestMethod.DELETE)
.findFirst().orElse(null); .findFirst().orElse(null);
} }