Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/CabinetLogReceiver.java

@@ -41,7 +41,9 @@ public class CabinetLogReceiver {
         logRecordDTO.setLogType(LogTypeEnum.OPT_LOG.getCode());
         logRecordDTO.setHttpMethod("RabbitMQ");
         logRecordDTO.setLogContent("CabinetLogsRecord");
-        logRecordDTO.setRequestResult(msg);
+        logRecordDTO.setRequestParams(msg);
+        logRecordDTO.setLogType(30);
+        logRecordDTO.setRequestUrl("queues = \"CabinetLogsRecord\"");
         try {
             // 手动确认消息
             channel.basicAck(deliveryTag, false);

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsByCabinetReceiver.java

@@ -39,7 +39,9 @@ public class OutInLogsByCabinetReceiver {
         logRecordDTO.setLogType(LogTypeEnum.OPT_LOG.getCode());
         logRecordDTO.setHttpMethod("RabbitMQ");
         logRecordDTO.setLogContent("CabinetLogsRecord");
-        logRecordDTO.setRequestResult(msg);
+        logRecordDTO.setRequestParams(msg);
+        logRecordDTO.setLogType(30);
+        logRecordDTO.setRequestUrl("queues = \"CabinetLogsRecord\"");
         try {
             System.out.println("msg = " + msg);
 

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsReceiver.java

@@ -40,7 +40,9 @@ public class OutInLogsReceiver {
         logRecordDTO.setLogType(LogTypeEnum.OPT_LOG.getCode());
         logRecordDTO.setHttpMethod("RabbitMQ");
         logRecordDTO.setLogContent("OrderResult");
-        logRecordDTO.setRequestResult(msg);
+        logRecordDTO.setRequestParams(msg);
+        logRecordDTO.setLogType(30);
+        logRecordDTO.setRequestUrl("queues = \"11111\"");
         try {
 //            System.out.println("msg = " + msg);
             // 创建日志对象

jyzb-biz/src/main/java/com/junmp/jyzb/task/ClearLogAction.java

@@ -36,18 +36,22 @@ public class ClearLogAction implements JobAction {
 
     @Override
     public void action() {
-//        //获取两月前的日期
+        //获取两月前的日期
 //        ConfigExpander.getClearLogOffsetValue()
-//        Integer offset = 60;
-//        //Date maxTime = DateUtil.offsetMonth(new Date(), offset);
-//        Date maxTime = DateUtil.offsetDay(new Date(),offset);
-//        //配置过滤条件
-//        LogRequest request = new LogRequest();
-//        request.setLogType(10);
-//        request.setEndDate(DateUtil.formatDate(maxTime));
-//
-//        logManagerApi.clearLog(request);
-//        log.warn(StrUtil.format("{} 清理日志完成",
-//                DateUtil.format(new Date(), DatePattern.NORM_DATETIME_FORMAT)));
+        Integer offset = 60;
+        //Date maxTime = DateUtil.offsetMonth(new Date(), offset);
+        Date maxTime = DateUtil.offsetDay(new Date(),offset);
+        //配置过滤条件
+        LogRequest request = new LogRequest();
+        request.setLogType(10);
+        request.setEndDate(DateUtil.formatDate(maxTime));
+
+        logManagerApi.clearLog(request);
+        LogRequest requestType30 = new LogRequest();
+        requestType30.setLogType(30);
+        requestType30.setEndDate(DateUtil.formatDate(maxTime));
+        logManagerApi.clearLog(requestType30);
+        log.warn(StrUtil.format("{} 清理日志完成",
+                DateUtil.format(new Date(), DatePattern.NORM_DATETIME_FORMAT)));
     }
 }