|
|
|
@ -88,11 +88,11 @@ public class OperateLogAspect {
|
|
|
|
|
private Object around0(ProceedingJoinPoint joinPoint,
|
|
|
|
|
com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog operateLog,
|
|
|
|
|
Operation operation) throws Throwable {
|
|
|
|
|
// 目前,只有管理员,才记录操作日志!所以非管理员,直接调用,不进行记录
|
|
|
|
|
/*// 目前,只有管理员,才记录操作日志!所以非管理员,直接调用,不进行记录
|
|
|
|
|
Integer userType = WebFrameworkUtils.getLoginUserType();
|
|
|
|
|
if (!Objects.equals(userType, UserTypeEnum.ADMIN.getValue())) {
|
|
|
|
|
return joinPoint.proceed();
|
|
|
|
|
}
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
// 记录开始时间
|
|
|
|
|
LocalDateTime startTime = LocalDateTime.now();
|
|
|
|
@ -159,11 +159,20 @@ public class OperateLogAspect {
|
|
|
|
|
fillRequestFields(operateLogObj);
|
|
|
|
|
// 补全方法信息
|
|
|
|
|
fillMethodFields(operateLogObj, joinPoint, operateLog, startTime, result, exception);
|
|
|
|
|
// 补全业务信息
|
|
|
|
|
fillBusinessFields(operateLogObj, operateLog);
|
|
|
|
|
|
|
|
|
|
// 异步记录日志
|
|
|
|
|
operateLogFrameworkService.createOperateLog(operateLogObj);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static void fillBusinessFields(OperateLog operateLogObj, com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog operateLog) {
|
|
|
|
|
if(operateLog != null){
|
|
|
|
|
operateLogObj.setBusinessType(operateLog.businessType())
|
|
|
|
|
.setBusinessId(operateLog.businessId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static void fillUserFields(OperateLog operateLogObj) {
|
|
|
|
|
operateLogObj.setUserId(WebFrameworkUtils.getLoginUserId());
|
|
|
|
|
operateLogObj.setUserType(WebFrameworkUtils.getLoginUserType());
|
|
|
|
|