chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

临时提交

This commit is contained in:
chenxudong 2025-02-14 10:15:07 +08:00
parent 961bfb2baa
commit 4294808f98
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/ServiceAspect.java
View File

@ -2,6 +2,7 @@ package com.electromagnetic.industry.software.manage.aop;
import cn.hutool.json.JSONUtil;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
@ -66,11 +67,13 @@ public class ServiceAspect {
StopWatch stopwatch = new StopWatch();
stopwatch.start("接口：" + methodInfo);
Object rvt = jp.proceed();
UserThreadLocal.setReqArgs(paramInfo);
if (rvt instanceof ResponseEntity) {
UserThreadLocal.setRes(ElectromagneticResultUtil.success(""));
return rvt;
}
UserThreadLocal.setRes((ElectromagneticResult)rvt);
UserThreadLocal.setReqArgs(paramInfo);
String returnInfo = JSONUtil.toJsonStr(rvt);
log.info("请求接口结束:{},返回参数:{},接口耗时:{}", methodInfo, returnInfo, (System.currentTimeMillis() - startTime) + "毫秒");
stopwatch.stop();

11
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java
View File

@ -100,10 +100,10 @@ public class LoginInterceptor implements HandlerInterceptor {
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
long accessStartTime = (long)request.getSession().getAttribute("accessStartTime");
ElectromagneticResult<?> result = UserThreadLocal.getResult();
String reqArgs = UserThreadLocal.getReqArgs();
long accessEndTime = System.currentTimeMillis();
UserOperation userOperation = ((HandlerMethod) handler).getMethod().getAnnotation(UserOperation.class);
String reqArgs = UserThreadLocal.getReqArgs();
UserAccessLog userAccessLog = UserAccessLog.builder()
.id(IdWorker.getSnowFlakeIdString())
.userId(UserThreadLocal.getUserId())
@ -117,10 +117,17 @@ public class LoginInterceptor implements HandlerInterceptor {
.accessSuccess(true)
.createTime(new Date())
.build();
ElectromagneticResult<?> result = UserThreadLocal.getResult();
if (result != null) {
if (!result.getSuccess()) {
userAccessLog.setAccessSuccess(false);
userAccessLog.setFailureReason(result.getErrorMessage());
}
} else {
userAccessLog.setAccessSuccess(false);
}
// TODO 如果是下载的文件，那么返回的是ResponseEntity而不是ElectromagneticResult
userAccessLogMapper.insert(userAccessLog);
UserThreadLocal.remove();

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java
View File

@ -133,7 +133,7 @@ public class EdFileInfoController {
return edFileInfoService.queryChildFolder(parentId);
}
@RequiredPermission(value = FilePermission.VIEW)
@RequiredPermission(value = FilePermission.DOWNLOAD)
@RequestMapping(value = "preview", method = RequestMethod.GET)
public ResponseEntity<InputStreamResource> preview(@RequestParam String id, HttpServletResponse response) {
return edFileInfoService.preview(id, response);