From 3be7bd55ff0a4ab2ed25b46cdfd1dede92300ea3 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 26 Aug 2021 11:15:29 +0800 Subject: [PATCH] kafa数据从redis获取型号,当前组织下走航车设备列表 --- screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java index cb0a8ee..a0fc827 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java @@ -10,14 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import java.util.List; import java.util.Map; -import java.util.Objects; - -import javax.servlet.http.HttpServletRequest; /** * <p> @@ -35,9 +30,7 @@ @Override public Page<UserLog> selectLogs(Map<String, Object> parameters) { - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); - String token = request.getHeader("token"); - Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token); + Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo(); Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization"); Object orgId = orgInfo.get("id"); QueryWrapper<UserLog> queryWrapper = new QueryWrapper<>(); -- Gitblit v1.8.0