From 928cccb960dc1c0e354e3569ecd8e964f6d24deb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 12 Apr 2021 17:41:25 +0800
Subject: [PATCH] 用户修改具体日志
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 7 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..6ccef8c 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
@@ -7,13 +7,20 @@
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 org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+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;
@@ -24,11 +31,14 @@
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 +47,7 @@
import com.moral.util.MD5Utils;
import com.moral.util.RegexUtils;
import com.moral.util.TokenUtils;
+import com.moral.util.WebUtils;
/**
* <p>
@@ -58,8 +69,12 @@
@Autowired
private UserGroupMapper userGroupMapper;
+ @Autowired
+ private UserLogMapper userLogMapper;
+
@Value("${AES.KEY}")
private String AESKey;
+
@Override
public UserBO selectUserInfo(Map<String, Object> parameters) {
@@ -145,6 +160,14 @@
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.setIp(WebUtils.getIpAddr(request));
+ userLog.setOperateId(userBo.getId());
+ userLog.setOrganizationId(userBo.getOrganizationId());
+ userLog.setContent("������������������" + userBo.getAccount());
+ userLogMapper.insert(userLog);
return result;
}
@@ -261,8 +284,16 @@
} else {
user.setExpireTime(userExpireTime);
}
+ } else {
+ if (orgExpireTime != null) {
+ user.setExpireTime(orgExpireTime);
+ }
}
userMapper.insert(user);
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return result;
}
@@ -282,14 +313,22 @@
TokenUtils.destoryToken(userId, token);
}
userGroupMapper.update(null, deleteWrapper);
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
}
@Override
@Transactional
public Map<String, Object> updateUser(User user, String 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 +340,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 +372,10 @@
} else {
user.setExpireTime(userExpireTime);
}
+ } else {
+ if (orgExpireTime != null) {
+ user.setExpireTime(orgExpireTime);
+ }
}
//������redis
String userId = user.getId().toString();
@@ -339,6 +384,20 @@
TokenUtils.destoryToken(userId, deleteToken);
}
userMapper.updateById(user);
+
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ 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());
+
return result;
}
--
Gitblit v1.8.0