From aff0a8f094deb16290921be5792a08e65766b83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Tue, 20 Jun 2023 18:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=8F=91=E9=80=81=E5=88=B0=E7=AE=A1=E7=90=86=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhx/base/framework/aspect/OperlogAspect.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/datav-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java b/datav-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java
index 67e5c44..6a06086 100644
--- a/datav-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java
+++ b/datav-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.mortals.framework.model.OperateLogPdu;
 import com.mortals.framework.service.IMessageProduceService;
+import com.mortals.xhx.system.MessageProducer;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -15,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -29,17 +31,18 @@ import com.mortals.xhx.base.system.oper.service.OperLogService;
 public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
 
     private final static Logger logger = LoggerFactory.getLogger(OperlogAspect.class);
+
     @Autowired
     private OperLogService operLogService;
-
     @Autowired
     private IMessageProduceService messageProducer;
 
     @Override
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
-            String content, String ip, Date logDate) {
+                             String content, String ip, Date logDate) {
         super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate);
         operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
+
         OperateLogPdu operateLogPdu = new OperateLogPdu();
         operateLogPdu.initAttrValue();
         operateLogPdu.setIp(ip);
@@ -52,7 +55,6 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
         operateLogPdu.setContent(content);
         operateLogPdu.setOperType(1);
         messageProducer.syncOperSend(operateLogPdu);
-
     }
 
     @Override
@@ -60,6 +62,8 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
         // operLogService.insertOperLog(ip, requestUrl, null, "", loginName,
         // content);
         this.doHandlerLog(platformMark, null, "", loginName, requestUrl, content, ip, new Date());
+
+
     }
 
     @Pointcut("execution(public  * com.mortals.xhx..*Controller.*(..))")
-- 
2.24.3