From 52f576133f30bfa2f04a03c9b12eb520a7fcf2d5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 七月 2025 12:27:07 +0800
Subject: [PATCH] 修改切面日志~

---
 se-common/src/main/java/com/terra/common/helper/TokenHelper.java                                              |   15 +++++++
 se-system/src/main/java/com/terra/system/SeSystemApp.java                                                     |    2 +
 se-common/src/main/java/com/terra/common/aspect/LogAspect.java                                                |   36 +++++++++--------
 se-common/src/main/java/com/terra/common/mapper/CommonMapper.java                                             |   15 +++++++
 se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports |    2 
 5 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/se-common/src/main/java/com/terra/common/aspect/LogAspect.java b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
index 881bf0c..3c28c9a 100644
--- a/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
+++ b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
@@ -1,7 +1,9 @@
 package com.terra.common.aspect;
 
 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;
@@ -12,8 +14,11 @@
 import org.aspectj.lang.reflect.MethodSignature;
 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;
 
 /**
  * 鏃ュ織鍒囬潰绫�
@@ -22,6 +27,9 @@
 @Aspect
 @Component
 public class LogAspect {
+    @Resource
+    CommonMapper commonMapper;
+
     private final static String SELECT = "select";
 
     private final static String INSERT = "insert";
@@ -72,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);
         }
diff --git a/se-common/src/main/java/com/terra/common/helper/TokenHelper.java b/se-common/src/main/java/com/terra/common/helper/TokenHelper.java
new file mode 100644
index 0000000..8efe7ee
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/helper/TokenHelper.java
@@ -0,0 +1,15 @@
+package com.terra.common.helper;
+
+/**
+ * 浠ょ墝甯姪绫�
+ * @author WWW
+ */
+public class TokenHelper {
+    public static Integer getCurrentUserId() {
+        return null;
+    }
+
+    public static String getCurrentUserName() {
+        return null;
+    }
+}
diff --git a/se-common/src/main/java/com/terra/common/mapper/CommonMapper.java b/se-common/src/main/java/com/terra/common/mapper/CommonMapper.java
new file mode 100644
index 0000000..10300ba
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/mapper/CommonMapper.java
@@ -0,0 +1,15 @@
+package com.terra.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface CommonMapper extends BaseMapper {
+    @Insert("INSERT INTO lf.sys_operate(url, ip, exec, clazz, type, userid, bak, modular1, modular2) VALUES (#{url}, #{ip}, #{exec}, #{clazz}, #{type}, #{userid}, #{bak}, #{modular1}, #{modular2})")
+    public int insertOperate(Map<String,Object> map);
+}
diff --git a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 2ca104f..f81e019 100644
--- a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,3 @@
-com.terra.common.config.MybatisPlusConfig
 com.terra.common.config.SpringDocAutoConfiguration
+com.terra.common.config.MybatisPlusConfig
 com.terra.common.aspect.LogAspect
\ No newline at end of file
diff --git a/se-system/src/main/java/com/terra/system/SeSystemApp.java b/se-system/src/main/java/com/terra/system/SeSystemApp.java
index bf98f0f..83c7c2c 100644
--- a/se-system/src/main/java/com/terra/system/SeSystemApp.java
+++ b/se-system/src/main/java/com/terra/system/SeSystemApp.java
@@ -1,5 +1,6 @@
 package com.terra.system;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -13,6 +14,7 @@
  * @author admin
  */
 @EnableAsync
+@MapperScan("com.terra.*.mapper")
 @EnableAspectJAutoProxy(exposeProxy = true)
 @SpringBootApplication(scanBasePackages = {"com.terra.system.*"})
 public class SeSystemApp

--
Gitblit v1.9.3