From b3204224f9ba08969dbdf383849ed91a04279156 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 21 Jun 2021 11:38:53 +0800
Subject: [PATCH] screen-manage 修复更新设备的站点不判断组织的bug
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 87 insertions(+), 19 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 70b8a57..9a82667 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,12 @@
package com.moral.api.service.impl;
+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.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
@@ -7,13 +14,13 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
-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 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;
@@ -23,12 +30,14 @@
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.bo.UserBO;
import com.moral.api.service.UserService;
+import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
@@ -37,6 +46,7 @@
import com.moral.util.MD5Utils;
import com.moral.util.RegexUtils;
import com.moral.util.TokenUtils;
+import com.moral.util.WebUtils;
/**
* <p>
@@ -58,8 +68,15 @@
@Autowired
private UserGroupMapper userGroupMapper;
+ @Autowired
+ private UserLogMapper userLogMapper;
+
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Value("${AES.KEY}")
private String AESKey;
+
@Override
public UserBO selectUserInfo(Map<String, Object> parameters) {
@@ -145,6 +162,15 @@
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
result.put("msg", ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
}
+ //������
+ 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;
}
@@ -206,7 +232,10 @@
@Override
@Transactional
- public Map<String, Object> addUser(User user, String token) {
+ public Map<String, Object> addUser(User user) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
Map<String, Object> result = new HashMap<>();
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
@@ -261,8 +290,15 @@
} else {
user.setExpireTime(userExpireTime);
}
+ } else {
+ if (orgExpireTime != null) {
+ user.setExpireTime(orgExpireTime);
+ }
}
userMapper.insert(user);
+ //������
+ String content = "������������������" + user.getAccount();
+ operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@@ -273,23 +309,34 @@
//������������user
user.setIsDelete(Constants.DELETE);
userMapper.updateById(user);
- //������������user_group
+ //������user_group
UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
- deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", userId);
+ deleteWrapper.eq("user_id", userId);
+ userGroupMapper.delete(deleteWrapper);
//������redis
if (TokenUtils.hHasKey(userId)) {
String token = TokenUtils.hget(userId).toString();
TokenUtils.destoryToken(userId, token);
}
- userGroupMapper.update(null, deleteWrapper);
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String content = "������������������" + user.getAccount();
+ operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
}
@Override
@Transactional
- public Map<String, Object> updateUser(User user, String token) {
+ public Map<String, Object> updateUser(User user) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
+ //���������������
+ Map<String, Object> update = JSONObject.parseObject(JSON.toJSONString(user), Map.class);
Map<String, Object> result = new HashMap<>();
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
- String account = userMapper.selectById(user.getId()).getAccount();
+ 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);
@@ -301,12 +348,14 @@
}
//������������
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 (password != null) {
+ //������������
+ 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;
+ }
}
//���������������������
@@ -331,6 +380,10 @@
} else {
user.setExpireTime(userExpireTime);
}
+ } else {
+ if (orgExpireTime != null) {
+ user.setExpireTime(orgExpireTime);
+ }
}
//������redis
String userId = user.getId().toString();
@@ -339,12 +392,28 @@
TokenUtils.destoryToken(userId, deleteToken);
}
userMapper.updateById(user);
+
+ //������
+ StringBuilder content = new StringBuilder("������������������" + user.getAccount() + "->");
+ 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(request, 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());
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("organization_id", orgInfo.get("id"))
@@ -387,7 +456,6 @@
queryWrapper.orderByDesc("create_time");
}
userMapper.selectPage(pageData, queryWrapper);
-
return pageData;
}
--
Gitblit v1.8.0