修改报表查询

common-lib/pom.xml

@@ -95,6 +95,17 @@
             <artifactId>gson</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.rabbitmq</groupId>
+            <artifactId>amqp-client</artifactId>
+            <version>4.8.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
     </dependencies>
 
 

common-lib/src/main/java/com/mortals/xhx/common/keys/QueueKey.java

+package com.mortals.xhx.common.keys;
+
+/**
+ * rabbit 队列key定义
+ */
+public class QueueKey {
+
+
+    public static final String ACCESS_LOG_QUEUE = "ACCESS_LOG_QUEUE";
+
+    public static final String BIZ_LOG_QUEUE = "BIZ_LOG_QUEUE";
+
+    public static final String ERROR_LOG_QUEUE = "ERROR_LOG_QUEUE";
+
+    public static final String OPERATION_LOG_QUEUE = "OPERATION_LOG_QUEUE";
+
+
+
+    public static final String EXCHANGE = "LOG";
+
+    public static final String ROUTING_KEY = "LOG_ROUTING_KEY";
+
+
+
+}

common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java

+package com.mortals.xhx.system;
+
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.model.AccessLogPdu;
+import com.mortals.framework.model.BizLogPdu;
+import com.mortals.framework.model.ErrorLogPdu;
+import com.mortals.framework.model.OperateLogPdu;
+import com.mortals.framework.service.IMessageProduceService;
+import com.mortals.xhx.common.keys.QueueKey;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Component
+@Primary
+@Slf4j
+public class MessageProducer implements IMessageProduceService {
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    public void syncAccessSend(AccessLogPdu accessLogPdu) {
+        //new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
+        //rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
+
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
+        //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
+    }
+
+    @Override
+    public void syncBizSend(BizLogPdu bizLogPdu) {
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
+    }
+
+    @Override
+    public void syncErrorSend(ErrorLogPdu errorLogPdu) {
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
+    }
+
+    @Override
+    public void syncOperSend(OperateLogPdu operLogPdu) {
+        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
+    }
+
+}

refined-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.mortals.framework.model.OperateLogPdu;
+import com.mortals.framework.service.IMessageProduceService;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -34,11 +36,29 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
     @Autowired
     private OperLogService operLogService;
 
+    @Autowired
+    private IMessageProduceService messageProduceService;
+
     @Override
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
             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);
+        operateLogPdu.setRequestUrl(requestUrl);
+        operateLogPdu.setUserId(userId);
+        operateLogPdu.setUserName(userName);
+        operateLogPdu.setLoginName(loginName);
+        operateLogPdu.setPlatformMark(platformMark);
+        operateLogPdu.setLogDate(logDate);
+        operateLogPdu.setContent(content);
+        operateLogPdu.setOperType(1);
+        messageProduceService.syncOperSend(operateLogPdu);
+
+
     }
 
     @Override