From 2b11e85db57b2e405da978b900d2ffc6d50ddf57 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 30 Sep 2024 13:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=A5=E5=BF=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/xyt/system/SysUserLoginLogController.java | 5 +++-- .../project/xyt/system/SysVisitMenuLogController.java | 11 ++++++----- .../project/xyt/system/aspect/SysUserLogAspect.java | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/system/SysUserLoginLogController.java b/src/main/java/com/gunshi/project/xyt/system/SysUserLoginLogController.java index 880229f..7bd79dd 100644 --- a/src/main/java/com/gunshi/project/xyt/system/SysUserLoginLogController.java +++ b/src/main/java/com/gunshi/project/xyt/system/SysUserLoginLogController.java @@ -17,6 +17,7 @@ import com.gunshi.project.xyt.system.vo.TodayCountVo; import com.gunshi.project.xyt.system.vo.UserCountVo; import com.gunshi.project.xyt.system.vo.VisitCountVo; import com.gunshi.project.xyt.util.DateUtil; +import com.ruoyi.common.utils.SecurityUtils; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -216,8 +217,8 @@ public class SysUserLoginLogController { public R insert(@RequestBody @Validated SysUserLoginLog dto) { if (Objects.isNull(dto.getCreateId())) { -// Long loginUserId = projectCommonService.getLoginUserId(); -// dto.setCreateId(loginUserId); + Long loginUserId = SecurityUtils.getUserId(); + dto.setCreateId(loginUserId); } // 查询当前时间是否存在 diff --git a/src/main/java/com/gunshi/project/xyt/system/SysVisitMenuLogController.java b/src/main/java/com/gunshi/project/xyt/system/SysVisitMenuLogController.java index 7d03965..2979583 100644 --- a/src/main/java/com/gunshi/project/xyt/system/SysVisitMenuLogController.java +++ b/src/main/java/com/gunshi/project/xyt/system/SysVisitMenuLogController.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.annotation.Post; import com.gunshi.core.result.R; import com.gunshi.core.result.exception.NeedLoginException; -import com.gunshi.project.xyt.system.model.SysVisitMenuLog; import com.gunshi.project.xyt.system.mapper.SysVisitMenuLogMapper; +import com.gunshi.project.xyt.system.model.SysVisitMenuLog; import com.gunshi.project.xyt.system.so.VisitMenuLogPageSo; +import com.ruoyi.common.utils.SecurityUtils; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -91,13 +92,13 @@ public class SysVisitMenuLogController { Long loginUserId = null; // 获取用户id try { -// loginUserId = projectCommonService.getLoginUserId(); + loginUserId = SecurityUtils.getUserId(); } catch (NeedLoginException e) { log.info("获取登录账号id," + e.getMessage(), e); } -// if (null == dto.getCreateId() && null != loginUserId){ -// dto.setCreateId(loginUserId); -// } + if (null == dto.getCreateId() && null != loginUserId){ + dto.setCreateId(loginUserId); + } return R.ok(thisMapper.insert(dto) == 1); } diff --git a/src/main/java/com/gunshi/project/xyt/system/aspect/SysUserLogAspect.java b/src/main/java/com/gunshi/project/xyt/system/aspect/SysUserLogAspect.java index 3bacf00..6a65fa3 100644 --- a/src/main/java/com/gunshi/project/xyt/system/aspect/SysUserLogAspect.java +++ b/src/main/java/com/gunshi/project/xyt/system/aspect/SysUserLogAspect.java @@ -3,9 +3,10 @@ package com.gunshi.project.xyt.system.aspect; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.gunshi.core.result.exception.NeedLoginException; -import com.gunshi.project.xyt.system.model.SysUserLoginLog; import com.gunshi.project.xyt.system.mapper.SysUserLoginLogMapper; +import com.gunshi.project.xyt.system.model.SysUserLoginLog; import com.gunshi.project.xyt.system.utils.ReqUtil; +import com.ruoyi.common.utils.SecurityUtils; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -57,6 +58,7 @@ public class SysUserLogAspect { // 获取用户id try { // loginUserId = projectCommonService.getLoginUserId(); + loginUserId = SecurityUtils.getUserId(); } catch (NeedLoginException e) { log.info("获取登录账号id," + e.getMessage(), e); }