KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】 用户日志

Browse Source
This commit is contained in:
bupengxiang
2023-08-01 15:13:13 +08:00
parent 81779422bb
commit 4e5bf36da4
2 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
+25
View File
@@ -1,6 +1,7 @@
package com.jero.common.aspect;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.PropertyFilter;
import com.jero.common.api.dto.LogDTO;
import com.jero.common.api.vo.Results;
@@ -81,6 +82,30 @@ public class AutoLogAspect {
}
//注解上的描述,操作日志内容
dto.setLogType(syslog.logType());
if ("user".equals(content)){
if (syslog.operateType() == 2){
Object result = ((Results) obj).getResult();
String s = JSONObject.toJSONString(result);
JSONObject jsonObject = JSON.parseObject(s);
String id =(String)jsonObject.get("id");
content = "新增用户，id："+id;
}else if (syslog.operateType() == 3){
Object result = ((Results) obj).getResult();
String s = JSONObject.toJSONString(result);
JSONObject jsonObject = JSON.parseObject(s);
String id =(String)jsonObject.get("id");
content = "修改，id："+id;
}else if (syslog.operateType() == 4){
String message = ((Results) obj).getMessage();
String result = (String)((Results) obj).getResult();
if ("删除用户成功".equals(message)){
content = "删除用户，id："+result;
}else {
content = "批量删除用户，ids："+result;
}
}
}
dto.setLogContent(content);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+13 -26
View File
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
@@ -165,10 +166,9 @@ public class SysUserController {
@RequiresPermissions("user:add")
@PostMapping("/add")
@AutoLog(operateType = 2,value = "user")
public Results<Object> add(@RequestBody JSONObject jsonObject) {
try {
//开始时间
long startTime = System.currentTimeMillis();
String selectedRoles = jsonObject.getString(SELECTED_ROLES);
String selectedDeparts = jsonObject.getString("selecteddeparts");
String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
@@ -181,11 +181,7 @@ public class SysUserController {
String id = UUID.randomUUID().toString().replace("-", "");
user.setId(id);
sysUserService.saveUser(user, selectedRoles, selectedDeparts);
long endTime = System.currentTimeMillis();
long costTime = endTime - startTime;
baseCommonService.addLog("新增用户，id： " +id ,CommonConstant.LOG_TYPE_2, 2,null,
costTime);
return Results.OK(OPTION_SUCCESS);
return Results.OK(OPTION_SUCCESS,user);
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
return Results.error("操作失败");
@@ -225,6 +221,7 @@ public class SysUserController {
@RequiresPermissions("user:edit")
@PostMapping("/edit")
@AutoLog(operateType = 3,value = "user")
public Results<SysUser> edit(@RequestBody JSONObject jsonObject) {
String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
String roles = jsonObject.getString(SELECTED_ROLES);
@@ -235,17 +232,11 @@ public class SysUserController {
if(sysUser==null) {
return Results.error(INEXISTENCE);
}else {
//开始时间
long startTime = System.currentTimeMillis();
SysUser user = getSysUser(jsonObject, rsaPrivateKey, sysUser);
// 修改用户走一个service 保证事务
sysUserService.editUser(user, roles, departs);
//结束时间
long endTime = System.currentTimeMillis();
long costTime = endTime - startTime;
baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 3,null,
costTime);
return Results.OK(OPTION_SUCCESS);
return Results.OK(OPTION_SUCCESS,sysUser);
}
} catch (Exception e) {
SysUserController.log.error(e.getMessage(), e);
@@ -280,33 +271,29 @@ public class SysUserController {
@PostMapping("/delete")
@RequiresPermissions("sys:user:sel")
public Results<T> delete(@RequestBody Map<String,String> map) {
@AutoLog(operateType = 4,value = "user")
public Results<String> delete(@RequestBody Map<String,String> map) {
long startTime = System.currentTimeMillis();
String id = map.get("id");
if(StringUtils.isBlank(id)){
return Results.error("参数不识别！");
}
this.sysUserService.deleteUser(id);
long endTime = System.currentTimeMillis();
long costTime = endTime - startTime;
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 4,null,costTime);
return Results.OK("删除用户成功");
return Results.OK("删除用户成功",id);
}
@PostMapping("/deleteBatch")
@RequiresPermissions("sys:user:sel")
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
long startTime = System.currentTimeMillis();
@AutoLog(operateType = 4,value = "user")
public Results<String> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
if(StringUtils.isBlank(ids)){
return Results.error("参数不识别！");
}
this.sysUserService.deleteBatchUsers(ids);
long endTime = System.currentTimeMillis();
long costTime = endTime - startTime;
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 4,null,costTime);
return Results.OK("批量删除用户成功");
return Results.OK("批量删除用户成功",ids);
}