From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +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 | 256 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 160 insertions(+), 96 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 fb42e30..70b8a57 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
@@ -9,31 +9,34 @@
import java.util.Map;
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.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;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.bo.UserBO;
+import com.moral.api.service.UserService;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.AESUtils;
+import com.moral.util.ConvertUtils;
+import com.moral.util.DateUtils;
+import com.moral.util.MD5Utils;
+import com.moral.util.RegexUtils;
+import com.moral.util.TokenUtils;
/**
* <p>
@@ -59,13 +62,13 @@
private String AESKey;
@Override
- public UserBo selectUserInfo(Map<String, Object> parameters) {
+ public UserBO selectUserInfo(Map<String, Object> parameters) {
return userMapper.selectUserInfo(parameters);
}
@Override
public Map<String, Object> login(Map<String, Object> parameters) {
- UserBo userBo = selectUserInfo(parameters);
+ UserBO userBo = selectUserInfo(parameters);
Map<String, Object> result = new HashMap<>();
//������������
if (userBo == null) {
@@ -76,7 +79,7 @@
//������������
String password = parameters.get("password").toString();
//������������
- //password = AESUtils.decrypt(password, AESKey);
+ 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());
@@ -96,24 +99,40 @@
}
//������������������
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();
+
+ //������in���
userInfo.put("userId", userBo.getId());
userInfo.put("account", userBo.getAccount());
userInfo.put("userName", userBo.getUserName());
- userInfo.put("expireTime", userBo.getExpireTime());
+ userInfo.put("email", userBo.getEmail());
+ userInfo.put("mobile", userBo.getMobile());
+ userInfo.put("wechat", userBo.getWechat());
+ userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
- userInfo.put("organizationId", userBo.getOrganizationId());
- userInfo.put("organizationName", organization.getName());
- userInfo.put("locationLevel", organization.getLocationLevel());
+
+ //������������������
+ Organization organization = userBo.getOrganization();
+ Map<String, Object> orgInfo = new LinkedHashMap<>();
+ orgInfo.put("id", userBo.getOrganizationId());
+ orgInfo.put("name", organization.getName());
+ orgInfo.put("locationLevelCode", organization.getLocationLevelCode());
+ orgInfo.put("expireTime", DateUtils.dateToDateString(organization.getExpireTime()));
+ userInfo.put("organization", orgInfo);
+
+ //���������������
+ List<Map<String, Object>> groups = new ArrayList<>();
+ for (Group group : userBo.getGroups()) {
+ HashMap<String, Object> groupMap = new LinkedHashMap<>();
+ groupMap.put("id", group.getId());
+ groupMap.put("groupName", group.getGroupName());
+ groups.add(groupMap);
+ }
userInfo.put("groups", groups);
- userInfo.putAll(getMenus(userBo.getId()));
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("userId", userBo.getId());
+ //������������������
+ userInfo.putAll(getMenus(map));
try {
//������token������������redis
String token = TokenUtils.getToken(userBo.getId().toString(), userInfo);
@@ -129,9 +148,15 @@
return result;
}
- //������userId������������������������
- private Map<String, Object> getMenus(int userId) {
- List<Menu> allMenus = menuMapper.selectUserMenu(userId);
+ @Override
+ public Map<String, Object> getMenus(Map<String, Object> parameters) {
+ List<Menu> allMenus;
+ if (parameters.containsKey("userId")) {
+ allMenus = menuMapper.selectUserMenu(Integer.parseInt(parameters.get("userId").toString()));
+ } else {
+ allMenus = menuMapper.selectOrganizationMenu(Integer.parseInt(parameters.get("orgId").toString()));
+ }
+
Map<String, Object> resultMap = new LinkedHashMap<>();
//���������������
List<Menu> oneMenu = allMenus.stream()
@@ -147,7 +172,7 @@
menuMap.put("name", o.getName());
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
- menuMap.put("menus", getMenusByRecursion(o, allMenus));
+ menuMap.put("child", getMenusByRecursion(o, allMenus));
newList.add(menuMap);
});
resultMap.put("menus", newList);
@@ -156,7 +181,6 @@
//������������������������������������
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());
//������������������������������
@@ -173,10 +197,9 @@
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
//���������������
- menuMap.put("menus", getMenusByRecursion(o, menus));
+ menuMap.put("child", getMenusByRecursion(o, menus));
list.add(menuMap);
});
- resultList.add(list);
}
return list;
}
@@ -210,7 +233,7 @@
//������������������
String password = user.getPassword();
//������������
- //password = AESUtils.decrypt(password, AESKey);
+ password = AESUtils.decrypt(password, AESKey);
if (!RegexUtils.checkPassword(password)) {
result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
@@ -224,14 +247,20 @@
}
//������������
user.setPassword(MD5Utils.saltMD5(password));
- user.setOrganizationId(Integer.parseInt(currentUserInfo.get("organizationId").toString()));
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+ user.setOrganizationId(orgId);
user.setIsAdmin(false);
//���������������������������
Date userExpireTime = user.getExpireTime();
- //���������������������������
- Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
- if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
- user.setExpireTime(currentUserExpireTime);
+ //���������������������������
+ Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (userExpireTime != null) {
+ if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
+ user.setExpireTime(orgExpireTime);
+ } else {
+ user.setExpireTime(userExpireTime);
+ }
}
userMapper.insert(user);
return result;
@@ -240,12 +269,19 @@
@Override
@Transactional
public void deleteUser(User user) {
- //������������������
+ String userId = user.getId().toString();
+ //������������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);
+ userMapper.updateById(user);
+ //������������user_group
+ UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
+ deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", userId);
+ //������redis
+ if (TokenUtils.hHasKey(userId)) {
+ String token = TokenUtils.hget(userId).toString();
+ TokenUtils.destoryToken(userId, token);
+ }
+ userGroupMapper.update(null, deleteWrapper);
}
@Override
@@ -253,78 +289,106 @@
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);
+ String account = userMapper.selectById(user.getId()).getAccount();
+ //account������������
+ user.setAccount(account);
- 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);
+ 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;
}
- //������������
+ //������MD5������
user.setPassword(MD5Utils.saltMD5(password));
- user.setOrganizationId(Integer.parseInt(currentUserInfo.get("organizationId").toString()));
+ //������������
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ user.setOrganizationId((int) orgInfo.get("id"));
user.setIsAdmin(false);
- //���������������������������
+ //������������������������������
Date userExpireTime = user.getExpireTime();
- //���������������������������
- Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
- if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
- user.setExpireTime(currentUserExpireTime);
+ //���������������������������
+ Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (userExpireTime != null) {
+ if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
+ user.setExpireTime(orgExpireTime);
+ } else {
+ user.setExpireTime(userExpireTime);
+ }
+ }
+ //������redis
+ String userId = user.getId().toString();
+ if (TokenUtils.hHasKey(userId)) {
+ String deleteToken = TokenUtils.hget(userId).toString();
+ TokenUtils.destoryToken(userId, deleteToken);
}
userMapper.updateById(user);
return result;
}
@Override
- public Map<String, Object> getUsers(Map<String, Object> parameters) {
- Map<String, Object> resultMap = new HashMap<>();
+ public Page<User> selectUsers(Map<String, Object> parameters) {
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
- if (!(boolean) currentUserInfo.get("isAdmin")) {
- resultMap.put("msg", "������������");
- return resultMap;
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("organization_id", orgInfo.get("id"))
+ .eq("is_delete", Constants.NOT_DELETE);
+ Object order = parameters.get("order");
+ Object orderType = parameters.get("orderType");
+ Object account = parameters.get("account");
+ Object userName = parameters.get("userName");
+ Object mobile = parameters.get("mobile");
+ Object email = parameters.get("mobile");
+ Object wechat = parameters.get("wechat");
+ //������������������
+ if (account != null) {
+ queryWrapper.like("account", account);
}
- if (!parameters.containsKey("userId")) {
- parameters.put("orgId", currentUserInfo.get("organizationId"));
+ if (userName != null) {
+ queryWrapper.like("user_name", userName);
}
- List<Map<String, Object>> users = userMapper.selectUsers(parameters);
- resultMap.put("users", users);
- return resultMap;
+ if (mobile != null) {
+ queryWrapper.like("mobile", mobile);
+ }
+ if (email != null) {
+ queryWrapper.like("email", email);
+ }
+ if (wechat != null) {
+ queryWrapper.like("wechat", wechat);
+ }
+
+ Integer page = (Integer) parameters.get("page");
+ Integer size = (Integer) parameters.get("size");
+ Page<User> pageData = new Page<>(page, size);
+ //������������,������create_time������
+ if (order != null && orderType != null) {
+ if (Constants.ORDER_ASC.equals(orderType)) {
+ queryWrapper.orderByAsc(ConvertUtils.toLine(order.toString()));
+ } else {
+ queryWrapper.orderByDesc(ConvertUtils.toLine(order.toString()));
+ }
+ } else {
+ queryWrapper.orderByDesc("create_time");
+ }
+ userMapper.selectPage(pageData, queryWrapper);
+
+ return pageData;
}
}
--
Gitblit v1.8.0