From 542a030a93de7dbc39e185d4ce355c5894e3cd5b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 七月 2025 13:45:06 +0800
Subject: [PATCH] 解决切面日志插入失败

---
 se-common/src/main/java/com/terra/common/aspect/LogAspect.java |   51 +++++++++++++++++++++------------------------------
 1 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/se-system/src/main/java/com/terra/system/aspect/LogAspect.java b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
similarity index 73%
rename from se-system/src/main/java/com/terra/system/aspect/LogAspect.java
rename to se-common/src/main/java/com/terra/common/aspect/LogAspect.java
index 1a0be78..2ba8848 100644
--- a/se-system/src/main/java/com/terra/system/aspect/LogAspect.java
+++ b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
@@ -1,11 +1,9 @@
-package com.terra.system.aspect;
+package com.terra.common.aspect;
 
-import com.terra.system.annotation.SysLog;
-import com.terra.system.entity.sys.OperateEntity;
-import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.WebHelper;
-import com.terra.system.service.sys.OperateService;
-import com.terra.system.service.sys.TokenService;
+import com.terra.common.annotation.SysLog;
+import com.terra.common.helper.TokenHelper;
+import com.terra.common.helper.WebHelper;
+import com.terra.common.mapper.CommonMapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -14,11 +12,13 @@
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 鏃ュ織鍒囬潰绫�
@@ -28,10 +28,7 @@
 @Component
 public class LogAspect {
     @Resource
-    private TokenService tokenService;
-
-    @Resource
-    private OperateService operateService;
+    CommonMapper commonMapper;
 
     private final static String SELECT = "select";
 
@@ -51,7 +48,7 @@
 
     private static final Log log = LogFactory.getLog(LogAspect.class);
 
-    @Pointcut("@annotation(com.terra.system.annotation.SysLog)")
+    @Pointcut("@annotation(com.terra.common.annotation.SysLog)")
     public void logPointCut() {
         //
     }
@@ -83,39 +80,33 @@
             MethodSignature signature = (MethodSignature) joinPoint.getSignature();
             Class<?> clazz = joinPoint.getTarget().getClass();
             Method method = signature.getMethod();
-
             HttpServletRequest req = WebHelper.getRequest();
-            String url = req.getServletPath();
 
-            OperateEntity oe = new OperateEntity();
-            oe.setIp(WebHelper.getIpAddress(req));
-            oe.setUrl(url);
-            oe.setExec(time);
+            Map<String, Object> map = new HashMap<>();
+            map.put("url", req.getServletPath());
+            map.put("ip", WebHelper.getIpAddress(req));
+            map.put("exec", time);
+            map.put("userid", TokenHelper.getCurrentUserId());
 
             // 璁剧疆妯″潡
             Tag tag = clazz.getAnnotation(Tag.class);
             if (tag != null) {
                 String[] strs = tag.name().split(SPLIT);
-                oe.setModular1(strs[0]);
-                oe.setModular2(strs[1]);
+                map.put("modular1", strs[0]);
+                map.put("modular2", strs[1]);
             }
 
             // 璁剧疆绫诲悕\鏂规硶鍚嶃�佺被鍒�
-            oe.setClazz(clazz.getName() + "." + method.getName());
-            oe.setType(getType(method.getName()));
+            map.put("clazz", clazz.getName() + "." + method.getName());
+            map.put("type", getType(method.getName()));
 
             // 璁剧疆澶囨敞
             SysLog sysLog = method.getAnnotation(SysLog.class);
             if (sysLog != null) {
-                oe.setBak(sysLog.value());
+                map.put("bak", sysLog.value());
             }
 
-            UserEntity ue = tokenService.getCurrentUser(req);
-            if (ue != null) {
-                oe.setUserid(ue.getId());
-            }
-
-            operateService.insertOperate(oe);
+            commonMapper.insertOperate(map);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }

--
Gitblit v1.9.3