From 37d76adf129d41f65342874886c43db450ecb0ef Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 12 Mar 2021 17:16:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 135 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 113 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 2b73e59..5c14a2f 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
@@ -1,26 +1,29 @@
package com.moral.api.service.impl;
-import io.swagger.models.auth.In;
-
import java.util.ArrayList;
-import java.util.Date;
+import java.util.Comparator;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.Group;
import com.moral.api.entity.Menu;
import com.moral.api.entity.User;
+import com.moral.api.mapper.GroupMapper;
+import com.moral.api.mapper.MenuMapper;
+import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.redis.RedisUtil;
+import com.moral.util.AESUtils;
+import com.moral.util.MD5Utils;
+import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
/**
@@ -37,32 +40,120 @@
@Autowired
private UserMapper userMapper;
+ @Autowired
+ private GroupMapper groupMapper;
+
+ @Autowired
+ private MenuMapper menuMapper;
+
+ @Autowired
+ private OrganizationMapper organizationMapper;
+
+ @Value("${AES.KEY}")
+ private String AESKey;
+
@Override
- public Map<String, Object> login(String account, String password) {
- Map<String, Object> resultMap = new HashMap<>();
+ public Map<String, Object> login(Map<String, Object> parameters) {
+ Map<String, Object> resultMap = new LinkedHashMap<>();
+ //������������
+ String account = parameters.get("account").toString();
+ String password = parameters.get("password").toString();
+ //������
+ account = AESUtils.decrypt(account, AESKey);
+ password = AESUtils.decrypt(password, AESKey);
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("account", account).eq("password", password).eq("is_Delete", "0");
+ //������������
+ queryWrapper.eq("account", account);
User user = userMapper.selectOne(queryWrapper);
String msg;
- String token = null;
if (user == null) {
- msg = "������������������������";
- } else if (user.getExpireTime() != null && user.getExpireTime().getTime() < System.currentTimeMillis()) {
- msg = "���������������������";
+ msg = "������������������";
} else {
- msg = "������������";
- token = user.getId() + "-" + UUID.randomUUID().toString().replaceAll("-", "");
- Set<Group> groups = userMapper.selectUserGroup(user.getId());
- Set<Menu> menus = userMapper.selectUserMenu(user.getId());
- user.setGroups(groups);
- user.setMenus(menus);
- RedisUtil.set(token, user, 1296000);
+ if (!MD5Utils.saltMD5Verify(password, user.getPassword())) {//������������
+ msg = "������������";
+ } else if ("1".equals(user.getIsDelete())) {
+ msg = "������������������";
+ } else if (user.getExpireTime() != null && user.getExpireTime().getTime() < System.currentTimeMillis()) {
+ msg = "���������������������";
+ } else {
+ int userId = user.getId();
+ //������������������
+ Map<String, Object> orgMap = organizationMapper.selectOrganizationById(user.getOrganizationId());
+ String locationCode = orgMap.get(orgMap.get("location_level").toString()).toString();
+ //������������������
+ Map<String, Object> userInfo = new LinkedHashMap<>();
+ userInfo.put("userId", userId);
+ userInfo.put("account", user.getAccount());
+ userInfo.put("userName", user.getUserName());
+ userInfo.put("organizationId", user.getOrganizationId());
+ userInfo.put("locationCode", locationCode);
+ List<Map<String, Object>> groups = groupMapper.selectUserGroup(userId);
+ userInfo.put("groups", groups);
+ userInfo.putAll(getMenus(userId));
+ //������token������������redis
+ String token = TokenUtils.getToken(user.getId().toString(), userInfo);
+ resultMap.put("token", token);
+ resultMap.putAll(userInfo);
+ return resultMap;
+ }
}
- resultMap.put("token", token);
resultMap.put("msg", msg);
return resultMap;
}
+ //������userId������������������������
+ private Map<String, Object> getMenus(int userId) {
+ List<Menu> allMenus = menuMapper.selectUserMenu(userId);
+ Map<String, Object> resultMap = new LinkedHashMap<>();
+ //���������������
+ List<Menu> oneMenu = allMenus.stream()
+ .filter(o -> o.getParentId().equals(0))
+ .sorted(Comparator.comparing(Menu::getOrder))
+ .collect(Collectors.toList());
+
+ List<Map<String, Object>> newList = new ArrayList<>();
+ //������������������
+ oneMenu.forEach(o -> {
+ Map<String, Object> menuMap = new LinkedHashMap<>();
+ menuMap.put("id", o.getId());
+ menuMap.put("name", o.getName());
+ menuMap.put("url", o.getUrl());
+ menuMap.put("icon", o.getIcon());
+ menuMap.put("menus", getMenusByRecursion(o, allMenus));
+ newList.add(menuMap);
+ });
+ resultMap.put("menus", newList);
+ return resultMap;
+ }
+
+ //������������������������������������
+ private List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
+ List<List<Map<String, Object>>> resultList = new ArrayList();
+ Menu newMenu = new Menu();
+ newMenu.setParentId(menu.getId());
+
+ //������������������������������
+ List<Menu> nextLevelMenus = menus.stream()
+ .filter(o -> o.getParentId().equals(menu.getId()))
+ .collect(Collectors.toList());
+ List<Map<String, Object>> list = new ArrayList<>();
+ if (nextLevelMenus.size() > 0) {
+ //���������������������������������������������������
+ nextLevelMenus.forEach(o -> {
+ Map<String, Object> menuMap = new LinkedHashMap<>();
+ menuMap.put("id", o.getId());
+ menuMap.put("name", o.getName());
+ menuMap.put("url", o.getUrl());
+ menuMap.put("icon", o.getIcon());
+ //���������������
+ menuMap.put("menus", getMenusByRecursion(o, menus));
+ list.add(menuMap);
+ });
+ resultList.add(list);
+ }
+ return list;
+ }
+
@Override
public Map<String, Object> addUser(User user, Integer userId) {
Map<String, Object> resultMap = new HashMap<>();
--
Gitblit v1.8.0