添加设备日志类型筛选

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));
+    }
+
+}

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
 
 import com.mortals.framework.model.OperateLogPdu;
+import com.mortals.framework.service.IMessageProduceService;
 import com.mortals.xhx.base.system.message.MessageProducer;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -37,7 +38,7 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService {
     @Autowired
     private OperLogService operLogService;
     @Autowired
-    private MessageProducer messageProducer;
+    private IMessageProduceService messageProducer;
 
     @Override
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,

log-manager/src/main/java/com/mortals/xhx/module/biz/service/impl/BizLogServiceImpl.java

 package com.mortals.xhx.module.biz.service.impl;
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.module.access.model.AccessLogEntity;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -36,7 +38,16 @@ public class BizLogServiceImpl extends AbstractCRUDServiceImpl<BizLogDao, BizLog
         return super.save(entity, context);
     }
 
-//    @Override
+    @Override
+    protected void findAfter(BizLogEntity params, PageInfo pageInfo, Context context, List<BizLogEntity> list) throws AppException {
+        super.findAfter(params, pageInfo, context, list);
+        list.forEach(entity -> {
+            entity.setMsg(Base64.decodeStr(entity.getMsg()));
+        });
+    }
+
+
+    //    @Override
 //    public int save(List<BizLogEntity> list, Context context) throws AppException {
 //        list.forEach(item->item.setId(IdUtil.getSnowflake(0, 1).nextId()));
 //        return super.save(list, context);

log-manager/src/main/java/com/mortals/xhx/module/biz/web/BizLogController.java

 package com.mortals.xhx.module.biz.web;
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.IdUtil;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
@@ -56,9 +57,20 @@ public class BizLogController extends BaseCRUDJsonBodyMappingController<BizLogSe
         super.doListBefore(query, model, context);
     }
 
+    @Override
+    protected int viewAfter(Long id, Map<String, Object> model, BizLogEntity entity, Context context) throws AppException {
+        entity.setMsg(Base64.decodeStr(entity.getMsg()));
+        return super.viewAfter(id, model, entity, context);
+    }
+
     @Override
     @UnAuth
     public String save(@RequestBody BizLogEntity entity) {
         return super.save(entity);
     }
+
+
+    public static void main(String[] args) {
+        System.out.println(Base64.decodeStr("eyJ3YWl0Y291bnQiOiIwIiwiZm9yd2FpdGNvdW50IjoiMCJ9"));
+    }
 }
\ No newline at end of file