From d671f1e6611902e2e4d59443f556c421dfc999d7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Jun 2021 11:36:49 +0800
Subject: [PATCH] screen-manage 更新后台账号更新角色日志逻辑
---
screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java | 2 +
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountRoleServiceImpl.java | 56 +++++++++++++++++++++++++++
screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java | 6 ++-
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 16 ++++++++
4 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java b/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java
index 8522a8a..930396a 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -41,12 +43,12 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
index a04c024..7db2502 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
@@ -30,4 +30,6 @@
@Transactional
Map<String,Object> deleteManageRole(Map map);
+
+ ManageRole getRoleByAccountId(Integer accountId);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountRoleServiceImpl.java
index cceb0f7..f521ccb 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountRoleServiceImpl.java
@@ -2,18 +2,30 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.moral.api.entity.ManageAccount;
import com.moral.api.entity.ManageAccountRole;
+import com.moral.api.entity.ManageRole;
+import com.moral.api.mapper.ManageAccountMapper;
import com.moral.api.mapper.ManageAccountRoleMapper;
+import com.moral.api.mapper.ManageRoleMapper;
import com.moral.api.pojo.dto.accountRole.AccountRoleDTO;
import com.moral.api.pojo.form.accountRole.AccountRoleUpdateForm;
import com.moral.api.service.ManageAccountRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.ManageAccountService;
+import com.moral.api.service.ManageRoleService;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
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.management.relation.Role;
+import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -28,6 +40,14 @@
@Autowired
ManageAccountRoleMapper manageAccountRoleMapper;
+ @Autowired
+ ManageRoleMapper manageRoleMapper;
+ @Autowired
+ ManageRoleService manageRoleService;
+ @Autowired
+ ManageAccountMapper manageAccountMapper;
+ @Autowired
+ LogUtils logUtils;
@Override
@Transactional
@@ -37,21 +57,55 @@
//������
Integer accountId = form.getAccountId();
Integer roleId = form.getRoleId();
+ //������������������������������������������
+ ManageAccount account = manageAccountMapper.selectById(accountId);
+ //������������������������������������������
+ ManageRole updateRole = null;
+ if (!ObjectUtils.isEmpty(roleId)) {
+ QueryWrapper<ManageRole> queryWrapper = new QueryWrapper();
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ queryWrapper.eq("id", roleId);
+ updateRole = manageRoleMapper.selectOne(queryWrapper);
+ }
+ //������������������������������������
+ ManageRole oldRole = manageRoleService.getRoleByAccountId(accountId);
//������������������������������������
UpdateWrapper updateWrapper = new UpdateWrapper();
updateWrapper.set("is_delete", Constants.DELETE);
updateWrapper.eq("account_id", accountId);
manageAccountRoleMapper.update(null, updateWrapper);
- if(!ObjectUtils.isEmpty(roleId)){
+ if (!ObjectUtils.isEmpty(roleId)) {
ManageAccountRole role = new ManageAccountRole();
role.setAccountId(accountId);
role.setRoleId(roleId);
manageAccountRoleMapper.insert(role);
}
+ //������������
+ insertUpdateLog(oldRole,updateRole,account);
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
+ private void insertUpdateLog(ManageRole oldRole, ManageRole updateRole, ManageAccount account) {
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(account.getUserName() + ";")
+ .append("������:" + account.getAccount() + ";")
+ .append("������:");
+
+ if(ObjectUtils.isEmpty(oldRole))
+ content.append("���->");
+ else
+ content.append(oldRole.getName()+"->");
+
+ if(ObjectUtils.isEmpty(updateRole))
+ content.append("���;");
+ else
+ content.append(updateRole.getName()+";");
+
+ logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ }
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index 6f2cb80..4877afb 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -12,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -237,6 +238,21 @@
return resultMap;
}
+ @Override
+ public ManageRole getRoleByAccountId(Integer accountId) {
+ QueryWrapper<ManageAccountRole> queryAccountRoleWrapper = new QueryWrapper<>();
+ queryAccountRoleWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryAccountRoleWrapper.eq("account_id",accountId);
+ ManageAccountRole accountRole = manageAccountRoleMapper.selectOne(queryAccountRoleWrapper);
+ if(ObjectUtils.isEmpty(accountRole))
+ return null;
+ Integer roleId = accountRole.getRoleId();
+ QueryWrapper<ManageRole> queryRoleWrapper = new QueryWrapper();
+ queryRoleWrapper.eq("is_delete", Constants.NOT_DELETE);
+ queryRoleWrapper.eq("id", roleId);
+ return manageRoleMapper.selectOne(queryRoleWrapper);
+ }
+
/**
* @Description: ���������������
* @Param: [list, menuId]list���menuId������
--
Gitblit v1.8.0