From f2f77f203fd6b054197ecaba0517a159e8b3ac8f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 30 Oct 2023 15:48:24 +0800
Subject: [PATCH] fix：补偿0问题修改
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 684 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 510 insertions(+), 174 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 8950238..f6bcba5 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,32 +1,38 @@
package com.moral.api.service.impl;
-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.stream.Collectors;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.util.AESUtils;
-import com.moral.util.MD5Utils;
-import com.moral.util.RegexUtils;
-import com.moral.util.TokenUtils;
-
+import com.moral.api.entity.*;
+import com.moral.api.mapper.*;
+import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.pojo.enums.FileTableEnum;
+import com.moral.api.pojo.vo.file.FileVo;
+import com.moral.api.service.FileTableService;
+import com.moral.api.service.UserService;
+import com.moral.api.utils.OperationLogUtils;
+import com.moral.api.utils.WechatUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
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 org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -37,77 +43,300 @@
* @since 2021-03-09
*/
@Service
+@Slf4j
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
@Autowired
private UserMapper userMapper;
@Autowired
- private GroupMapper groupMapper;
-
- @Autowired
private MenuMapper menuMapper;
@Autowired
- private OrganizationMapper organizationMapper;
+ private UserGroupMapper userGroupMapper;
+
+ @Autowired
+ private UserLogMapper userLogMapper;
+
+ @Autowired
+ private FileTableService fileTableService;
+
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
+ @Autowired
+ private ResponsibilityUnitMapper responsibilityUnitMapper;
+
@Value("${AES.KEY}")
private String AESKey;
@Override
- 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);
- User user = userMapper.selectOne(queryWrapper);
- String msg;
- if (user == null) {
- msg = "������������������";
- } else {
- 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);
- userInfo.put("expireTime", user.getExpireTime());
- userInfo.put("isAdmin", user.getIsAdmin());
- 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("msg", msg);
- return resultMap;
+ public UserBO selectUserInfo(Map<String, Object> parameters) {
+ return userMapper.selectUserInfo(parameters);
}
- //������userId������������������������
- private Map<String, Object> getMenus(int userId) {
- List<Menu> allMenus = menuMapper.selectUserMenu(userId);
+ /**
+ * ���������������
+ * @param parameters
+ * @return
+ */
+ @Override
+ @Transactional
+ public Map<String, Object> loginSmallRoutine(Map<String, Object> parameters) {
+ UserBO userBo = selectUserInfo(parameters);
+ String openId = parameters.get("openId").toString();
+ 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;
+ }
+ //������������������
+ if (Constants.DELETE.equals(userBo.getIsDelete())) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_IS_DELETE.getMsg());
+ return result;
+ }
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
+ //������������������
+ Map<String, Object> userInfo = new LinkedHashMap<>();
+ userInfo.put("userId", userBo.getId());
+ userInfo.put("account", userBo.getAccount());
+ userInfo.put("userName", userBo.getUserName());
+ userInfo.put("email", userBo.getEmail());
+ userInfo.put("mobile", userBo.getMobile());
+ userInfo.put("unitId",userBo.getUnitId());
+ userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+ userInfo.put("wechat", userBo.getWechat());
+ userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
+ userInfo.put("isAdmin", userBo.getIsAdmin());
+ userInfo.put("openid", openId);
+
+ try {
+ //������token������������redis
+ String token = TokenUtils.getTokenApp(new StringBuffer("00").append(userBo.getId().toString()).toString(),userInfo);
+ result.put("token", token);
+ result.put("userName", userBo.getUserName());
+ result.put("unitId",userBo.getUnitId());
+ result.put("userId", userBo.getId());
+ result.put("account", userBo.getAccount());
+ List<FileVo> listFile = fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value);
+ result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
+ } 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;
+ }
+ sysLog("������������������" + userBo.getAccount()+";openId:"+openId,userBo);
+ //������openId���user������
+ User user = userMapper.selectById(userBo.getId());
+ user.setOpenId(openId);
+ userMapper.updateById(user);
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> wxLogin(String code) {
+ Map<String, Object> result = new HashMap<>();
+ // ������������������������rawData
+ // ���������signature
+// JSONObject rawDataJson = JSON.parseObject(rawData);
+ // 1.������������������������code
+ // 2.������������������ ������������������������ appi + appsecret + code
+ JSONObject SessionKeyOpenId = WechatUtils.getSessionKeyOrOpenId(code);
+
+ // 3.������������������������ ���������������������
+ String openid = SessionKeyOpenId.getString("openid");
+ String sessionKey = SessionKeyOpenId.getString("session_key");
+
+ // 4.������������ ������������������������signature������������������������������signature2 = sha1(rawData + sessionKey)
+// String signature2 = DigestUtils.sha1Hex(rawData + sessionKey);
+// if (!signature.equals(signature2)) {
+// return ResultMessage.ok().message("������������������");
+// return ResultMessage.ok("������������������");
+// throw new BusinessException("������������������");
+// }
+ // 5.���������������User������������������������������������������������������������������������������������������
+ LambdaQueryWrapper<User> lqw = Wrappers.lambdaQuery();
+ lqw.eq(User::getOpenId, openid);
+ User user = userMapper.selectOne(lqw);
+ if (user == null) {
+ result.put("code", ResponseCodeEnum.USER_NOT_EXIST.getCode());
+ result.put("msg", ResponseCodeEnum.USER_NOT_EXIST.getMsg());
+ result.put("openId",openid);
+ return result;
+ // ������������������
+// String nickName = rawDataJson.getString("nickName");
+// String avatarUrl = rawDataJson.getString("avatarUrl");
+ }
+
+ Map<String, Object> userInfo = new LinkedHashMap<>();
+ userInfo.put("userId", user.getId());
+ userInfo.put("account", user.getAccount());
+ userInfo.put("userName", user.getUserName());
+ userInfo.put("email", user.getEmail());
+ userInfo.put("mobile", user.getMobile());
+ userInfo.put("unitId",user.getUnitId());
+// userInfo.put("unName",user.getAreaName());
+ userInfo.put("wechat", user.getWechat());
+ userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime()));
+ userInfo.put("isAdmin", user.getIsAdmin());
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId());
+ try {
+ //������token������������redis
+ String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);
+ result.put("token", token);
+ result.put("userName", user.getUserName());
+ result.put("unitId",user.getUnitId());
+ List<FileVo> listFile = fileTableService.list(user.getId(), FileTableEnum.APP_ALLOCATION.value);
+ result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
+ result.put("userId", user.getId());
+ result.put("account", user.getAccount());
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
+ } 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;
+ }
+ result.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ result.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ sysLog("������������������" + user.getAccount()+" ;openId:"+openid,user);
+ return result;
+ }
+
+ @Override
+ public boolean updateUserId(Integer userId) {
+ User user = userMapper.selectById(userId);
+ user.setOpenId("0");
+ userMapper.updateById(user);
+ sysLog(userId+"������������������",user);
+ return true;
+ }
+ private void sysLog(String cont,User user){
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ UserLog userLog = new UserLog();
+ userLog.setType(Constants.LOGIN_OPERTATE_APP);
+ userLog.setIp(WebUtils.getIpAddr(request));
+ userLog.setOperateId(user.getId());
+ userLog.setOrganizationId(user.getOrganizationId());
+ userLog.setContent(cont);
+ userLogMapper.insert(userLog);
+ }
+
+ @Override
+ 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<>();
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
+ //������������
+ userInfo.put("userId", userBo.getId());
+ userInfo.put("account", userBo.getAccount());
+ userInfo.put("userName", userBo.getUserName());
+ userInfo.put("email", userBo.getEmail());
+ userInfo.put("mobile", userBo.getMobile());
+ userInfo.put("unitId",userBo.getUnitId());
+ userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+ userInfo.put("wechat", userBo.getWechat());
+ userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
+ userInfo.put("isAdmin", userBo.getIsAdmin());
+
+ //������������������
+ 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);
+
+ //���������������
+ 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());
+ userInfo.put("group", groupMap);
+ }
+
+ 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);
+ result.put("token", token);
+ } 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;
+ }
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ UserLog userLog = new UserLog();
+ userLog.setType(Constants.LOGIN_OPERTATE_TYPE);
+ userLog.setIp(WebUtils.getIpAddr(request));
+ userLog.setOperateId(userBo.getId());
+ userLog.setOrganizationId(userBo.getOrganizationId());
+ userLog.setContent("������������������" + userBo.getAccount());
+ userLogMapper.insert(userLog);
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> getCurrentUserInfo() {
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ return userInfo;
+ }
+
+ @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()));
+ allMenus.removeIf(m -> "������������".equals(m.getName()));
+ }
+
Map<String, Object> resultMap = new LinkedHashMap<>();
//���������������
List<Menu> oneMenu = allMenus.stream()
@@ -120,10 +349,10 @@
oneMenu.forEach(o -> {
Map<String, Object> menuMap = new LinkedHashMap<>();
menuMap.put("id", o.getId());
- menuMap.put("name", o.getName());
+ menuMap.put("label", o.getName());
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
- menuMap.put("menus", getMenusByRecursion(o, allMenus));
+ menuMap.put("children", getMenusByRecursion(o, allMenus));
newList.add(menuMap);
});
resultMap.put("menus", newList);
@@ -132,13 +361,12 @@
//������������������������������������
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()))
+ .sorted(Comparator.comparing(Menu::getOrder))
.collect(Collectors.toList());
List<Map<String, Object>> list = new ArrayList<>();
if (nextLevelMenus.size() > 0) {
@@ -146,135 +374,243 @@
nextLevelMenus.forEach(o -> {
Map<String, Object> menuMap = new LinkedHashMap<>();
menuMap.put("id", o.getId());
- menuMap.put("name", o.getName());
+ menuMap.put("label", o.getName());
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
//���������������
- menuMap.put("menus", getMenusByRecursion(o, menus));
+ menuMap.put("children", getMenusByRecursion(o, menus));
list.add(menuMap);
});
- resultList.add(list);
}
return list;
}
@Override
- public Map<String, Object> addUser(User user, String token) {
- Map<String, Object> resultMap = new HashMap<>();
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ @Transactional
+ public Map<String, Object> addUser(User user) {
- if (!(boolean) currentUserInfo.get("isAdmin")) {
- resultMap.put("msg", "������������");
- return resultMap;
- }
+ Map<String, Object> result = new HashMap<>();
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("account", user.getAccount());
- userMapper.selectOne(queryWrapper);
- if (userMapper.selectOne(queryWrapper) != null) {
- resultMap.put("msg", "������������������");
- return resultMap;
+ queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
+ //������������������������
+ if (user.selectCount(queryWrapper) > 0) {
+ 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 (!ObjectUtils.isEmpty(user.getEmail()) && !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 (!ObjectUtils.isEmpty(user.getMobile()) && !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));
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+ user.setOrganizationId(orgId);
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 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);
+ }
+ } else {
+ if (orgExpireTime != null) {
+ user.setExpireTime(orgExpireTime);
+ }
}
userMapper.insert(user);
- return resultMap;
+ //������
+ String content = "������������������" + user.getAccount();
+ operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE);
+ 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("1");
- userMapper.updateById(user);
+ @Transactional
+ public void deleteUser(Integer userId) {
+ User user = userMapper.selectById(userId);
+ //������������user
+ UpdateWrapper<User> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", userId).set("is_delete", Constants.DELETE);
+ userMapper.update(null, updateWrapper);
+ //������user_group
+ UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
+ deleteWrapper.eq("user_id", userId);
+ userGroupMapper.delete(deleteWrapper);
+ //������redis
+ if (TokenUtils.hHasKey(userId.toString())) {
+ String token = TokenUtils.hget(userId.toString()).toString();
+ TokenUtils.destoryToken(userId.toString(), token);
}
- return resultMap;
+ //������
+ String content = "������������������" + user.getAccount();
+ operationLogUtils.insertLog(content, Constants.DELETE_OPERATE_TYPE);
}
@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;
+ @Transactional
+ public Map<String, Object> updateUser(User user) {
+ 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.getUserInfo();
+ User beforeUser = userMapper.selectById(user.getId());
+ Map<String, Object> before = JSONObject.parseObject(JSON.toJSONString(beforeUser), Map.class);
+ /*String account = beforeUser.getAccount();
+ //account������������
+ user.setAccount(account);*/
+ if (!ObjectUtils.isEmpty(user.getAccount())) {
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("account", user.getAccount());
+ if (userMapper.selectCount(queryWrapper) > 0) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
+ return result;
+ }
}
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("account", user.getAccount());
- if (userMapper.selectOne(queryWrapper) != null) {
- resultMap.put("msg", "���������������");
- return resultMap;
+
+ //������������
+ if (!ObjectUtils.isEmpty(user.getEmail()) && !RegexUtils.checkEmail(user.getEmail())) {
+ result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
+ return result;
}
- //������������������������������������
- List<String> msgs = checkUserInfo(user);
- if (!msgs.isEmpty()) {
- resultMap.put("msg", msgs);
- return resultMap;
+ //������������
+ String password = user.getPassword();
+ if (!ObjectUtils.isEmpty(password)) {
+ //������������
+ 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;
+ }
}
- //������Md5������
- user.setPassword(MD5Utils.saltMD5(user.getPassword()));
+
+ //���������������������
+ if (!ObjectUtils.isEmpty(user.getMobile()) && !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));
+ //������������
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ user.setOrganizationId((int) orgInfo.get("id"));
+ user.setIsAdmin(false);
+ //������������������������������
+ Date userExpireTime = user.getExpireTime();
+ //���������������������������
+ 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()) {
+ result.put("code", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getCode());
+ result.put("msg", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getMsg());
+ return result;
+ }
+ }
+ //������redis
+ String userId = user.getId().toString();
+ if (TokenUtils.hHasKey(userId)) {
+ String deleteToken = TokenUtils.hget(userId).toString();
+ TokenUtils.destoryToken(userId, deleteToken);
+ }
userMapper.updateById(user);
- return resultMap;
+
+ //������
+ String account = userMapper.selectById(userId).getAccount();
+ StringBuilder content = new StringBuilder("������������������" + account + "->");
+ for (String key : update.keySet()) {
+ Object afterValue = update.get(key);
+ if (!key.equals("id") && afterValue != null) {
+ //������������������
+ Object beforeValue = before.get(key);
+ content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
+ }
+ }
+ operationLogUtils.insertLog(content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ return result;
}
@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;
+ public Page<User> selectUsers(Map<String, Object> parameters) {
+ 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"))
+ .eq("is_delete", Constants.NOT_DELETE)
+ .eq("is_admin", false);
+ 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);
+ }
+
+ int page = Integer.parseInt(parameters.get("page").toString());
+ int size = Integer.parseInt(parameters.get("size").toString());
+ 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;
}
- private List<String> checkUserInfo(User user) {
- List<String> msgs = new ArrayList<>();
- //������������
- if (!RegexUtils.checkAccount(user.getAccount())) {
- msgs.add("���������������������");
- }
- //������������
- if (!RegexUtils.checkPassword(user.getPassword())) {
- msgs.add("���������������������");
- }
- //������������
- if (user.getEmail() != null) {
- if (!RegexUtils.checkEmail(user.getEmail())) {
- msgs.add("���������������������");
- }
- }
- //���������������
- if (user.getMobile() != null) {
- if (!RegexUtils.checkMobile(user.getMobile())) {
- msgs.add("������������������������");
- }
- }
- return msgs;
- }
}
--
Gitblit v1.8.0