From b49c07318d4b1059b557acaaeb2a475b5318c38b Mon Sep 17 00:00:00 2001
From: bynt <13586541001@163.com>
Date: Thu, 9 Nov 2023 14:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/TbJlTripartiteDataEntityRepository.java      | 6 ++----
 .../com/baiyee/adcallback/service/TripartiteService.java    | 4 +---
 .../adcallback/service/impl/TripartiteServiceImpl.java      | 4 ++--
 .../com/baiyee/adcallback/task/TripartiteRecordTask.java    | 3 +--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java
index 6a56d66..8485478 100644
--- a/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java
+++ b/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java
@@ -20,15 +20,13 @@ public interface TbJlTripartiteDataEntityRepository extends BaseRepository<TbJlT
     /**
      * 查询数据
      *
-     * @param imeiStrFirst
-     * @param imeiSecond
      * @param startDate
      * @param endDate
      * @return
      */
     @Query("select new com.baiyee.adcallback.api.dto.TripartiteDTO(imei as imei,oaid as oaid,pushType as pushType , sourceType as sourceType) from " +
-            " TbJlTripartiteDataEntity  where imei != :imeiStrFirst and imei != :imeiSecond  and gmtCreate >= :startDate and gmtCreate < :endDate")
-    List<TripartiteDTO> queryPlateFormDTO(@Param("imeiStrFirst") String imeiStrFirst, @Param("imeiSecond") String imeiSecond, @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate);
+            " TbJlTripartiteDataEntity  where   gmtCreate >= :startDate and gmtCreate < :endDate")
+    List<TripartiteDTO> queryPlateFormDTO( @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate);
 
 
 
diff --git a/src/main/java/com/baiyee/adcallback/service/TripartiteService.java b/src/main/java/com/baiyee/adcallback/service/TripartiteService.java
index 94d9afb..e01630b 100644
--- a/src/main/java/com/baiyee/adcallback/service/TripartiteService.java
+++ b/src/main/java/com/baiyee/adcallback/service/TripartiteService.java
@@ -13,11 +13,9 @@ public interface TripartiteService {
 
     /**
      *
-     * @param empty
-     * @param imeiStr
      * @param offsetMinute
      * @param date
      * @return
      */
-    List<TripartiteDTO> queryTripartiteData(String empty, String imeiStr, DateTime offsetMinute, DateTime date);
+    List<TripartiteDTO> queryTripartiteData(DateTime offsetMinute, DateTime date);
 }
diff --git a/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java
index 23d8c95..6b2df90 100644
--- a/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java
+++ b/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java
@@ -20,7 +20,7 @@ public class TripartiteServiceImpl implements TripartiteService {
     private final TbJlTripartiteDataEntityRepository jlTripartiteDataEntityRepository;
 
     @Override
-    public List<TripartiteDTO> queryTripartiteData(String empty, String imeiStr, DateTime offsetMinute, DateTime date) {
-        return jlTripartiteDataEntityRepository.queryPlateFormDTO(empty, imeiStr, offsetMinute, date);
+    public List<TripartiteDTO> queryTripartiteData( DateTime offsetMinute, DateTime date) {
+        return jlTripartiteDataEntityRepository.queryPlateFormDTO(offsetMinute, date);
     }
 }
diff --git a/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java b/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java
index 553537d..b047327 100644
--- a/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java
+++ b/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java
@@ -60,8 +60,7 @@ public class TripartiteRecordTask {
                 DateUtil.offsetMinute(date, -15) : DateUtil.offsetMinute(beginTime, -15);
         beginTime = offsetMinute;
         log.info("================ the begin time as {} end time as  {} ================", offsetMinute, date);
-        List<TripartiteDTO> dtoList = tripartiteService.queryTripartiteData
-                (CharSequenceUtil.EMPTY, "__IMEI__", offsetMinute, date);
+        List<TripartiteDTO> dtoList = tripartiteService.queryTripartiteData(offsetMinute, date);
         log.info("================ the dto list  as {}  ================", dtoList.size());
         if (CollUtil.isNotEmpty(dtoList)) {
             List<TripartitePlatformDTO> list = Lists.newArrayList();