From 54d7eb96e071c62fa96f95b56ff8be66f7c3718e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:25 +0800
Subject: [PATCH] screen-manage 修改日志插入工具类 规范日志插入格式
---
screen-manage/src/main/java/com/moral/api/util/LogUtils.java | 27 +++
screen-manage/src/main/resources/application-moduleFormColumn.yml | 7
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 3
screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java | 3
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 1
screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java | 2
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java | 2
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 112 ++++++++------
screen-manage/src/main/java/com/moral/api/service/OrganizationService.java | 1
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 265 ++++++++++++++++++++++++--------
10 files changed, 303 insertions(+), 120 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index 66cd6bb..39abdd6 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -117,4 +117,5 @@
return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
index 697d6e1..95b08b9 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
@@ -1,6 +1,7 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
@@ -76,6 +77,7 @@
/*
* ������������
* */
+ @TableField(exist = false)
private List<ManageMenu> children;
@Override
diff --git a/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java b/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
index 768a250..417e830 100644
--- a/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
+++ b/screen-manage/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java
@@ -23,8 +23,9 @@
@ResponseBody
@ResponseStatus(HttpStatus.OK)
public ResultMessage handleException(Exception ex) {
- log.error(ex.getMessage());
+ // log.error(ex.getMessage());
ex.printStackTrace();
+
return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ResponseCodeEnum.FAIL.getMsg());
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
index 255a0e3..c708c49 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
@@ -45,7 +45,7 @@
ObjectUtils.isEmpty(email) &&
ObjectUtils.isEmpty(mobile) &&
ObjectUtils.isEmpty(wechat) &&
- ObjectUtils.isEmpty(roleIds)
+ null == roleIds
)
return false;
return true;
diff --git a/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java b/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
index be86943..eed2bfc 100644
--- a/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
@@ -54,4 +54,5 @@
*/
OrganizationQueryDTO queryOrganization(OrganizationQueryForm organizationQueryForm);
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index 9d89da3..5b50ee5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -1,5 +1,7 @@
package com.moral.api.service.impl;
+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,14 +26,19 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
import com.moral.api.service.ManageMenuService;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
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.*;
/**
@@ -43,6 +50,7 @@
* @since 2021-03-09
*/
@Service
+@ConfigurationProperties(prefix = "log-aspect")
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {
@@ -54,15 +62,22 @@
ManageMenuService manageMenuService;
@Autowired
ManageAccountRoleMapper manageAccountRoleMapper;
+ @Autowired
+ LogUtils logUtils;
+ Map<String, String> manageAccountFormMap;
+
+ public void setManageAccountFormMap(Map<String, String> manageAccountFormMap) {
+ this.manageAccountFormMap = manageAccountFormMap;
+ }
/**
- * @Description: ������������
- * @Param: [loginForm]
- * @return: com.moral.api.pojo.dto.login.LoginDTO
- * @Author: ���������
- * @Date: 2021/3/30
- */
+ * @Description: ������������
+ * @Param: [loginForm]
+ * @return: com.moral.api.pojo.dto.login.LoginDTO
+ * @Author: ���������
+ * @Date: 2021/3/30
+ */
@Override
public LoginDTO login(LoginForm loginForm) {
LoginDTO loginDTO = new LoginDTO();
@@ -122,6 +137,12 @@
loginDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
loginDTO.setAccountInfoDTO(accountInfoDTO);
loginDTO.setToken(token);
+
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append(manageAccount.getUserName()).append("���������������������;");
+ logUtils.saveLoginForManage(request, content.toString(), manageAccount.getId(), manageAccount.getUserName());
return loginDTO;
}
@@ -196,6 +217,14 @@
accountDTO.setRoles(roles);
accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(manageAccount.getUserName() + ";")
+ .append("id���" + manageAccount.getId() + ";");
+ logUtils.saveOperationForManage(request, content.toString());
+
return accountDTO;
}
@@ -274,70 +303,6 @@
}
/**
- * @Description: ������������������
- * @Param: [accountUpdateRequest]
- * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
- * @Author: ���������
- * @Date: 2021/3/16
- */
- @Override
- @Transactional
- public AccountDTO updateAccount(AccountUpdateForm accountUpdateForm) {
- AccountDTO accountDTO = new AccountDTO();
- //������
- ManageAccount manageAccount = accountUpdateForm.formConvertEntity();
- List<Integer> roleIds = accountUpdateForm.getRoleIds();
-
- //������������������������������������
- QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
- ManageAccount exitManageAccount = new ManageAccount();
- exitManageAccount.setId(manageAccount.getId());
- exitManageAccount.setIsDelete(Constants.NOT_DELETE);
- exitWrapper.setEntity(exitManageAccount);
- List<ManageAccount> manageAccounts = manageAccountMapper.selectList(exitWrapper);
- if (ObjectUtils.isEmpty(manageAccounts)) {
- accountDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
- accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
- return accountDTO;
- }
-
- //������ManageAccount���
- manageAccountMapper.updateById(manageAccount);
-
- //���������������������������������ManageAccountRole���
- /*
- * ������roleIds���null������������������������������������������
- * ������roleIds���������������������������������������������������
- * ������roleIds���������������������������������������������
- * */
- List<ManageRole> roles = null;
- if (roleIds != null) {
- UpdateWrapper<ManageAccountRole> deleteWrapper = new UpdateWrapper<>();
- deleteWrapper.eq("account_id", manageAccount.getId()).set("is_delete", Constants.DELETE);
- manageAccountRoleMapper.update(null, deleteWrapper);
- /*������������������*/
- for (Integer roleId : roleIds) {
- ManageAccountRole manageAccountRole = new ManageAccountRole();
- manageAccountRole.setAccountId(manageAccount.getId());
- manageAccountRole.setRoleId(roleId);
- manageAccountRoleMapper.insert(manageAccountRole);
- }
- //������������������������
- if (roleIds.size() != 0)
- roles = manageRoleMapper.selectBatchIds(roleIds);
- } else {
- roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
- }
- accountDTO.setRoles(roles);
- //������������������
- accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
- accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- accountDTO.setAccount(manageAccountMapper.selectById(manageAccount.getId()));
- return accountDTO;
- }
-
-
- /**
* @Description: ������������������
* @Param: [accountDeleteRequest]
* @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
@@ -375,8 +340,168 @@
accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
accountDTO.setAccount(existManageAccount);
+
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(existManageAccount.getUserName() + ";")
+ .append("id���" + existManageAccount.getId() + ";");
+ logUtils.saveOperationForManage(request, content.toString());
+
return accountDTO;
}
+ /**
+ * @Description: ������������������
+ * @Param: [accountUpdateRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
+ @Override
+ @Transactional
+ public AccountDTO updateAccount(AccountUpdateForm accountUpdateForm) {
+ AccountDTO accountDTO = new AccountDTO();
+ //������
+ ManageAccount manageAccount = accountUpdateForm.formConvertEntity();
+ List<Integer> roleIds = accountUpdateForm.getRoleIds();
+
+ //������������������������������������
+ QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
+ ManageAccount exitManageAccount = new ManageAccount();
+ exitManageAccount.setId(manageAccount.getId());
+ exitManageAccount.setIsDelete(Constants.NOT_DELETE);
+ exitWrapper.setEntity(exitManageAccount);
+ exitManageAccount = manageAccountMapper.selectOne(exitWrapper);
+ if (ObjectUtils.isEmpty(exitManageAccount)) {
+ accountDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return accountDTO;
+ }
+
+ //������ManageAccount���
+ Map manageAccountMap = JSONObject.parseObject(JSON.toJSONString(manageAccount),Map.class);//���������Map���������������������������
+ if (manageAccountMap.size()>2) {//������������account������������������������������������������
+ manageAccountMapper.updateById(manageAccount);
+ }
+ //������������������������
+ manageAccount = manageAccountMapper.selectById(manageAccount.getId());
+ //������������������������������
+ List<ManageRole> oldRoles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
+
+ //���������������������������������ManageAccountRole���
+ /*
+ * ������roleIds���null������������������������������������������
+ * ������roleIds���������������������������������������������������
+ * ������roleIds���������������������������������������������
+ * */
+ List<ManageRole> roles = null;
+ if (roleIds != null) {
+ UpdateWrapper<ManageAccountRole> deleteWrapper = new UpdateWrapper<>();
+ deleteWrapper.eq("account_id", manageAccount.getId()).set("is_delete", Constants.DELETE);
+ manageAccountRoleMapper.update(null, deleteWrapper);
+ /*������������������*/
+ for (Integer roleId : roleIds) {
+ ManageAccountRole manageAccountRole = new ManageAccountRole();
+ manageAccountRole.setAccountId(manageAccount.getId());
+ manageAccountRole.setRoleId(roleId);
+ manageAccountRoleMapper.insert(manageAccountRole);
+ }
+ //������������������������
+ if (roleIds.size() != 0)
+ roles = manageRoleMapper.selectBatchIds(roleIds);
+ } else {
+ roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
+ }
+ accountDTO.setRoles(roles);
+ //������������������
+ accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ accountDTO.setAccount(manageAccount);
+
+ //������������������
+ insertUpdateLog(accountUpdateForm, exitManageAccount, oldRoles);
+
+ return accountDTO;
+ }
+
+ /**
+ * @Description: ���������������������������
+ * @Param: [form, newAccount, oldAccount]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/8
+ */
+ private void insertUpdateLog(AccountUpdateForm updateForm, ManageAccount oldAccount, List<ManageRole> oldRoles) {
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(oldAccount.getUserName() + ";")
+ .append("id���" + oldAccount.getId() + ";");
+ //������������Map,���������������������������������
+ Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
+ Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldAccount), Map.class);
+ //������������������������Map���������������������������
+ Set<String> keys = manageAccountFormMap.keySet();
+ for (String key : keys) {
+ String value = manageAccountFormMap.get(key);//���������������������
+ if ("password".equals(key)) {//������������������������������������������
+ if (!ObjectUtils.isEmpty(updateForm.getPassword())) {//���������������������������������
+ content.append("���������������;");
+ }
+ } else if ("roleIds".equals(key)) {//������������������������Id���������������������
+ List<Integer> newRoleIds = updateForm.getRoleIds();
+
+ if (newRoleIds != null && 0 == newRoleIds.size()) {//���������������������������������������������������������������
+ content.append("���������������������;");
+ }
+ if ((newRoleIds != null) && (newRoleIds.size() != 0)) {//���������������������������������������������null���������������������������
+ StringBuilder oldRolesName = new StringBuilder("���");
+ StringBuilder newRolesName = new StringBuilder("���");
+
+ List<ManageRole> newRoles = null;
+ if (!ObjectUtils.isEmpty(updateForm.getRoleIds())) {
+ newRoles = manageRoleMapper.selectBatchIds(updateForm.getRoleIds());
+ }
+
+ if (!ObjectUtils.isEmpty(oldRoles)) {
+ oldRolesName.deleteCharAt(oldRolesName.length()-1);//������ "���"
+ oldRolesName.append("[");
+ for (ManageRole role : oldRoles) {
+ oldRolesName.append(role.getName() + ",");
+ }
+ oldRolesName.deleteCharAt(oldRolesName.length() - 1);//������������������������
+ oldRolesName.append("]");
+ }
+
+ if (!ObjectUtils.isEmpty(newRoles)) {
+ newRolesName.deleteCharAt(newRolesName.length()-1);//������ "���"
+ newRolesName.append("[");
+ for (ManageRole role : newRoles) {
+ newRolesName.append(role.getName() + ",");
+ }
+ newRolesName.deleteCharAt(newRolesName.length() - 1);//������������������������
+ newRolesName.append("]");
+ }
+ //������������content
+ content.append(value+":"+oldRolesName + "->" + newRolesName + ";");
+ }
+ } else {//������������������
+ if (newParameters.get(key) != null) {
+ String newValue = "���";
+ String oldValue = "���";
+ if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
+ newValue = String.valueOf(newParameters.get(key));
+ }
+ if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
+ oldValue = String.valueOf(oldParameters.get(key));
+ }
+ content.append(value + ":" + oldValue + "->" + newValue + ";");
+ }
+ }
+ }
+ logUtils.saveOperationForManage(request, content.toString());
+ }
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
index 75a4dfb..f969784 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
@@ -127,6 +127,8 @@
@Override
public List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles) {
List<ManageMenu> allMenus = manageMenuMapper.getAllMenusByRoles(roles);
+ if(ObjectUtils.isEmpty(allMenus))
+ return null;
Map<Integer, ManageMenu> menusMap = new HashMap<>();
for (ManageMenu menu : allMenus) {
menu.setChildren(new ArrayList<>());//���������
@@ -135,6 +137,7 @@
for (ManageMenu menu : allMenus) {
combinationParentChildrenMenus(menusMap, menu);
}
+
//������������������������������������parentId������0������������������������
allMenus.removeIf(new Predicate<ManageMenu>() {
@Override
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 705f087..21cc479 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -108,7 +108,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(organization.getName());
+ content.append("������������������").append(organization.getName()+";");
logUtils.saveOperationForManage(request, content.toString());
return organizationDTO;
}
@@ -169,50 +169,7 @@
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- StringBuilder content = new StringBuilder();
- content.append("������������������").append(organization.getName()).append(";");
- //������������������Map
- Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(organizationUpdateForm), Map.class);
- Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(existOrganization), Map.class);
- Set<String> keys = organizationFormMap.keySet();
- for (String key : keys) {
- String value = organizationFormMap.get(key);
- if ("parentName".equals(key)) {//���������������������������
- if (organizationUpdateForm.getParentId() != null) {//������������������������������������
- String oldParentName = "���";
- String newParentName = "���";
- if (!existOrganization.getParentId().equals(0)) {
- oldParentName = organizationMapper.selectById(existOrganization.getParentId()).getName();
- }
- if (!organization.getParentId().equals(0)) {
- newParentName = organizationMapper.selectById(organization.getParentId()).getName();
- }
- content.append(value + ":" + oldParentName + "->" + newParentName + ";");
- }
- } else if ("expireTime".equals(key)) {//expireTime������������������������
- if (organizationUpdateForm.getExpireTime() != null) {
- Date oldExpireTime = existOrganization.getExpireTime();
- Date newExpireTime = organization.getExpireTime();
- String oldExpireTimeStr = DateUtils.dateToDateString(oldExpireTime, "yyyy-MM-dd");
- String newExpireTimeStr = DateUtils.dateToDateString(newExpireTime, "yyyy-MM-dd");
- content.append(value + ":" + oldExpireTimeStr + "->" + newExpireTimeStr + ";");
- }
- } else {//������������������
- if (newParameters.get(key) != null) {
- String newValue = "���";
- String oldValue = "���";
- if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
- newValue = String.valueOf(newParameters.get(key));
- }
- if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
- oldValue = String.valueOf(oldParameters.get(key));
- }
- content.append(value + ":" + oldValue + "->" + newValue + ";");
- }
- }
- }
- logUtils.saveOperationForManage(request, content.toString());
+ insertUpdateLog(organizationUpdateForm,organization,existOrganization);
return organizationDTO;
}
@@ -267,9 +224,9 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(existOrganization.getName());
+ content.append("������������������").append(existOrganization.getName()+";");
if(form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG))
- content.append("���������������������");
+ content.append("���������������������;");
logUtils.saveOperationForManage(request, content.toString());
return dto;
@@ -360,6 +317,7 @@
return dto;
}
+
/**
* @Description: ���organization���address���������provinceName cityName areaName������������
* @Param: [organization]
@@ -367,7 +325,7 @@
* @Author: ���������
* @Date: 2021/4/2
*/
- public void changeAddressByOrganization(Organization organization) {
+ private void changeAddressByOrganization(Organization organization) {
String provinceName = organization.getProvinceName();
String cityName = organization.getCityName();
String areaName = organization.getAreaName();
@@ -385,4 +343,62 @@
organization.setAddress(newAddress.toString());
}
+
+ /**
+ * @Description: ���������������������������
+ * @Param: [updateForm, newOrganization, oldOrganization]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/8
+ */
+ private void insertUpdateLog(OrganizationUpdateForm updateForm,Organization newOrganization,Organization oldOrganization){
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(oldOrganization.getName()).append(";");
+ //������������Map,���������������������������������
+ Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
+ Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldOrganization), Map.class);
+ //������������������������Map���������������������������
+ Set<String> keys = organizationFormMap.keySet();
+ for (String key : keys) {
+ String value = organizationFormMap.get(key);//���������������������
+ if ("parentName".equals(key)) {//���������������������������
+ if (updateForm.getParentId() != null) {//������������������������������������
+ String oldParentName = "���";
+ String newParentName = "���";
+ if (!oldOrganization.getParentId().equals(0)) {
+ oldParentName = organizationMapper.selectById(oldOrganization.getParentId()).getName();
+ }
+ if (!newOrganization.getParentId().equals(0)) {
+ newParentName = organizationMapper.selectById(newOrganization.getParentId()).getName();
+ }
+ content.append(value + ":" + oldParentName + "->" + newParentName + ";");
+ }
+ } else if ("expireTime".equals(key)) {//expireTime������������������������
+ if (updateForm.getExpireTime() != null) {
+ Date oldExpireTime = oldOrganization.getExpireTime();
+ Date newExpireTime = newOrganization.getExpireTime();
+ String oldExpireTimeStr = DateUtils.dateToDateString(oldExpireTime, "yyyy-MM-dd");
+ String newExpireTimeStr = DateUtils.dateToDateString(newExpireTime, "yyyy-MM-dd");
+ content.append(value + ":" + oldExpireTimeStr + "->" + newExpireTimeStr + ";");
+ }
+ } else {//������������������
+ if (newParameters.get(key) != null) {
+ String newValue = "���";
+ String oldValue = "���";
+ if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
+ newValue = String.valueOf(newParameters.get(key));
+ }
+ if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
+ oldValue = String.valueOf(oldParameters.get(key));
+ }
+ content.append(value + ":" + oldValue + "->" + newValue + ";");
+ }
+ }
+ }
+ logUtils.saveOperationForManage(request, content.toString());
+ }
+
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
index 1a03721..90c800a 100644
--- a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
@@ -7,6 +7,7 @@
import com.moral.util.TokenUtils;
import com.moral.util.WebUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,13 @@
@Autowired
public ManageLogMapper manageLogMapper;
+ /**
+ * @Description: ������������������
+ * @Param: [request, content]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/8
+ */
@Transactional
public void saveOperationForManage(HttpServletRequest request, String content) {
String token = request.getHeader("token");
@@ -35,10 +43,29 @@
String ip = WebUtils.getIpAddr(request);
ManageLog log = new ManageLog();
+ log.setUserName(userName);
log.setAccountId(id);
log.setIp(ip);
log.setContent(content);
+ manageLogMapper.insert(log);
+ }
+
+ /**
+ * @Description: ������������������������
+ * @Param: [request, content, id, userName]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/8
+ */
+ @Transactional
+ public void saveLoginForManage(HttpServletRequest request,String content,Integer id,String userName){
+ ManageLog log = new ManageLog();
+ String ip = WebUtils.getIpAddr(request);
+
+ log.setAccountId(id);
log.setUserName(userName);
+ log.setIp(ip);
+ log.setContent(content);
manageLogMapper.insert(log);
}
}
diff --git a/screen-manage/src/main/resources/application-moduleFormColumn.yml b/screen-manage/src/main/resources/application-moduleFormColumn.yml
index 27e2860..1faddd1 100644
--- a/screen-manage/src/main/resources/application-moduleFormColumn.yml
+++ b/screen-manage/src/main/resources/application-moduleFormColumn.yml
@@ -12,6 +12,13 @@
email: ������
wechat: ������
expireTime: ������������
+ manage-account-form-map:
+ userName: ������
+ password: ������
+ email: ������
+ mobile: ���������
+ wechat: ������
+ roleIds: ������
--
Gitblit v1.8.0