用户日志修改
parent
258787a5cb
commit
2b11e85db5
|
|
@ -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<Boolean> insert(@RequestBody @Validated SysUserLoginLog dto) {
|
||||
|
||||
if (Objects.isNull(dto.getCreateId())) {
|
||||
// Long loginUserId = projectCommonService.getLoginUserId();
|
||||
// dto.setCreateId(loginUserId);
|
||||
Long loginUserId = SecurityUtils.getUserId();
|
||||
dto.setCreateId(loginUserId);
|
||||
}
|
||||
|
||||
// 查询当前时间是否存在
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue