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/UserServiceImpl.java |   36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 457d335..161de75 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -139,14 +139,14 @@
         userInfo.put("organization", orgInfo);
 
         //���������������
-        List<Map<String, Object>> groups = new ArrayList<>();
-        for (Group group : userBo.getGroups()) {
-            HashMap<String, Object> groupMap = new LinkedHashMap<>();
+        Group group = userBo.getGroup();
+        Map<String, Object> groupMap = new LinkedHashMap<>();
+        userInfo.put("group", groupMap);
+        if (group != null) {
             groupMap.put("id", group.getId());
             groupMap.put("groupName", group.getGroupName());
-            groups.add(groupMap);
+            userInfo.put("group", groupMap);
         }
-        userInfo.put("groups", groups);
 
         Map<String, Object> map = new HashMap<>();
         map.put("userId", userBo.getId());
@@ -175,8 +175,8 @@
     }
 
     @Override
-    public Map<String, Object> getUserInfo(String token) {
-        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+    public Map<String, Object> getCurrentUserInfo() {
+        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
         return userInfo;
     }
 
@@ -240,11 +240,9 @@
     @Override
     @Transactional
     public Map<String, Object> addUser(User user) {
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        String token = request.getHeader("token");
 
         Map<String, Object> result = new HashMap<>();
-        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
 
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
@@ -306,7 +304,7 @@
         userMapper.insert(user);
         //������
         String content = "������������������" + user.getAccount();
-        operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
+        operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE);
         return result;
     }
 
@@ -328,21 +326,17 @@
             TokenUtils.destoryToken(userId.toString(), token);
         }
         //������
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         String content = "������������������" + user.getAccount();
-        operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
+        operationLogUtils.insertLog(content, Constants.DELETE_OPERATE_TYPE);
     }
 
     @Override
     @Transactional
     public Map<String, Object> updateUser(User user) {
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        String token = request.getHeader("token");
-
         Map<String, Object> result = new HashMap<>();
         //���������������
         Map<String, Object> update = JSONObject.parseObject(JSON.toJSONString(user), Map.class);
-        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
         User beforeUser = userMapper.selectById(user.getId());
         Map<String, Object> before = JSONObject.parseObject(JSON.toJSONString(beforeUser), Map.class);
         /*String account = beforeUser.getAccount();
@@ -423,16 +417,14 @@
                 content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
             }
         }
-        operationLogUtils.insertLog(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+        operationLogUtils.insertLog(content.toString(), Constants.UPDATE_OPERATE_TYPE);
         return result;
     }
 
     @Override
     public Page<User> selectUsers(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");
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("organization_id", orgInfo.get("id"))

--
Gitblit v1.8.0