From 5523066fe493f85d627dbcdfe06bfced8dcb8e76 Mon Sep 17 00:00:00 2001 From: bupengxiang <15022776095@163.com> Date: Fri, 4 Aug 2023 10:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/aspect/AutoLogAspect.java | 26 ------------------- .../common/aspect/annotation/AutoLog.java | 2 +- .../system/controller/SysUserController.java | 8 +++--- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java index 9a866a26..53ada815 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java @@ -1,7 +1,6 @@ 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; @@ -82,31 +81,6 @@ 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); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/annotation/AutoLog.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/annotation/AutoLog.java index 1acaeb39..8e667db9 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/annotation/AutoLog.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/annotation/AutoLog.java @@ -33,7 +33,7 @@ public @interface AutoLog { /** * 操作日志类型 * - * @return （1查询，2添加，3修改，4删除） + * @return （1查询，2添加，3修改，4删除,5导入，6导出） */ int operateType() default 0; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index ec086d8c..d80ffabb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -166,7 +166,7 @@ public class SysUserController { @RequiresPermissions("user:add") @PostMapping("/add") - @AutoLog(operateType = 2,value = "user") + @AutoLog(operateType = 2,value = "用户新增") public Results add(@RequestBody JSONObject jsonObject) { try { String selectedRoles = jsonObject.getString(SELECTED_ROLES); @@ -221,7 +221,7 @@ public class SysUserController { @RequiresPermissions("user:edit") @PostMapping("/edit") - @AutoLog(operateType = 3,value = "user") + @AutoLog(operateType = 3,value = "用户编辑") public Results edit(@RequestBody JSONObject jsonObject) { String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY); String roles = jsonObject.getString(SELECTED_ROLES); @@ -271,7 +271,7 @@ public class SysUserController { @PostMapping("/delete") @RequiresPermissions("sys:user:sel") - @AutoLog(operateType = 4,value = "user") + @AutoLog(operateType = 4,value = "用户删除") public Results delete(@RequestBody Map map) { long startTime = System.currentTimeMillis(); String id = map.get("id"); @@ -285,7 +285,7 @@ public class SysUserController { @PostMapping("/deleteBatch") @RequiresPermissions("sys:user:sel") - @AutoLog(operateType = 4,value = "user") + @AutoLog(operateType = 4,value = "用户批量删除") public Results deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); if(StringUtils.isBlank(ids)){