From cdb59a25b3c4a8b688693b41e88e45b3597464da Mon Sep 17 00:00:00 2001
From: ninftao <13586541001@163.com>
Date: Sat, 17 Jun 2023 10:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BackDataEntityService.java         |  6 +++---
 .../impl/BackDataEntityServiceImpl.java        | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/baiyee/adcallback/service/BackDataEntityService.java b/src/main/java/com/baiyee/adcallback/service/BackDataEntityService.java
index 47b242b..e7fee61 100644
--- a/src/main/java/com/baiyee/adcallback/service/BackDataEntityService.java
+++ b/src/main/java/com/baiyee/adcallback/service/BackDataEntityService.java
@@ -30,11 +30,11 @@ public interface BackDataEntityService {
      *
      * @param imeiFirst
      * @param imeiSecond
-     * @param date
-     * @param offsetMinute
+     * @param startDate
+     * @param endDate
      * @param tagStr
      * @param value
      * @return
      */
-    List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime offsetMinute, DateTime date, List<String> tagStr, Integer value);
+    List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime startDate, DateTime endDate, List<String> tagStr, Integer value);
 }
diff --git a/src/main/java/com/baiyee/adcallback/service/impl/BackDataEntityServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/BackDataEntityServiceImpl.java
index caafa47..52520fa 100644
--- a/src/main/java/com/baiyee/adcallback/service/impl/BackDataEntityServiceImpl.java
+++ b/src/main/java/com/baiyee/adcallback/service/impl/BackDataEntityServiceImpl.java
@@ -82,7 +82,7 @@ public class BackDataEntityServiceImpl implements BackDataEntityService {
 
 
     @Override
-    public List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime offsetMinute, DateTime date, List<String> tagStr, Integer value) {
+    public List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime startDate, DateTime endDate, List<String> tagStr, Integer value) {
 
         List<PlateFormDTO> newFormDTOList = Lists.newArrayList();
         switch (value) {
@@ -90,35 +90,35 @@ public class BackDataEntityServiceImpl implements BackDataEntityService {
                 List<String> v1TagList = Lists.newArrayList();
                 List<String> v2TagList = Lists.newArrayList();
                 for (String tag : tagStr) {
-                    ((tag.lastIndexOf("v2") > 0) ? v1TagList : v2TagList).add(tag);
+                    ((tag.lastIndexOf("v2") > 0) ? v2TagList : v1TagList).add(tag);
                 }
                 // 巨量
                 if (!CollectionUtils.isEmpty(v1TagList)) {
-                    newFormDTOList.addAll(jlv1BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, v1TagList));
+                    newFormDTOList.addAll(jlv1BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, v1TagList));
                 }
                 if (!CollectionUtils.isEmpty(v2TagList)) {
-                    newFormDTOList.addAll(jlv2BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, v2TagList));
+                    newFormDTOList.addAll(jlv2BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, v2TagList));
                 }
                 break;
             case 2:
                 // 快手
-                newFormDTOList = tbKSNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
+                newFormDTOList = tbKSNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
                 break;
             case 3:
                 // UC
-                newFormDTOList = tbUcBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
+                newFormDTOList = tbUcBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
                 break;
             case 4:
                 // VIVO
-                newFormDTOList = tbVivoBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
+                newFormDTOList = tbVivoBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
                 break;
             case 5:
                 // 百度
-                newFormDTOList = tbBDNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
+                newFormDTOList = tbBDNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
                 break;
             case 6:
                 // 广点通
-                newFormDTOList = tbGdtNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr, "android");
+                newFormDTOList = tbGdtNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr, "android");
                 break;
             default:
         }