From 7be43afa8b9b0231cbd6a5d77e4140edd1a86a88 Mon Sep 17 00:00:00 2001
From: liulu <liulu@yeah.net>
Date: Mon, 25 Nov 2024 14:19:45 +0800
Subject: [PATCH] fix

---
 .../monitor/log/aspect/AuditLogAspect.java    | 20 ++++++++++++++-----
 doc/ssp_dm.sql                                |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/monitor/log/aspect/AuditLogAspect.java b/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/monitor/log/aspect/AuditLogAspect.java
index d224a84..de92c86 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/monitor/log/aspect/AuditLogAspect.java
+++ b/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/monitor/log/aspect/AuditLogAspect.java
@@ -4,6 +4,7 @@ import cn.hutool.core.thread.threadlocal.NamedThreadLocal;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sunyard.chsm.model.R;
 import com.sunyard.ssp.common.Result;
 import com.sunyard.ssp.common.annotation.AuditControllerLog;
 import com.sunyard.ssp.modules.monitor.log.entity.AuditLog;
@@ -12,6 +13,7 @@ import com.sunyard.ssp.modules.user.entity.ScUser;
 import com.sunyard.ssp.utils.IpUtil;
 import com.sunyard.ssp.utils.SecurityUtil;
 import com.sunyard.ssp.utils.ThreadPoolUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -40,6 +42,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author fyc
  * @description 切点实现类
  */
+@Slf4j
 @Aspect
 @Component
 @SuppressWarnings("all")
@@ -101,11 +104,18 @@ public class AuditLogAspect {
             Map map = getAuditLogDescription(joinPoint);
             auditLog.setOperateContent((String) map.get("description"));
             auditLog.setOperateType((String)map.get("operateType"));
-            Result<Object> result = (Result<Object>) res;
-            if(result.isSuccess()){
+
+            if (res instanceof R) {
                 auditLog.setOperateResult("成功");
-            }else {
-                auditLog.setOperateResult("失败");
+            } else if (res instanceof Result) {
+                Result<Object> result = (Result<Object>) res;
+                if(result.isSuccess()){
+                    auditLog.setOperateResult("成功");
+                }else {
+                    auditLog.setOperateResult("失败");
+                }
+            } else {
+                log.warn("unrecognized return object: {}", res.getClass());
             }
 
             //Ip信息
@@ -130,7 +140,7 @@ public class AuditLogAspect {
             ThreadPoolUtil.getPool().execute(new SaveAuditLogThread(auditLog, auditLogService));
 
         }catch (Exception e){
-            e.printStackTrace();
+            log.warn("记录操作日志异常", e);
         }
     }
 
diff --git a/doc/ssp_dm.sql b/doc/ssp_dm.sql
index e5bd8fa..301c3f4 100644
--- a/doc/ssp_dm.sql
+++ b/doc/ssp_dm.sql
@@ -1,5 +1,5 @@
 CREATE TABLE "SC_AUDIT_LOG"(
-    "ID" INT IDENTITY(4041, 1) NOT NULL,
+    "ID" INT IDENTITY(1, 1) NOT NULL,
     "CREATE_TIME" TIMESTAMP(0),
     "OPERATOR_NAME" VARCHAR(255),
     "OPERATOR_ID" INT,