From 85fc9222817d21d309eaa5dae127d235c309d1e9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Oct 2022 11:01:04 +0800
Subject: [PATCH] 修改浑南区同比数据
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 286 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 191 insertions(+), 95 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 fe6e20a..a47ccf5 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,5 +1,14 @@
package com.moral.api.service.impl;
+import lombok.extern.slf4j.Slf4j;
+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 java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
@@ -7,34 +16,39 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
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.entity.UserLog;
import com.moral.api.mapper.MenuMapper;
import com.moral.api.mapper.UserGroupMapper;
+import com.moral.api.mapper.UserLogMapper;
import com.moral.api.mapper.UserMapper;
-import com.moral.api.pojo.UserBO;
+import com.moral.api.pojo.bo.UserBO;
import com.moral.api.service.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.utils.OperationLogUtils;
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;
-
-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.moral.util.WebUtils;
/**
* <p>
@@ -45,6 +59,7 @@
* @since 2021-03-09
*/
@Service
+@Slf4j
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
@Autowired
@@ -55,6 +70,12 @@
@Autowired
private UserGroupMapper userGroupMapper;
+
+ @Autowired
+ private UserLogMapper userLogMapper;
+
+ @Autowired
+ private OperationLogUtils operationLogUtils;
@Value("${AES.KEY}")
private String AESKey;
@@ -97,39 +118,66 @@
}
//������������������
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("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());
- userInfo.put("groups", groups);
+
+ //������������������
+ 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);
- Map<String, Object> data = new HashMap<>();
- data.put("token", token);
- data.put("user", userInfo);
- result.put("data", data);
+ 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
@@ -139,6 +187,7 @@
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<>();
@@ -153,10 +202,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);
@@ -170,6 +219,7 @@
//������������������������������
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) {
@@ -177,11 +227,11 @@
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);
});
}
@@ -190,151 +240,193 @@
@Override
@Transactional
- public Map<String, Object> addUser(User user, String token) {
+ public Map<String, Object> addUser(User user) {
+
Map<String, Object> result = new HashMap<>();
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
//������������������������
- if (user.selectOne(queryWrapper) != null) {
+ if (user.selectCount(queryWrapper) > 0) {
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())) {
+
+ //������������
+ 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);
+ 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())) {
+ //���������������
+ 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;
}
//������������
user.setPassword(MD5Utils.saltMD5(password));
- user.setOrganizationId((int) currentUserInfo.get("organizationId"));
+ 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);
+ }
+ } else {
+ if (orgExpireTime != null) {
+ user.setExpireTime(orgExpireTime);
+ }
}
userMapper.insert(user);
+ //������
+ String content = "������������������" + user.getAccount();
+ operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@Override
@Transactional
- public void deleteUser(User user) {
- String userId = user.getId().toString();
+ public void deleteUser(Integer userId) {
+ User user = userMapper.selectById(userId);
//������������user
- user.setIsDelete(Constants.DELETE);
- userMapper.updateById(user);
- //������������user_group
+ 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.set("is_delete", Constants.DELETE).eq("user_id", userId);
- //������redis
- if (TokenUtils.hHasKey(userId)) {
- String token = TokenUtils.hget(userId).toString();
- TokenUtils.destoryToken(userId, token);
+ 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);
}
- userGroupMapper.update(null, deleteWrapper);
+ //������
+ String content = "������������������" + user.getAccount();
+ operationLogUtils.insertLog(content, Constants.DELETE_OPERATE_TYPE);
}
@Override
@Transactional
- public Map<String, Object> updateUser(User user, String token) {
+ public Map<String, Object> updateUser(User user) {
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;
+ //���������������
+ 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;
+ }
}
- //������������������
- 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())) {
+
+ //������������
+ 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();
- if (password != null) {
+ if (!ObjectUtils.isEmpty(password)) {
//������������
- //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())) {
+ 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));
- user.setOrganizationId((int) currentUserInfo.get("organizationId"));
+ //������������
+ 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()) {
+ 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 deleterToken = TokenUtils.hget(userId).toString();
- TokenUtils.destoryToken(userId, deleterToken);
+ String deleteToken = TokenUtils.hget(userId).toString();
+ TokenUtils.destoryToken(userId, deleteToken);
}
userMapper.updateById(user);
+
+ //������
+ 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 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");
+ 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", organizationId)
- .eq("is_delete", Constants.NOT_DELETE);
+ 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");
@@ -357,14 +449,18 @@
queryWrapper.like("wechat", wechat);
}
- Integer page = (Integer) parameters.get("page");
- Integer size = (Integer) parameters.get("size");
+ int page = Integer.parseInt(parameters.get("page").toString());
+ int size = Integer.parseInt(parameters.get("size").toString());
Page<User> pageData = new Page<>(page, size);
- //������������,������id������
- if (order == null) {
- queryWrapper.orderByAsc("id");
+ //������������,������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.orderByAsc(order.toString(), "id");
+ queryWrapper.orderByDesc("create_time");
}
userMapper.selectPage(pageData, queryWrapper);
return pageData;
--
Gitblit v1.8.0