From c90b6e135f2f609ba187e243e37ae37d3da6ddee Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Apr 2021 17:32:41 +0800
Subject: [PATCH] 大屏web端操作日志功能
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 336 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 225 insertions(+), 111 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 e30cd14..755f741 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
@@ -10,18 +10,22 @@
import java.util.stream.Collectors;
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.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.mapper.GroupMapper;
+import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.MenuMapper;
-import com.moral.api.mapper.OrganizationMapper;
+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;
@@ -30,6 +34,7 @@
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>
@@ -48,48 +53,94 @@
@Autowired
private MenuMapper menuMapper;
+ @Autowired
+ private UserGroupMapper userGroupMapper;
+
+ @Value("${AES.KEY}")
+ private String AESKey;
+
@Override
- public User selectUserInfo(Map<String, Object> parameters) {
+ public UserBO selectUserInfo(Map<String, Object> parameters) {
return userMapper.selectUserInfo(parameters);
}
@Override
- public Map<String, Object> login(User user) {
- Map<String, Object> resultMap = new LinkedHashMap<>();
+ 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 : user.getGroups()) {
+ 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 = user.getOrganization();
- userInfo.put("userId", user.getId());
- userInfo.put("account", user.getAccount());
- userInfo.put("userName", user.getUserName());
- userInfo.put("expireTime", user.getExpireTime());
- userInfo.put("isAdmin", user.getIsAdmin());
- userInfo.put("organizationId", user.getOrganizationId());
+ 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(user.getId()));
+ Map<String, Object> map = new HashMap<>();
+ map.put("userId", userBo.getId());
+ userInfo.putAll(getMenus(map));
try {
//������token������������redis
- String token = TokenUtils.getToken(user.getId().toString(), userInfo);
- resultMap.put("token", token);
+ 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());
+ log.error("token���������������" + e.getMessage());
+ result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
+ result.put("msg", ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
}
- resultMap.putAll(userInfo);
- return resultMap;
+ 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()
@@ -114,10 +165,8 @@
//������������������������������������
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()))
@@ -135,125 +184,190 @@
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> resultMap = new HashMap<>();
+ 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());
- if (userMapper.selectOne(queryWrapper) != null) {
- resultMap.put("msg", "������������������");
- return resultMap;
+ 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;
}
- //������������������������������������
- List<String> msgs = checkUserInfo(user);
- if (!msgs.isEmpty()) {
- resultMap.put("msg", msgs);
- return resultMap;
+ //������������������
+ 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;
}
//������������
- String password = MD5Utils.saltMD5(user.getPassword());
- user.setPassword(password);
+ user.setPassword(MD5Utils.saltMD5(password));
+ user.setOrganizationId((int) currentUserInfo.get("organizationId"));
user.setIsAdmin(false);
- user.setOrganizationId(Integer.parseInt(currentUserInfo.get("organizationId").toString()));
//���������������������������
Date userExpireTime = user.getExpireTime();
//���������������������������
- Date expireTime = (Date) currentUserInfo.get("expireTime");
- if (userExpireTime == null || userExpireTime.getTime() > expireTime.getTime()) {
- user.setExpireTime(expireTime);
+ Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
+ if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
+ user.setExpireTime(currentUserExpireTime);
}
userMapper.insert(user);
- return resultMap;
+ return result;
}
@Override
- public Map<String, Object> deleteUser(int userId, String token) {
- Map<String, Object> resultMap = new HashMap<>();
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
- if (!(boolean) currentUserInfo.get("isAdmin")) {
- resultMap.put("msg", "������������");
- } else {
- User user = new User();
- user.setId(userId);
- user.setIsDelete(Constants.DELETE);
- userMapper.updateById(user);
- }
- return resultMap;
- }
-
- @Override
- public Map<String, Object> updateUser(User user, String token) {
- Map<String, Object> resultMap = new HashMap<>();
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
- if (!(boolean) currentUserInfo.get("isAdmin")) {
- resultMap.put("msg", "������������");
- return resultMap;
- }
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("account", user.getAccount());
- if (userMapper.selectOne(queryWrapper) != null) {
- resultMap.put("msg", "���������������");
- return resultMap;
- }
- //������������������������������������
- List<String> msgs = checkUserInfo(user);
- if (!msgs.isEmpty()) {
- resultMap.put("msg", msgs);
- return resultMap;
- }
- //������Md5������
- user.setPassword(MD5Utils.saltMD5(user.getPassword()));
+ @Transactional
+ public void deleteUser(User user) {
+ String userId = user.getId().toString();
+ //������������user
+ user.setIsDelete(Constants.DELETE);
userMapper.updateById(user);
- return resultMap;
+ //������������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
- public Map<String, Object> getUsers(Map<String, Object> parameters) {
- Map<String, Object> resultMap = new HashMap<>();
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
- if (!(boolean) currentUserInfo.get("isAdmin")) {
- resultMap.put("msg", "������������");
- return resultMap;
+ @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.ne("id", user.getId())
+ .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 (!parameters.containsKey("userId")) {
- parameters.put("orgId", currentUserInfo.get("organizationId"));
- }
- List<Map<String, Object>> users = userMapper.selectUsers(parameters);
- resultMap.put("users", users);
- return resultMap;
- }
-
- private List<String> checkUserInfo(User user) {
- List<String> msgs = new ArrayList<>();
- //������������
+ //������������������
if (!RegexUtils.checkAccount(user.getAccount())) {
- msgs.add("���������������������");
+ result.put("code", ResponseCodeEnum.ACCOUNT_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_INVALID.getMsg());
+ return result;
}
- //������������
- if (!RegexUtils.checkPassword(user.getPassword())) {
- msgs.add("���������������������");
+ //������������������
+ if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) {
+ result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
+ return result;
}
- //������������
- if (user.getEmail() != null) {
- if (!RegexUtils.checkEmail(user.getEmail())) {
- msgs.add("���������������������");
- }
+ //������������������
+ 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) {
- if (!RegexUtils.checkMobile(user.getMobile())) {
- msgs.add("������������������������");
- }
+
+ //���������������������
+ if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
+ result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
+ return result;
}
- return msgs;
+ //������MD5������
+ user.setPassword(MD5Utils.saltMD5(password));
+ user.setOrganizationId((int) currentUserInfo.get("organizationId"));
+ user.setIsAdmin(false);
+ //������������������������������
+ Date userExpireTime = user.getExpireTime();
+ //���������������������������
+ Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
+ if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
+ user.setExpireTime(currentUserExpireTime);
+ }
+ //������redis
+ String userId = user.getId().toString();
+ if (TokenUtils.hHasKey(userId)) {
+ String deleterToken = TokenUtils.hget(userId).toString();
+ TokenUtils.destoryToken(userId, deleterToken);
+ }
+ userMapper.updateById(user);
+ return result;
}
+ @Override
+ public Page<User> selectUsers(Map<String, Object> parameters) {
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
+ Object organizationId = currentUserInfo.get("organizationId");
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("organization_id", organizationId)
+ .eq("is_delete", Constants.NOT_DELETE);
+ Object order = parameters.get("order");
+ 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 (userName != null) {
+ queryWrapper.like("user_name", userName);
+ }
+ 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);
+ //������������,������id������
+ if (order == null) {
+ queryWrapper.orderByAsc("id");
+ } else {
+ queryWrapper.orderByAsc(order.toString(), "id");
+ }
+ userMapper.selectPage(pageData, queryWrapper);
+ return pageData;
+ }
}
--
Gitblit v1.8.0