From e1656a39220ae942b30bcb4cf1a0a75f70752b5e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 12 十月 2026 19:11:27 +0800
Subject: [PATCH] feat(system): 优化操作日志用户信息展示
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
index e631f97..827c806 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
@@ -6,12 +6,14 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.translate.core.TranslateUtils;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO;
import cn.iocoder.yudao.module.system.service.logger.OperateLogService;
-import org.dromara.core.trans.anno.TransMethodResult;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +29,10 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Objects;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -40,34 +46,63 @@
@Resource
private OperateLogService operateLogService;
+ @Resource
+ private AdminUserService adminUserService;
+
@GetMapping("/get")
@Operation(summary = "鏌ョ湅鎿嶄綔鏃ュ織")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('system:operate-log:query')")
public CommonResult<OperateLogRespVO> getOperateLog(@RequestParam("id") Long id) {
OperateLogDO operateLog = operateLogService.getOperateLog(id);
- return success(BeanUtils.toBean(operateLog, OperateLogRespVO.class));
+ if (operateLog == null) {
+ return success(null);
+ }
+ return success(buildResponses(List.of(operateLog)).get(0));
}
@GetMapping("/page")
@Operation(summary = "鏌ョ湅鎿嶄綔鏃ュ織鍒嗛〉鍒楄〃")
@PreAuthorize("@ss.hasPermission('system:operate-log:query')")
- @TransMethodResult
public CommonResult<PageResult<OperateLogRespVO>> pageOperateLog(@Valid OperateLogPageReqVO pageReqVO) {
PageResult<OperateLogDO> pageResult = operateLogService.getOperateLogPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, OperateLogRespVO.class));
+ return success(new PageResult<>(buildResponses(pageResult.getList()), pageResult.getTotal()));
}
@Operation(summary = "瀵煎嚭鎿嶄綔鏃ュ織")
@GetMapping("/export-excel")
@PreAuthorize("@ss.hasPermission('system:operate-log:export')")
- @TransMethodResult
@ApiAccessLog(operateType = EXPORT)
public void exportOperateLog(HttpServletResponse response, @Valid OperateLogPageReqVO exportReqVO) throws IOException {
exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<OperateLogDO> list = operateLogService.getOperateLogPage(exportReqVO).getList();
ExcelUtils.write(response, "鎿嶄綔鏃ュ織.xls", "鏁版嵁鍒楄〃", OperateLogRespVO.class,
- TranslateUtils.translate(BeanUtils.toBean(list, OperateLogRespVO.class)));
+ buildResponses(list));
+ }
+
+ /** 鎵归噺濉厖鎿嶄綔浜猴紝鍒楄〃銆佽鎯呭強瀵煎嚭閲囩敤鐩稿悓瑙勫垯锛屼笉渚濊禆鑷姩缈昏瘧銆� */
+ private List<OperateLogRespVO> buildResponses(List<OperateLogDO> logs) {
+ List<OperateLogRespVO> responses = BeanUtils.toBean(logs, OperateLogRespVO.class);
+ Set<Long> userIds = responses.stream()
+ .filter(log -> Objects.equals(log.getUserType(), UserTypeEnum.ADMIN.getValue()))
+ .map(OperateLogRespVO::getUserId).filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, AdminUserDO> users = userIds.isEmpty() ? Map.of() : adminUserService.getUserMap(userIds);
+ for (OperateLogRespVO log : responses) {
+ if (log.getUserId() == null) {
+ log.setUserName("鏈煡鎿嶄綔浜�");
+ continue;
+ }
+ AdminUserDO user = Objects.equals(log.getUserType(), UserTypeEnum.ADMIN.getValue())
+ ? users.get(log.getUserId()) : null;
+ if (user != null) {
+ log.setUserName(StrUtil.blankToDefault(user.getNickname(),
+ StrUtil.blankToDefault(user.getUsername(), "鐢ㄦ埛锛堢紪鍙凤細" + log.getUserId() + "锛�")));
+ } else {
+ String userType = Objects.equals(log.getUserType(), UserTypeEnum.MEMBER.getValue()) ? "浼氬憳" : "鐢ㄦ埛";
+ log.setUserName(userType + "锛堢紪鍙凤細" + log.getUserId() + "锛�");
+ }
+ }
+ return responses;
}
}
--
Gitblit v1.9.3