Merge remote-tracking branch 'origin/master'

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/log/LogConsumer.java

@@ -64,39 +64,39 @@ public class LogConsumer implements CommandLineRunner {
     }
 
     private void receiveQueue() {
-        String key = RedisKeys.getSysLogKey();
-        //每次插入100条
-        int count = 100;
-        for (int i = 0; i < count; i++) {
-            log.info("1日志存储开始-------------");
-            BaseLog baseLog = (BaseLog) redisUtils.rightPop(key);
-            if (baseLog == null) {
-                return;
-            }
-            //登录日志
-            if (baseLog.getType() == LogTypeEnum.LOGIN.value()) {
-                SysLogLogin sysLogLogin = (SysLogLogin) baseLog;
-                SysLogLoginEntity entity = ConvertUtils.sourceToTarget(sysLogLogin, SysLogLoginEntity.class);
-                log.info("1登录日志开始-------------"+entity.toString());
-                sysLogLoginService.save(entity);
-            }
-
-            //操作日志
-            if (baseLog.getType() == LogTypeEnum.OPERATION.value()) {
-                SysLogOperation sysLogOperation = (SysLogOperation) baseLog;
-                SysLogOperationEntity entity = ConvertUtils.sourceToTarget(sysLogOperation, SysLogOperationEntity.class);
-                log.info("操作日志开始-------------"+entity.toString());
-                sysLogOperationService.save(entity);
-            }
-
-//            //异常日志
-//            if (baseLog.getType() == LogTypeEnum.ERROR.value()) {
-//                SysLogError logError = (SysLogError) baseLog;
-//                SysLogErrorEntity entity = ConvertUtils.sourceToTarget(logError, SysLogErrorEntity.class);
-//                log.info("异常日志开始-------------"+entity.toString());
-//                sysLogErrorService.save(entity);
+//        String key = RedisKeys.getSysLogKey();
+//        //每次插入100条
+//        int count = 100;
+//        for (int i = 0; i < count; i++) {
+//            log.info("1日志存储开始-------------");
+//            BaseLog baseLog = (BaseLog) redisUtils.rightPop(key);
+//            if (baseLog == null) {
+//                return;
+//            }
+//            //登录日志
+//            if (baseLog.getType() == LogTypeEnum.LOGIN.value()) {
+//                SysLogLogin sysLogLogin = (SysLogLogin) baseLog;
+//                SysLogLoginEntity entity = ConvertUtils.sourceToTarget(sysLogLogin, SysLogLoginEntity.class);
+//                log.info("1登录日志开始-------------"+entity.toString());
+//                sysLogLoginService.save(entity);
+//            }
+//
+//            //操作日志
+//            if (baseLog.getType() == LogTypeEnum.OPERATION.value()) {
+//                SysLogOperation sysLogOperation = (SysLogOperation) baseLog;
+//                SysLogOperationEntity entity = ConvertUtils.sourceToTarget(sysLogOperation, SysLogOperationEntity.class);
+//                log.info("操作日志开始-------------"+entity.toString());
+//                sysLogOperationService.save(entity);
 //            }
-        }
+//
+////            //异常日志
+////            if (baseLog.getType() == LogTypeEnum.ERROR.value()) {
+////                SysLogError logError = (SysLogError) baseLog;
+////                SysLogErrorEntity entity = ConvertUtils.sourceToTarget(logError, SysLogErrorEntity.class);
+////                log.info("异常日志开始-------------"+entity.toString());
+////                sysLogErrorService.save(entity);
+////            }
+//        }
     }
 
 }