修改逻辑代码

src/main/java/com/baiyee/adcallback/api/callback/MobileMonitorCallbackNewAPI.java

@@ -89,6 +89,9 @@ public class MobileMonitorCallbackNewAPI {
             vo.setVpoint(vpoint);
         }
 
+        if (vo.getOs().equalsIgnoreCase("OS")){
+            log.error("======================== the ta error as {} ========================", vo.getTag());
+        }
         // 重点参数校验规则 - 通过则入监控回流Source库 - 较完整字段
         if (CheckPlatPointParamsUtil.checkJLPlatPointV2Param(vo.getOs(), vo.getImei(), vo.getIdfa(), vo.getIdfaMD5(), vo.getMac())) {
             originalityManageService.handleNewJLV2MonitorUrlCallbackDataThenSave(vo);
@@ -148,6 +151,9 @@ public class MobileMonitorCallbackNewAPI {
             vo.setVpoint(vpoint);
         }
 
+        if (vo.getOs().equalsIgnoreCase("OS")){
+            log.error("======================== the ta error as {} ========================", vo.getTag());
+        }
         // 重点参数校验规则 - 通过则入监控回流Source库 - 较完整字段
         if (CheckPlatPointParamsUtil.checkJLPlatPointV2Param(vo.getOs(), vo.getImei(), vo.getIdfa(), vo.getIdfaMD5(), vo.getMac())) {
             originalityManageService.handleNewJLV1MonitorUrlCallbackDataThenSave(vo);

src/main/java/com/baiyee/adcallback/service/BdBackDateService.java

@@ -1,24 +1,9 @@
 package com.baiyee.adcallback.service;
 
-import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
-
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author Enzo
  * @date : 2023/6/21
  */
-public interface BdBackDateService {
+public interface BdBackDateService extends DslBaseService {
 
-    /**
-     * 条件查询
-     *
-     * @param startTime begin time
-     * @param endTime   end time
-     * @param tagList   tag
-     * @param flag      num or link
-     * @return
-     */
-    List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
 }

src/main/java/com/baiyee/adcallback/service/DslBaseService.java

@@ -0,0 +1,41 @@
+package com.baiyee.adcallback.service;
+
+import cn.hutool.core.date.DateTime;
+import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2023/7/3
+ */
+public interface DslBaseService {
+
+
+    /**
+     * 条件查询
+     *
+     * @param startTime begin time
+     * @param endTime   end time
+     * @param tagList   tag
+     * @param flag      num or link
+     * @return
+     */
+    List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
+
+    /**
+     * 删除数据
+     * @param date
+     * @param num
+     * @return
+     */
+    Integer deleteDateByDateAndLimitNum(DateTime date, Integer num);
+
+    /**
+     * 查询数量
+     * @param date
+     * @return
+     */
+    Long countByDate(DateTime date);
+}

src/main/java/com/baiyee/adcallback/service/JlV1BackDataService.java

@@ -1,24 +1,10 @@
 package com.baiyee.adcallback.service;
 
-import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
-
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author Enzo
  * @date : 2023/6/21
  */
 
-public interface JlV1BackDataService {
-    /**
-     * 条件查询
-     *
-     * @param startTime begin time
-     * @param endTime   end time
-     * @param tagList   tag
-     * @param flag      num or link
-     * @return
-     */
-    List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
+public interface JlV1BackDataService extends DslBaseService {
+
 }

src/main/java/com/baiyee/adcallback/service/JlV2BackDataService.java

@@ -1,24 +1,9 @@
 package com.baiyee.adcallback.service;
 
-import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
-
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author Enzo
  * @date : 2023/6/21
  */
-public interface JlV2BackDataService {
+public interface JlV2BackDataService extends DslBaseService {
 
-    /**
-     * 条件查询
-     *
-     * @param startTime begin time
-     * @param endTime   end time
-     * @param tagList   tag
-     * @param flag      num or link
-     * @return
-     */
-    List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
 }

src/main/java/com/baiyee/adcallback/service/KsBackDateService.java

@@ -1,24 +1,10 @@
 package com.baiyee.adcallback.service;
 
-import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
-
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author Enzo
  * @date : 2023/6/21
  */
-public interface KsBackDateService {
+public interface KsBackDateService extends DslBaseService {
+
 
-    /**
-     * 条件查询
-     *
-     * @param startTime begin time
-     * @param endTime   end time
-     * @param tagList   tag
-     * @param flag      num or link
-     * @return
-     */
-    List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
 }

src/main/java/com/baiyee/adcallback/service/UcBackDateService.java

@@ -1,24 +1,8 @@
 package com.baiyee.adcallback.service;
 
-import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
-
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author Enzo
  * @date : 2023/6/21
  */
-public interface UcBackDateService {
-
-    /**
-     * 条件查询
-     *
-     * @param startTime begin time
-     * @param endTime   end time
-     * @param tagList   tag
-     * @param flag      num or link
-     * @return
-     */
-    List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
+public interface UcBackDateService extends DslBaseService {
 }

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

@@ -1,6 +1,7 @@
 package com.baiyee.adcallback.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
@@ -69,4 +70,14 @@ public class BdBackDataServiceImpl extends AbstractService<TbBdNewBackdataEntity
             return Convert.toList(DmpMonitorJpaDto.class, imeiVOList);
         });
     }
+
+    @Override
+    public Integer deleteDateByDateAndLimitNum(DateTime date, Integer num) {
+        return null;
+    }
+
+    @Override
+    public Long countByDate(DateTime date) {
+        return null;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.baiyee.adcallback.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
@@ -68,4 +69,26 @@ public class JlV1BackDataServiceImpl extends AbstractService<TbJLBackDataV1Entit
             return Convert.toList(DmpMonitorJpaDto.class, imeiVOList);
         });
     }
+
+    @Override
+    public Integer deleteDateByDateAndLimitNum(DateTime date, Integer num) {
+
+
+        //querydsl查询实体
+        QTbJLBackDataV1Entity v1Entity = QTbJLBackDataV1Entity.tbJLBackDataV1Entity;
+
+        this.newQuery()
+                //删除对象
+                .delete(v1Entity)
+                //删除条件
+                .where(v1Entity.gmtCreate.gt(date))
+                //执行删除
+                .execute();
+        return null;
+    }
+
+    @Override
+    public Long countByDate(DateTime date) {
+        return null;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.baiyee.adcallback.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
@@ -69,4 +70,14 @@ public class JlV2BackDataServiceImpl extends AbstractService<TbJLBackDataV2Entit
             return Convert.toList(DmpMonitorJpaDto.class, imeiVOList);
         });
     }
+
+    @Override
+    public Integer deleteDateByDateAndLimitNum(DateTime date, Integer num) {
+        return null;
+    }
+
+    @Override
+    public Long countByDate(DateTime date) {
+        return null;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.baiyee.adcallback.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
@@ -70,4 +71,14 @@ public class KsBackDataServiceImpl extends AbstractService<TbKSNewBackdataEntity
             return Convert.toList(DmpMonitorJpaDto.class, imeiVOList);
         });
     }
+
+    @Override
+    public Integer deleteDateByDateAndLimitNum(DateTime date, Integer num) {
+        return null;
+    }
+
+    @Override
+    public Long countByDate(DateTime date) {
+        return null;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.baiyee.adcallback.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
@@ -70,4 +71,14 @@ public class UcBackDataServiceImpl extends AbstractService<TbUcBackdataEntity,Lo
             return Convert.toList(DmpMonitorJpaDto.class, imeiVOList);
         });
     }
+
+    @Override
+    public Integer deleteDateByDateAndLimitNum(DateTime date, Integer num) {
+        return null;
+    }
+
+    @Override
+    public Long countByDate(DateTime date) {
+        return null;
+    }
 }

src/main/java/com/baiyee/adcallback/task/DeleteDeliveryDataTask.java

@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.common.enums.TableEnum;
+import com.baiyee.adcallback.service.DslBaseService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -13,6 +15,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import java.math.BigInteger;
+import java.util.Set;
 
 /**
  * @author Enzo
@@ -20,19 +23,26 @@ import java.math.BigInteger;
  */
 @Slf4j
 @Component
+@RequiredArgsConstructor
 public class DeleteDeliveryDataTask {
 
 
     @PersistenceContext
     private EntityManager entityManager;
 
+
+    private final Set<DslBaseService> dslBaseServices;
+
+
     /**
      * 凌晨五点 查询定时任务 删除记录
      */
     @Scheduled(cron = "0 0 5 * * ?")
     @Transactional(rollbackFor = Exception.class)
+
     public void deleteDataTask() {
         for (TableEnum value : TableEnum.values()) {
+
             //数据中需要删除的数据量
             long expiredCount;
             // 已经删除数据量
@@ -70,4 +80,28 @@ public class DeleteDeliveryDataTask {
         BigInteger bigInteger = (BigInteger) selectQueryCount.getSingleResult();
         return bigInteger.longValue();
     }
+
+
+    /**
+     * 凌晨五点 查询定时任务 删除记录
+     */
+    // @Scheduled(cron = "0 0 4 * * ?")
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteNewDataTask() {
+        for (DslBaseService dslService : dslBaseServices) {
+            // 数据中需要删除的数据量
+            long expiredCount;
+            // 已经删除数据量
+            long totalDeleted = 0L;
+            // 时间偏移2个月
+            DateTime date = DateUtil.offsetMonth(DateUtil.date(), -2);
+            do {
+                int executeUpdate = dslService.deleteDateByDateAndLimitNum(date, 50000);
+                totalDeleted += executeUpdate;
+                expiredCount = dslService.countByDate(date);
+            } while (expiredCount > 0);
+            log.info("========  delete tag{} table size as [{}]   ========", dslService, totalDeleted);
+        }
+    }
 }

src/main/java/com/baiyee/adcallback/task/TfSourceTask.java

@@ -53,7 +53,7 @@ public class TfSourceTask {
      * <p>
      * 所有今天的数据压缩成投放包
      */
-    @Scheduled(cron = "0 0 1 * * ? ")
+    // @Scheduled(cron = "0 0 1 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void tfSource() {
         log.info("++++++++++++++++++++++TfSource Sync start time {} ++++++++++++++++", DateUtil.now());