From b64946fb4c4b32592633ff1dc0b95a77cb440246 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 18 Mar 2021 17:15:45 +0800
Subject: [PATCH] 用户增删改查修改
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 388 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 284 insertions(+), 104 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..fb42e30 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,27 +1,39 @@
package com.moral.api.service.impl;
-import io.swagger.models.auth.In;
-
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.Date;
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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.Group;
import com.moral.api.entity.Menu;
+import com.moral.api.entity.Organization;
import com.moral.api.entity.User;
+import com.moral.api.entity.UserGroup;
+import com.moral.api.mapper.MenuMapper;
+import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserMapper;
+import com.moral.api.pojo.UserBo;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.redis.RedisUtil;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.AESUtils;
+import com.moral.util.MD5Utils;
+import com.moral.util.RegexUtils;
+import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -37,114 +49,282 @@
@Autowired
private UserMapper userMapper;
+ @Autowired
+ private MenuMapper menuMapper;
+
+ @Autowired
+ private UserGroupMapper userGroupMapper;
+
+ @Value("${AES.KEY}")
+ private String AESKey;
+
@Override
- public Map<String, Object> login(String account, String password) {
- Map<String, Object> resultMap = new HashMap<>();
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("account", account).eq("password", password).eq("is_Delete", "0");
- 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 = "���������������������";
- } 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);
- }
- resultMap.put("token", token);
- resultMap.put("msg", msg);
- return resultMap;
+ public UserBo selectUserInfo(Map<String, Object> parameters) {
+ return userMapper.selectUserInfo(parameters);
}
@Override
- public Map<String, Object> addUser(User user, Integer userId) {
+ public Map<String, Object> login(Map<String, Object> parameters) {
+ UserBo userBo = selectUserInfo(parameters);
+ Map<String, Object> result = new HashMap<>();
+ //������������
+ if (userBo == null) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return result;
+ }
+ //������������
+ String password = parameters.get("password").toString();
+ //������������
+ //password = AESUtils.decrypt(password, AESKey);
+ if (!MD5Utils.saltMD5Verify(password, userBo.getPassword())) {
+ result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
+ return result;
+ }
+ //������������������
+ if (Constants.DELETE.equals(userBo.getIsDelete())) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_IS_DELETE.getMsg());
+ return result;
+ }
+ //������������������
+ if (userBo.getExpireTime() != null && userBo.getExpireTime().getTime() < System.currentTimeMillis()) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
+ return result;
+ }
+ //������������������
+ Map<String, Object> userInfo = new LinkedHashMap<>();
+ List<Map<String, Object>> groups = new ArrayList<>();
+ for (Group group : userBo.getGroups()) {
+ HashMap<String, Object> groupMap = new HashMap<>();
+ groupMap.put("groupId", group.getId());
+ groupMap.put("groupName", group.getGroupName());
+ groups.add(groupMap);
+ }
+ Organization organization = userBo.getOrganization();
+ userInfo.put("userId", userBo.getId());
+ userInfo.put("account", userBo.getAccount());
+ userInfo.put("userName", userBo.getUserName());
+ userInfo.put("expireTime", userBo.getExpireTime());
+ userInfo.put("isAdmin", userBo.getIsAdmin());
+ userInfo.put("organizationId", userBo.getOrganizationId());
+ userInfo.put("organizationName", organization.getName());
+ userInfo.put("locationLevel", organization.getLocationLevel());
+ userInfo.put("groups", groups);
+ userInfo.putAll(getMenus(userBo.getId()));
+ try {
+ //������token������������redis
+ String token = TokenUtils.getToken(userBo.getId().toString(), userInfo);
+ Map<String, Object> data = new HashMap<>();
+ data.put("token", token);
+ data.put("user", userInfo);
+ result.put("data", data);
+ } catch (Exception e) {
+ log.error("token���������������" + e.getMessage());
+ result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
+ result.put("msg", ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
+ }
+ return result;
+ }
+
+ //������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
+ @Transactional
+ public Map<String, Object> addUser(User user, String token) {
+ Map<String, Object> result = new HashMap<>();
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
+ //������������������������
+ if (user.selectOne(queryWrapper) != null) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
+ return result;
+ }
+ //������������������
+ if (!RegexUtils.checkAccount(user.getAccount())) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_INVALID.getMsg());
+ return result;
+ }
+ //������������������
+ if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) {
+ result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
+ return result;
+ }
+ //������������������
+ String password = user.getPassword();
+ //������������
+ //password = AESUtils.decrypt(password, AESKey);
+ if (!RegexUtils.checkPassword(password)) {
+ result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
+ return result;
+ }
+ //���������������������
+ if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
+ result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
+ return result;
+ }
+ //������������
+ user.setPassword(MD5Utils.saltMD5(password));
+ user.setOrganizationId(Integer.parseInt(currentUserInfo.get("organizationId").toString()));
+ user.setIsAdmin(false);
+ //���������������������������
+ Date userExpireTime = user.getExpireTime();
+ //���������������������������
+ Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
+ if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
+ user.setExpireTime(currentUserExpireTime);
+ }
+ userMapper.insert(user);
+ return result;
+ }
+
+ @Override
+ @Transactional
+ public void deleteUser(User user) {
+ //������������������
+ user.setIsDelete(Constants.DELETE);
+ //������������������������������
+ UpdateWrapper<UserGroup> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("is_delete", Constants.DELETE).eq("user_id", user.getId());
+ userGroupMapper.update(null, updateWrapper);
+ }
+
+ @Override
+ @Transactional
+ public Map<String, Object> updateUser(User user, String token) {
+ Map<String, Object> result = new HashMap<>();
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("id", user.getId()).eq("is_delete", Constants.NOT_DELETE);
+ if (userMapper.selectOne(queryWrapper) == null) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_IS_DELETE.getMsg());
+ return result;
+ }
+ queryWrapper.clear();
+ queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
+ //������������������������
+ if (userMapper.selectOne(queryWrapper) != null) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
+ return result;
+ }
+ //������������������
+ if (!RegexUtils.checkAccount(user.getAccount())) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_INVALID.getMsg());
+ return result;
+ }
+ //������������������
+ if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) {
+ result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
+ return result;
+ }
+ //������������������
+ String password = user.getPassword();
+ //������������
+ //password = AESUtils.decrypt(password, AESKey);
+ if (!RegexUtils.checkPassword(password)) {
+ result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
+ return result;
+ }
+ //���������������������
+ if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
+ result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
+ return result;
+ }
+ //������������
+ user.setPassword(MD5Utils.saltMD5(password));
+ user.setOrganizationId(Integer.parseInt(currentUserInfo.get("organizationId").toString()));
+ user.setIsAdmin(false);
+ //���������������������������
+ Date userExpireTime = user.getExpireTime();
+ //���������������������������
+ Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
+ if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
+ user.setExpireTime(currentUserExpireTime);
+ }
+ userMapper.updateById(user);
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> getUsers(Map<String, Object> parameters) {
Map<String, Object> resultMap = new HashMap<>();
- User currentUser = userMapper.selectById(userId);
- if (!currentUser.getIsAdmin()) {
- resultMap.put("flag", false);
- resultMap.put("msg", "���������������������������");
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
+ if (!(boolean) currentUserInfo.get("isAdmin")) {
+ resultMap.put("msg", "������������");
return resultMap;
}
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("account", user.getAccount());
- userMapper.selectOne(queryWrapper);
- if (userMapper.selectOne(queryWrapper) == null) {
- user.setOrganizationId(currentUser.getOrganizationId());
- user.setExpireTime(currentUser.getExpireTime());
- userMapper.insert(user);
- resultMap.put("flag", true);
- resultMap.put("msg", "������������");
- } else {
- resultMap.put("flag", false);
- resultMap.put("msg", "���������������������������������");
+ if (!parameters.containsKey("userId")) {
+ parameters.put("orgId", currentUserInfo.get("organizationId"));
}
+ List<Map<String, Object>> users = userMapper.selectUsers(parameters);
+ resultMap.put("users", users);
return resultMap;
}
- @Override
- public Map<String, Object> deleteUser(Integer userId, Integer currentUserId) {
- Map<String, Object> resultMap = new HashMap<>();
- User currentUser = userMapper.selectById(currentUserId);
- if (!currentUser.getIsAdmin()) {
- resultMap.put("flag", false);
- resultMap.put("msg", "���������������������������");
- } else {
- User user = new User();
- user.setId(userId);
- user.setIsDelete("1");
- userMapper.updateById(user);
- resultMap.put("flag", true);
- resultMap.put("msg", "������������");
- }
- return resultMap;
- }
-
- @Override
- public Map<String, Object> updateUser(User user, Integer currentUserId) {
- Map<String, Object> resultMap = new HashMap<>();
- User currentUser = userMapper.selectById(currentUserId);
- if (!currentUser.getIsAdmin()) {
- resultMap.put("flag", false);
- resultMap.put("msg", "���������������������������");
- return resultMap;
- }
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("account", user.getAccount());
- if (userMapper.selectOne(queryWrapper) == null) {
- userMapper.updateById(user);
- resultMap.put("flag", true);
- resultMap.put("msg", "������������");
- } else {
- resultMap.put("flag", false);
- resultMap.put("msg", "������������������������������");
- }
- return resultMap;
- }
-
- @Override
- public List<User> getUsersByOrgId(Integer currentUserId) {
- User currentUser = userMapper.selectById(currentUserId);
- if (!currentUser.getIsAdmin()) {
- return null;
- }
- Map<String, Object> queryMap = new HashMap<>();
- queryMap.put("organizationId", currentUser.getOrganizationId());
- return userMapper.selectByMap(queryMap);
- }
-
- @Override
- public User getUserById(Integer userId, Integer currentUserId) {
- User currentUser = userMapper.selectById(currentUserId);
- if (!currentUser.getIsAdmin()) {
- return null;
- }
- return userMapper.selectById(userId);
- }
}
--
Gitblit v1.8.0