From 98c8f34b149d55437df387d5d9b306cd9b8201cb Mon Sep 17 00:00:00 2001
From: bynt <ningtao/19960909>
Date: Tue, 13 Sep 2022 10:46:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/entity/TbDeliveryStatisticEntity.java      | 2 +-
 .../adcallback/service/impl/DmpMonitorNumServiceImpl.java | 8 ++++----
 src/main/resources/logback.xml                            | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/baiyee/adcallback/repository/entity/TbDeliveryStatisticEntity.java b/src/main/java/com/baiyee/adcallback/repository/entity/TbDeliveryStatisticEntity.java
index 4feda5f..905f7a1 100644
--- a/src/main/java/com/baiyee/adcallback/repository/entity/TbDeliveryStatisticEntity.java
+++ b/src/main/java/com/baiyee/adcallback/repository/entity/TbDeliveryStatisticEntity.java
@@ -29,5 +29,5 @@ public class TbDeliveryStatisticEntity implements Serializable {
     private String tag;
 
     @Column(name = "day_num")
-    private Integer dayNum = 30;
+    private Integer dayNum = 3;
 }
diff --git a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java
index 4d3f057..65c2f37 100644
--- a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java
+++ b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java
@@ -213,7 +213,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
             sql.append(" and tb.gmt_create >= :startDate ");
             sql.append(" and tb.gmt_create < :endDate ");
             sql.append(" and tb.tag in :tag ");
-            sql.append(" group by tb.imei,tb.tag");
+            sql.append(" group by tb.imei,tb.tag,date");
         }
         return sql.toString();
     }
@@ -270,7 +270,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
             sql.append(" and tb.gmt_create < :endDate ");
             sql.append(" and tb.device_os_type = :deviceOsType ");
             sql.append(" and tb.tag in :tag ");
-            sql.append(" group by tb.muid,tb.tag");
+            sql.append(" group by tb.muid,tb.tag,date");
         }
         return sql.toString();
     }
@@ -321,7 +321,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
                 // 返回数据
                 newDataList.addAll(monitorJpaDtoList);
             }
-            log.error("================ the save datalist size as {} ================",saveDataList.size());
+            log.error("================ the save datalist size as {} ================", saveDataList.size());
             if (CollUtil.isNotEmpty(saveDataList)) {
                 // 异步插入数据
                 CompletableFuture.runAsync(() -> {
@@ -331,7 +331,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
                     tbDeliveryStatisticEntityRepository.saveAll(deliveryStatisticEntityList);
                 });
             }
-            log.error("================ the new datalist size as {} ================",newDataList.size());
+            log.error("================ the new datalist size as {} ================", newDataList.size());
             return newDataList;
         }
         return tradeList;
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 78ea968..ed8dd54 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -21,7 +21,7 @@
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 按天归档，如果按小时后面加-hh -->
-            <fileNamePattern>${LOG_DIR}/history/ad-callback-log/%d{yyyy-MM-dd}.gz</fileNamePattern>
+            <fileNamePattern>${LOG_DIR}/history/%d{yyyy-MM-dd}.gz</fileNamePattern>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
 
@@ -77,7 +77,7 @@
 
     <root level="INFO">
         <!-- TODO prod 环境去掉std -->
-        <appender-ref ref="stdAppender"/>
-<!--        <appender-ref ref="fileAppender"/>-->
+<!--        <appender-ref ref="stdAppender"/>-->
+        <appender-ref ref="fileAppender"/>
     </root>
-</configuration>
\ No newline at end of file
+</configuration>