diff --git a/src/main/java/com/baiyee/adcallback/service/BdBackDateService.java b/src/main/java/com/baiyee/adcallback/service/BdBackDateService.java index f7780ca..945bc12 100644 --- a/src/main/java/com/baiyee/adcallback/service/BdBackDateService.java +++ b/src/main/java/com/baiyee/adcallback/service/BdBackDateService.java @@ -13,14 +13,12 @@ public interface BdBackDateService { /** * 条件查询 - * @param toUpperCase null - * @param empty "" - * @param imeiTag __imei__ + * * @param startTime begin time - * @param endTime end time - * @param tagList tag - * @param flag num or link + * @param endTime end time + * @param tagList tag + * @param flag num or link * @return */ - List queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag); } diff --git a/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java b/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java index 41bc10e..135d705 100644 --- a/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java +++ b/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java @@ -13,14 +13,12 @@ public interface GdtBackDateService { /** * 条件查询 - * @param toUpperCase null - * @param empty "" - * @param imeiTag __imei__ + * * @param startTime begin time - * @param endTime end time - * @param tagList tag - * @param flag num or link + * @param endTime end time + * @param tagList tag + * @param flag num or link * @return */ - List queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag); } diff --git a/src/main/java/com/baiyee/adcallback/service/JlV1BackDataService.java b/src/main/java/com/baiyee/adcallback/service/JlV1BackDataService.java index b73a47b..b04ddc0 100644 --- a/src/main/java/com/baiyee/adcallback/service/JlV1BackDataService.java +++ b/src/main/java/com/baiyee/adcallback/service/JlV1BackDataService.java @@ -13,14 +13,12 @@ import java.util.List; public interface JlV1BackDataService { /** * 条件查询 - * @param toUpperCase null - * @param empty "" - * @param imeiTag __imei__ + * * @param startTime begin time - * @param endTime end time - * @param tagList tag - * @param flag num or link + * @param endTime end time + * @param tagList tag + * @param flag num or link * @return */ - List queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag); } diff --git a/src/main/java/com/baiyee/adcallback/service/JlV2BackDataService.java b/src/main/java/com/baiyee/adcallback/service/JlV2BackDataService.java index c1d5a05..8f748d3 100644 --- a/src/main/java/com/baiyee/adcallback/service/JlV2BackDataService.java +++ b/src/main/java/com/baiyee/adcallback/service/JlV2BackDataService.java @@ -13,14 +13,12 @@ public interface JlV2BackDataService { /** * 条件查询 - * @param toUpperCase null - * @param empty "" - * @param imeiTag __imei__ + * * @param startTime begin time - * @param endTime end time - * @param tagList tag - * @param flag num or link + * @param endTime end time + * @param tagList tag + * @param flag num or link * @return */ - List queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag); } diff --git a/src/main/java/com/baiyee/adcallback/service/KsBackDateService.java b/src/main/java/com/baiyee/adcallback/service/KsBackDateService.java index 2a8684e..e2997c7 100644 --- a/src/main/java/com/baiyee/adcallback/service/KsBackDateService.java +++ b/src/main/java/com/baiyee/adcallback/service/KsBackDateService.java @@ -13,14 +13,12 @@ public interface KsBackDateService { /** * 条件查询 - * @param toUpperCase null - * @param empty "" - * @param imeiTag __imei__ + * * @param startTime begin time - * @param endTime end time - * @param tagList tag - * @param flag num or link + * @param endTime end time + * @param tagList tag + * @param flag num or link * @return */ - List queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag); } diff --git a/src/main/java/com/baiyee/adcallback/service/UcBackDateService.java b/src/main/java/com/baiyee/adcallback/service/UcBackDateService.java index d12a421..4fa81d0 100644 --- a/src/main/java/com/baiyee/adcallback/service/UcBackDateService.java +++ b/src/main/java/com/baiyee/adcallback/service/UcBackDateService.java @@ -13,14 +13,12 @@ public interface UcBackDateService { /** * 条件查询 - * @param toUpperCase null - * @param empty "" - * @param imeiTag __imei__ + * * @param startTime begin time - * @param endTime end time - * @param tagList tag - * @param flag num or link + * @param endTime end time + * @param tagList tag + * @param flag num or link * @return */ - List queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag); } diff --git a/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java b/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java index dc306cf..8c22104 100644 --- a/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java +++ b/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java @@ -13,14 +13,12 @@ public interface VivoBackDateService { /** * 条件查询 - * @param toUpperCase null - * @param empty "" - * @param imeiTag __imei__ + * * @param startTime begin time - * @param endTime end time - * @param tagList tag - * @param flag num or link + * @param endTime end time + * @param tagList tag + * @param flag num or link * @return */ - List queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag); } diff --git a/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java index 05cda36..bbc34f2 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java @@ -35,7 +35,7 @@ import java.util.List; public class BdBackDataServiceImpl extends AbstractService implements BdBackDateService { @Override public List queryByTagAndTimeAndFlag - (String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag) { + (Date startTime, Date endTime, List tagList, Integer flag) { return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); diff --git a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java index 1b875fb..d9c36ea 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java @@ -101,38 +101,31 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service { List tagList = entry.getValue(); switch (index) { case 1: - voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag - (CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag)); + voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag)); break; case 7: // v2 - voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag - (CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag)); + voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag)); break; case 2: // 快手 - voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag - (CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag)); + voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag)); break; case 3: // UC - voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag - (CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag)); + voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag)); break; case 4: // VIVO - voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag - (CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag)); + voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag)); break; case 5: //百度 - voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag - (CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag)); + voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag)); break; case 6: //广点通 - voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag - (CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag)); + voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag)); break; default: break; diff --git a/src/main/java/com/baiyee/adcallback/service/impl/GdtBackDataServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/GdtBackDataServiceImpl.java index f1c58a6..9b1bb7c 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/GdtBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/GdtBackDataServiceImpl.java @@ -36,7 +36,7 @@ public class GdtBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag) { + (Date startTime, Date endTime, List tagList, Integer flag) { return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); diff --git a/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java index fa94daf..3661f02 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java @@ -35,8 +35,7 @@ public class JlV1BackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag) { - + (Date startTime, Date endTime, List tagList, Integer flag) { return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); StringTemplate dateExpr; diff --git a/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java index aed3168..1959a6d 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java @@ -35,7 +35,7 @@ public class JlV2BackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag) { + (Date startTime, Date endTime, List tagList, Integer flag) { return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); diff --git a/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java index 5034f8a..18d845a 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java @@ -36,7 +36,7 @@ public class KsBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag) { + (Date startTime, Date endTime, List tagList, Integer flag) { return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); diff --git a/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java index 6fff9e6..66f5c09 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java @@ -36,7 +36,7 @@ public class UcBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag) { + (Date startTime, Date endTime, List tagList, Integer flag) { return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); diff --git a/src/main/java/com/baiyee/adcallback/service/impl/VivoBackDataServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/VivoBackDataServiceImpl.java index 79cd069..58d2bc8 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/VivoBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/VivoBackDataServiceImpl.java @@ -36,7 +36,7 @@ public class VivoBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List tagList, Integer flag) { + (Date startTime, Date endTime, List tagList, Integer flag) { return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3");