修改逻辑代码

src/main/java/com/baiyee/adcallback/api/constants/SqlConstant.java

@@ -32,14 +32,14 @@ public class SqlConstant {
             " FROM" +
             " `tabIndex` " +
             " WHERE" +
-            " tabIndex.`gmt_create` >= :startTime " +
+            " tabIndex.`gmt_create` > :startTime " +
             " AND gmt_create < :endTime " +
             " AND tag = :tagStr" +
             " GROUP BY" +
             " DATE DESC  " +
             " ) _tmpAllTable  " +
             "GROUP BY" +
-            " `date` DESC";
+            " `date`";
 
 
 }

src/main/java/com/baiyee/adcallback/api/dto/DmpMonitorJpaDto.java

@@ -2,8 +2,6 @@ package com.baiyee.adcallback.api.dto;
 
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author wujingtao
  * @date 2022/03/01
@@ -12,5 +10,6 @@ import java.util.Date;
 public class DmpMonitorJpaDto {
 
     private String imei;
-    private Date gmtCreate;
+
+    private String gmtCreate;
 }

src/main/java/com/baiyee/adcallback/service/impl/AnalysisServiceImpl.java

@@ -91,7 +91,7 @@ public class AnalysisServiceImpl implements AnalysisService {
     private List<QueryResultDTO> getQueryResults
             (String tagStr, String formatDate, Date endTime, Date startTime) {
         // 获取前缀判断来源
-        int value = tagStr.contains(StrPool.UNDERLINE) ? DeliveryPlatformEnum.getValue
+        int value = tagStr.contains(StrPool.DASHED) ? DeliveryPlatformEnum.getValue
                 (tagStr.substring(0, tagStr.indexOf(StrPool.DASHED))) : tagStr.equalsIgnoreCase(SqlConstant.TABLE_JU_QIAN) ? 1 : 999;
 
         String sqlString = CharSequenceUtil.EMPTY;

src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java

@@ -97,7 +97,8 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
         for (int i = 0; i <= betweenDay; i++) {
             HashMap<String, Object> map = new HashMap<>();
             Date dateTime = DateUtil.offsetDay(beginTime, i);
-            List<DmpMonitorJpaDto> collect = iemi.stream().filter(c -> betweenByDay(dateTime, c.getGmtCreate())).collect(Collectors.toList());
+            List<DmpMonitorJpaDto> collect = iemi.stream().filter
+                    (c -> betweenByDay(dateTime,DateUtil.parseDate(c.getGmtCreate()))).collect(Collectors.toList());
             map.put("date", dateTime);
             map.put("num", collect.size());
             list.add(map);
@@ -119,9 +120,10 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
         sql.append("select DISTINCT  DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' ) as gmtCreate ,tb.imei as imei from " + tableName + " as tb where");
         sql.append(" tb.imei != :imei1 ");
         sql.append(" and tb.imei != :imei2 ");
-        sql.append(" and tb.gmt_create >= :startDate ");
+        sql.append(" and tb.gmt_create > :startDate ");
         sql.append(" and tb.gmt_create < :endDate ");
         sql.append(" and tb.tag = :tag ");
+
         Query query = entityManager.createNativeQuery(sql.toString());
         query.setParameter("imei1", "");
         query.setParameter("imei2", "__IMEI__");
@@ -138,8 +140,8 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
         for (Object obj : list) {
             Map row = (Map) obj;
             DmpMonitorJpaDto trade = new DmpMonitorJpaDto();
-            trade.setImei((String) row.get("imei"));
-            trade.setGmtCreate((Date) row.get("gmtCreate"));
+            trade.setImei(row.get("imei").toString());
+            trade.setGmtCreate(row.get("gmtCreate").toString());
             tradeList.add(trade);
         }
         return tradeList;

src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: ad-callback
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss