diff --git a/src/main/java/com/baiyee/adcallback/api/dto/DmpMonitorNumDto.java b/src/main/java/com/baiyee/adcallback/api/dto/DmpMonitorNumDto.java index 87d9611..023463c 100644 --- a/src/main/java/com/baiyee/adcallback/api/dto/DmpMonitorNumDto.java +++ b/src/main/java/com/baiyee/adcallback/api/dto/DmpMonitorNumDto.java @@ -21,6 +21,7 @@ public class DmpMonitorNumDto { private String mail; + private Integer vpoint; private Integer version; diff --git a/src/main/java/com/baiyee/adcallback/service/DslBaseService.java b/src/main/java/com/baiyee/adcallback/service/DslBaseService.java index 986b8f4..b3630c1 100644 --- a/src/main/java/com/baiyee/adcallback/service/DslBaseService.java +++ b/src/main/java/com/baiyee/adcallback/service/DslBaseService.java @@ -21,9 +21,10 @@ public interface DslBaseService { * @param tagList tag * @param flag num or link * @param type + * @param vPoint * @return */ - List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag, Integer type); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint); /** * 删除数据 diff --git a/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java b/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java index 60d0c6f..3d92aec 100644 --- a/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java +++ b/src/main/java/com/baiyee/adcallback/service/GdtBackDateService.java @@ -19,7 +19,8 @@ public interface GdtBackDateService { * @param tagList tag * @param flag num or link * @param type + * @param vPoint * @return */ - List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag, Integer type); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint); } diff --git a/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java b/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java index 51a64a4..d4acb6e 100644 --- a/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java +++ b/src/main/java/com/baiyee/adcallback/service/VivoBackDateService.java @@ -21,5 +21,5 @@ public interface VivoBackDateService { * @param type * @return */ - List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag, Integer type); + List queryByTagAndTimeAndFlag(Date startTime, Date endTime, List tagList, Integer flag, Integer type,Integer vPoint); } 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 468b7f8..16177e9 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java @@ -3,6 +3,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 cn.hutool.core.util.ObjectUtil; import com.baiyee.adcallback.api.constants.SqlConstant; import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto; import com.baiyee.adcallback.api.vo.QueryImeiVO; @@ -15,10 +16,7 @@ import com.baiyee.adcallback.service.BdBackDateService; import com.querydsl.core.Tuple; import com.querydsl.core.types.Projections; import com.querydsl.core.types.SubQueryExpression; -import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.core.types.dsl.SimpleTemplate; -import com.querydsl.core.types.dsl.StringPath; -import com.querydsl.core.types.dsl.StringTemplate; +import com.querydsl.core.types.dsl.*; import com.querydsl.sql.SQLExpressions; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -38,7 +36,7 @@ public class BdBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (Date startTime, Date endTime, List tagList, Integer flag, Integer type) { + (Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint) { Timestamp endTimeStamp = new Timestamp(endTime.getTime()); Timestamp startTimeStamp = new Timestamp(startTime.getTime()); return this.applyJPA(query -> { @@ -50,26 +48,24 @@ public class BdBackDataServiceImpl extends AbstractService t3Imei = Expressions.template(String.class, "t3.imei"); SimpleTemplate t3Oaid = Expressions.template(String.class, "t3.oaid"); SimpleTemplate t3Date = Expressions.template(Date.class, "t3.gmtCreate"); - - if (type == 2){ + if (type == 2) { + BooleanExpression expression = getOaidBooleanExpression(tagList, vPoint, startTimeStamp, endTimeStamp); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select (bdNewBackdata.oaid, bdNewBackdata.tag, bdNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (bdNewBackdata).where(bdNewBackdata.tag.in(tagList).and(bdNewBackdata.gmtCreate.gt(startTimeStamp)).and(bdNewBackdata.gmtCreate.lt(endTimeStamp)).and - (bdNewBackdata.oaid.ne(CharSequenceUtil.EMPTY)).and(bdNewBackdata.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(bdNewBackdata.oaid.ne(DataConstant.IDFA_NUM))).groupBy(bdNewBackdata.oaid, bdNewBackdata.tag); - + (bdNewBackdata).where(expression).groupBy(bdNewBackdata.oaid, bdNewBackdata.tag); // 结果返回 List voList = query.select(Projections.bean (QueryQuantityVO.class, bdNewBackdata.oaid.count().as("num"), bdNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).from (bdNewBackdata).innerJoin(gmtCreate, t3).on(bdNewBackdata.oaid.eq(t3Oaid).and(bdNewBackdata.gmtCreate.eq(t3Date).and(bdNewBackdata.tag.eq(t3Tag)))).groupBy(dateExpr, bdNewBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, voList); } + + BooleanExpression expression = getImeiBooleanExpression(tagList, vPoint, startTimeStamp, endTimeStamp); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select (bdNewBackdata.imei, bdNewBackdata.tag, bdNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (bdNewBackdata).where(bdNewBackdata.tag.in(tagList).and(bdNewBackdata.gmtCreate.gt(startTimeStamp)).and(bdNewBackdata.gmtCreate.lt(endTimeStamp)).and - (bdNewBackdata.imei.ne(CharSequenceUtil.EMPTY)).and(bdNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(bdNewBackdata.imei.ne(DataConstant.IMEI_TAG))).groupBy(bdNewBackdata.imei, bdNewBackdata.tag); - + (bdNewBackdata).where(expression).groupBy(bdNewBackdata.imei, bdNewBackdata.tag); // 结果返回 List voList = query.select(Projections.bean (QueryQuantityVO.class, bdNewBackdata.imei.count().as("num"), bdNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).from @@ -80,25 +76,43 @@ public class BdBackDataServiceImpl extends AbstractService oaidVOList = query.select(Projections.bean (QueryImeiVO.class, bdNewBackdata.oaid.as("imei"), bdNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(bdNewBackdata).where - (bdNewBackdata.tag.in(tagList).and(bdNewBackdata.gmtCreate.gt(startTimeStamp)).and(bdNewBackdata.gmtCreate.lt(endTimeStamp)).and(bdNewBackdata.oaid.ne(CharSequenceUtil.EMPTY)).and - (bdNewBackdata.oaid.ne(DataConstant.IDFA_NUM)).and(bdNewBackdata.oaid.ne(DataConstant.IMEI_TAG))).groupBy(bdNewBackdata.oaid, bdNewBackdata.tag).fetch(); + (expression).groupBy(bdNewBackdata.oaid, bdNewBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, oaidVOList); } + BooleanExpression expression = getImeiBooleanExpression(tagList, vPoint, startTimeStamp, endTimeStamp); List imeiVOList = query.select(Projections.bean (QueryImeiVO.class, bdNewBackdata.imei, bdNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(bdNewBackdata).where - (bdNewBackdata.tag.in(tagList).and(bdNewBackdata.gmtCreate.gt(startTimeStamp)).and(bdNewBackdata.gmtCreate.lt(endTimeStamp)).and(bdNewBackdata.imei.ne(CharSequenceUtil.EMPTY)).and - (bdNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(bdNewBackdata.imei.ne(DataConstant.IMEI_TAG))).groupBy(bdNewBackdata.imei, bdNewBackdata.tag).fetch(); + (expression).groupBy(bdNewBackdata.imei, bdNewBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } + private BooleanExpression getImeiBooleanExpression(List tagList, Integer vPoint, Timestamp startTimeStamp, Timestamp endTimeStamp) { + BooleanExpression expression = bdNewBackdata.tag.in(tagList).and(bdNewBackdata.gmtCreate.gt(startTimeStamp)).and(bdNewBackdata.gmtCreate.lt(endTimeStamp)).and + (bdNewBackdata.imei.ne(CharSequenceUtil.EMPTY)).and(bdNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(bdNewBackdata.imei.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)){ + expression = expression.and(bdNewBackdata.vpoint.eq(vPoint)); + } + return expression; + } + + private BooleanExpression getOaidBooleanExpression(List tagList, Integer vPoint, Timestamp startTimeStamp, Timestamp endTimeStamp) { + BooleanExpression expression = bdNewBackdata.tag.in(tagList).and(bdNewBackdata.gmtCreate.gt(startTimeStamp)).and(bdNewBackdata.gmtCreate.lt(endTimeStamp)).and(bdNewBackdata.oaid.ne(CharSequenceUtil.EMPTY)).and + (bdNewBackdata.oaid.ne(DataConstant.IDFA_NUM)).and(bdNewBackdata.oaid.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)){ + expression = expression.and(bdNewBackdata.vpoint.eq(vPoint)); + } + return expression; + } + @Override public Long deleteDateByDateAndLimitNum(DateTime date, Integer num) { Timestamp timestamp = new Timestamp(date.getTime()); - return this.newQuery().delete(bdNewBackdata).where(bdNewBackdata.gmtCreate.lt(timestamp)).execute(); + return this.newQuery().delete(bdNewBackdata).where(bdNewBackdata.gmtCreate.gt(timestamp)).execute(); } @Override 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 5fe824e..304f2b4 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java @@ -77,6 +77,7 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service { Map> talbeMap = Maps.newHashMap(); List voList = Lists.newArrayList(); Integer type = dmpMonitorNumDto.getQueryType(); + Integer vPoint = dmpMonitorNumDto.getVpoint(); Date endTime = dmpMonitorNumDto.getEndTime(); Date startTime = dmpMonitorNumDto.getStartTime(); for (String tag : dmpMonitorNumDto.getTags()) { @@ -100,31 +101,31 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service { List tagList = entry.getValue(); switch (index) { case 1: - voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type)); + voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type,vPoint)); break; case 7: // v2 - voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type)); + voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type,vPoint)); break; case 2: // 快手 - voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type)); + voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type,vPoint)); break; case 3: // UC - voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type)); + voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type,vPoint)); break; case 4: // VIVO - voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type)); + voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type,vPoint)); break; case 5: //百度 - voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type)); + voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type,vPoint)); break; case 6: //广点通 - voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type)); + voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type, vPoint)); 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 6ad5d8a..4515010 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/GdtBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/GdtBackDataServiceImpl.java @@ -2,6 +2,7 @@ package com.baiyee.adcallback.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.text.CharSequenceUtil; +import cn.hutool.core.util.ObjectUtil; import com.baiyee.adcallback.api.constants.SqlConstant; import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto; import com.baiyee.adcallback.api.vo.QueryImeiVO; @@ -14,14 +15,12 @@ import com.baiyee.adcallback.service.GdtBackDateService; import com.querydsl.core.Tuple; import com.querydsl.core.types.Projections; import com.querydsl.core.types.SubQueryExpression; -import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.core.types.dsl.SimpleTemplate; -import com.querydsl.core.types.dsl.StringPath; -import com.querydsl.core.types.dsl.StringTemplate; +import com.querydsl.core.types.dsl.*; import com.querydsl.sql.SQLExpressions; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.sql.Timestamp; import java.util.Date; import java.util.List; @@ -32,16 +31,18 @@ import java.util.List; @Service @RequiredArgsConstructor -public class GdtBackDataServiceImpl extends AbstractService implements GdtBackDateService { +public class GdtBackDataServiceImpl extends AbstractService implements GdtBackDateService { + QTbGdtNewBackdataEntity gdtNewBackdata = QTbGdtNewBackdataEntity.tbGdtNewBackdataEntity; @Override public List queryByTagAndTimeAndFlag - (Date startTime, Date endTime, List tagList, Integer flag, Integer type) { + (Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint) { + Timestamp endTimeStamp = new Timestamp(endTime.getTime()); + Timestamp startTimeStamp = new Timestamp(startTime.getTime()); return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); StringTemplate dateExpr; - QTbGdtNewBackdataEntity gdtNewBackdata = QTbGdtNewBackdataEntity.tbGdtNewBackdataEntity; if (flag == 1) { dateExpr = Expressions.stringTemplate(SqlConstant.DATE_EXPR, gdtNewBackdata.gmtCreate); SimpleTemplate t3Tag = Expressions.template(String.class, "t3.tag"); @@ -49,13 +50,12 @@ public class GdtBackDataServiceImpl extends AbstractService t3Oaid = Expressions.template(String.class, "t3.oaid"); SimpleTemplate t3Date = Expressions.template(Date.class, "t3.gmtCreate"); - - if (type == 2){ + if (type == 2) { + BooleanExpression expression = getOaidBooleanExpression(tagList, vPoint, startTimeStamp, endTimeStamp); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select - (gdtNewBackdata.oaid, gdtNewBackdata.tag,gdtNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (gdtNewBackdata).where(gdtNewBackdata.tag.in(tagList).and(gdtNewBackdata.oaid.ne(CharSequenceUtil.EMPTY).and - (gdtNewBackdata.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(gdtNewBackdata.oaid.ne(DataConstant.IMEI_TAG)))).groupBy(gdtNewBackdata.oaid,gdtNewBackdata.tag); + (gdtNewBackdata.oaid, gdtNewBackdata.tag, gdtNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from + (gdtNewBackdata).where(expression).groupBy(gdtNewBackdata.oaid, gdtNewBackdata.tag); // 结果返回 List voList = query.select(Projections.bean @@ -63,11 +63,11 @@ public class GdtBackDataServiceImpl extends AbstractService gmtCreate = SQLExpressions.select - (gdtNewBackdata.imei, gdtNewBackdata.tag,gdtNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (gdtNewBackdata).where(gdtNewBackdata.tag.in(tagList).and(gdtNewBackdata.imei.ne(CharSequenceUtil.EMPTY).and - (gdtNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(gdtNewBackdata.imei.ne(DataConstant.IMEI_TAG)))).groupBy(gdtNewBackdata.imei,gdtNewBackdata.tag); + (gdtNewBackdata.imei, gdtNewBackdata.tag, gdtNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from + (gdtNewBackdata).where(expression).groupBy(gdtNewBackdata.imei, gdtNewBackdata.tag); // 结果返回 List voList = query.select(Projections.bean @@ -80,17 +80,36 @@ public class GdtBackDataServiceImpl extends AbstractService imeiVOList = query.select(Projections.bean (QueryImeiVO.class, gdtNewBackdata.oaid.as("imei"), gdtNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(gdtNewBackdata).where - (gdtNewBackdata.tag.in(tagList).and(gdtNewBackdata.oaid.ne(CharSequenceUtil.EMPTY).and(gdtNewBackdata.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(gdtNewBackdata.oaid.ne - (DataConstant.IDFA_NUM)))).groupBy(gdtNewBackdata.oaid,gdtNewBackdata.tag).fetch(); + (expression).groupBy(gdtNewBackdata.oaid, gdtNewBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); } + BooleanExpression expression = getImeiBooleanExpression(tagList, vPoint, startTimeStamp, endTimeStamp); List imeiVOList = query.select(Projections.bean (QueryImeiVO.class, gdtNewBackdata.imei, gdtNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(gdtNewBackdata).where - (gdtNewBackdata.tag.in(tagList).and(gdtNewBackdata.imei.ne(CharSequenceUtil.EMPTY).and(gdtNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(gdtNewBackdata.imei.ne - (DataConstant.IMEI_TAG)))).groupBy(gdtNewBackdata.imei,gdtNewBackdata.tag).fetch(); + (expression).groupBy(gdtNewBackdata.imei, gdtNewBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } + + + private BooleanExpression getImeiBooleanExpression(List tagList, Integer vPoint, Timestamp startTimeStamp, Timestamp endTimeStamp) { + BooleanExpression expression = gdtNewBackdata.tag.in(tagList).and(gdtNewBackdata.gmtCreate.gt(startTimeStamp)).and(gdtNewBackdata.gmtCreate.lt(endTimeStamp)).and + (gdtNewBackdata.imei.ne(CharSequenceUtil.EMPTY)).and(gdtNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(gdtNewBackdata.imei.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(gdtNewBackdata.vpoint.eq(vPoint)); + } + return expression; + } + + private BooleanExpression getOaidBooleanExpression(List tagList, Integer vPoint, Timestamp startTimeStamp, Timestamp endTimeStamp) { + BooleanExpression expression = gdtNewBackdata.tag.in(tagList).and(gdtNewBackdata.gmtCreate.gt(startTimeStamp)).and(gdtNewBackdata.gmtCreate.lt(endTimeStamp)).and(gdtNewBackdata.oaid.ne(CharSequenceUtil.EMPTY)).and + (gdtNewBackdata.oaid.ne(DataConstant.IDFA_NUM)).and(gdtNewBackdata.oaid.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(gdtNewBackdata.vpoint.eq(vPoint)); + } + return expression; + } } 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 ebfae37..2eb5dc9 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java @@ -3,6 +3,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 cn.hutool.core.util.ObjectUtil; import com.baiyee.adcallback.api.constants.SqlConstant; import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto; import com.baiyee.adcallback.api.vo.QueryImeiVO; @@ -15,10 +16,7 @@ import com.baiyee.adcallback.service.JlV1BackDataService; import com.querydsl.core.Tuple; import com.querydsl.core.types.Projections; import com.querydsl.core.types.SubQueryExpression; -import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.core.types.dsl.SimpleTemplate; -import com.querydsl.core.types.dsl.StringPath; -import com.querydsl.core.types.dsl.StringTemplate; +import com.querydsl.core.types.dsl.*; import com.querydsl.sql.SQLExpressions; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -38,7 +36,7 @@ public class JlV1BackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (Date startTime, Date endTime, List tagList, Integer flag, Integer type) { + (Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint) { return this.applyJPA(query -> { StringTemplate dateExpr; StringPath t3 = Expressions.stringPath("t3"); @@ -49,12 +47,12 @@ public class JlV1BackDataServiceImpl extends AbstractService t3Oaid = Expressions.template(String.class, "t3.oaid"); SimpleTemplate t3Date = Expressions.template(Date.class, "t3.gmtCreate"); - if (type == 2){ + if (type == 2) { + BooleanExpression expression = getOaidBooleanExpression(tagList, vPoint, startTime, endTime); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select (v1Entity.oaid, v1Entity.tag, v1Entity.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (v1Entity).where(v1Entity.tag.in(tagList).and(v1Entity.gmtCreate.gt(startTime)).and(v1Entity.gmtCreate.lt(endTime)).and - (v1Entity.oaid.ne(CharSequenceUtil.EMPTY)).and(v1Entity.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(v1Entity.oaid.ne(DataConstant.IDFA_NUM))).groupBy(v1Entity.oaid, v1Entity.tag); + (v1Entity).where(expression).groupBy(v1Entity.oaid, v1Entity.tag); // 结果返回 List voList = query.select(Projections.bean @@ -63,11 +61,11 @@ public class JlV1BackDataServiceImpl extends AbstractService gmtCreate = SQLExpressions.select (v1Entity.imei, v1Entity.tag, v1Entity.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (v1Entity).where(v1Entity.tag.in(tagList).and(v1Entity.gmtCreate.gt(startTime)).and(v1Entity.gmtCreate.lt(endTime)).and - (v1Entity.imei.ne(CharSequenceUtil.EMPTY)).and(v1Entity.imei.ne(DataConstant.IMEI_NULL_TAG)).and(v1Entity.imei.ne(DataConstant.IMEI_TAG))).groupBy(v1Entity.imei, v1Entity.tag); + (v1Entity).where(expression).groupBy(v1Entity.imei, v1Entity.tag); // 结果返回 List voList = query.select(Projections.bean @@ -78,22 +76,41 @@ public class JlV1BackDataServiceImpl extends AbstractService imeiVOList = query.select(Projections.bean (QueryImeiVO.class, v1Entity.oaid.as("imei"), v1Entity.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(v1Entity).where - (v1Entity.tag.in(tagList).and(v1Entity.gmtCreate.gt(startTime)).and(v1Entity.gmtCreate.lt(endTime)).and(v1Entity.oaid.ne(CharSequenceUtil.EMPTY)).and - (v1Entity.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(v1Entity.oaid.ne(DataConstant.IDFA_NUM))).groupBy(v1Entity.oaid, v1Entity.tag).fetch(); + (expression).groupBy(v1Entity.oaid, v1Entity.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); } + BooleanExpression expression = getImeiBooleanExpression(tagList, vPoint, startTime, endTime); List imeiVOList = query.select(Projections.bean (QueryImeiVO.class, v1Entity.imei, v1Entity.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(v1Entity).where - (v1Entity.tag.in(tagList).and(v1Entity.gmtCreate.gt(startTime)).and(v1Entity.gmtCreate.lt(endTime)).and(v1Entity.imei.ne(CharSequenceUtil.EMPTY)).and - (v1Entity.imei.ne(DataConstant.IMEI_NULL_TAG)).and(v1Entity.imei.ne(DataConstant.IMEI_TAG))).groupBy(v1Entity.imei, v1Entity.tag).fetch(); + (expression).groupBy(v1Entity.imei, v1Entity.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } + + private BooleanExpression getImeiBooleanExpression(List tagList, Integer vPoint, Date startTimeStamp, Date endTimeStamp) { + BooleanExpression expression = v1Entity.tag.in(tagList).and(v1Entity.gmtCreate.gt(startTimeStamp)).and(v1Entity.gmtCreate.lt(endTimeStamp)).and + (v1Entity.imei.ne(CharSequenceUtil.EMPTY)).and(v1Entity.imei.ne(DataConstant.IMEI_NULL_TAG)).and(v1Entity.imei.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(v1Entity.vpoint.eq(vPoint)); + } + return expression; + } + + private BooleanExpression getOaidBooleanExpression(List tagList, Integer vPoint, Date startTimeStamp, Date endTimeStamp) { + BooleanExpression expression = v1Entity.tag.in(tagList).and(v1Entity.gmtCreate.gt(startTimeStamp)).and(v1Entity.gmtCreate.lt(endTimeStamp)).and(v1Entity.oaid.ne(CharSequenceUtil.EMPTY)).and + (v1Entity.oaid.ne(DataConstant.IDFA_NUM)).and(v1Entity.oaid.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(v1Entity.vpoint.eq(vPoint)); + } + return expression; + } + @Override public Long deleteDateByDateAndLimitNum(DateTime date, Integer num) { return this.newQuery().delete(v1Entity).where(v1Entity.gmtCreate.lt(date)).execute(); 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 5e8f956..68b4f62 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java @@ -1,8 +1,10 @@ package com.baiyee.adcallback.service.impl; +import cn.hutool.core.codec.Base64; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.text.CharSequenceUtil; +import cn.hutool.core.util.ObjectUtil; import com.baiyee.adcallback.api.constants.SqlConstant; import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto; import com.baiyee.adcallback.api.vo.QueryImeiVO; @@ -15,10 +17,7 @@ import com.baiyee.adcallback.service.JlV2BackDataService; import com.querydsl.core.Tuple; import com.querydsl.core.types.Projections; import com.querydsl.core.types.SubQueryExpression; -import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.core.types.dsl.SimpleTemplate; -import com.querydsl.core.types.dsl.StringPath; -import com.querydsl.core.types.dsl.StringTemplate; +import com.querydsl.core.types.dsl.*; import com.querydsl.sql.SQLExpressions; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -36,7 +35,7 @@ public class JlV2BackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (Date startTime, Date endTime, List tagList, Integer flag, Integer type) { + (Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint) { return this.applyJPA(query -> { StringTemplate dateExpr; StringPath t3 = Expressions.stringPath("t3"); @@ -47,24 +46,23 @@ public class JlV2BackDataServiceImpl extends AbstractService t3Oaid = Expressions.template(String.class, "t3.oaid"); SimpleTemplate t3Date = Expressions.template(Date.class, "t3.gmtCreate"); - - if (type == 2){ + if (type == 2) { + BooleanExpression expression = getOaidBooleanExpression(tagList, vPoint, startTime, endTime); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select (v2Entity.oaid, v2Entity.tag, v2Entity.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (v2Entity).where(v2Entity.tag.in(tagList).and(v2Entity.gmtCreate.gt(startTime)).and(v2Entity.gmtCreate.lt(endTime)).and - (v2Entity.oaid.ne(CharSequenceUtil.EMPTY)).and(v2Entity.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(v2Entity.oaid.ne(DataConstant.IDFA_NUM))).groupBy(v2Entity.oaid, v2Entity.tag); + (v2Entity).where(expression).groupBy(v2Entity.oaid, v2Entity.tag); // 结果返回 List voList = query.select(Projections.bean (QueryQuantityVO.class, v2Entity.oaid.count().as("num"), v2Entity.tag, dateExpr.as(SqlConstant.CREATE_TIME))).from (v2Entity).innerJoin(gmtCreate, t3).on(v2Entity.oaid.eq(t3Oaid).and(v2Entity.gmtCreate.eq(t3Date).and(v2Entity.tag.eq(t3Tag)))).groupBy(dateExpr, v2Entity.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, voList); } + BooleanExpression expression = getImeiBooleanExpression(tagList, vPoint, startTime, endTime); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select (v2Entity.imei, v2Entity.tag, v2Entity.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (v2Entity).where(v2Entity.tag.in(tagList).and(v2Entity.gmtCreate.gt(startTime)).and(v2Entity.gmtCreate.lt(endTime)).and - (v2Entity.imei.ne(CharSequenceUtil.EMPTY)).and(v2Entity.imei.ne(DataConstant.IMEI_NULL_TAG)).and(v2Entity.imei.ne(DataConstant.IMEI_TAG))).groupBy(v2Entity.imei, v2Entity.tag); + (v2Entity).where(expression).groupBy(v2Entity.imei, v2Entity.tag); // 结果返回 List voList = query.select(Projections.bean @@ -77,20 +75,39 @@ public class JlV2BackDataServiceImpl extends AbstractService imeiVOList = query.select(Projections.bean (QueryImeiVO.class, v2Entity.oaid.as("imei"), v2Entity.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(v2Entity).where - (v2Entity.tag.in(tagList).and(v2Entity.gmtCreate.gt(startTime)).and(v2Entity.gmtCreate.lt(endTime)).and(v2Entity.oaid.ne(CharSequenceUtil.EMPTY)).and - (v2Entity.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(v2Entity.oaid.ne(DataConstant.IDFA_NUM))).groupBy(v2Entity.oaid, v2Entity.tag).fetch(); + (expression).groupBy(v2Entity.oaid, v2Entity.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); } + BooleanExpression expression = getImeiBooleanExpression(tagList, vPoint, startTime, endTime); List imeiVOList = query.select(Projections.bean (QueryImeiVO.class, v2Entity.imei, v2Entity.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(v2Entity).where - (v2Entity.tag.in(tagList).and(v2Entity.gmtCreate.gt(startTime)).and(v2Entity.gmtCreate.lt(endTime)).and(v2Entity.imei.ne(CharSequenceUtil.EMPTY)).and - (v2Entity.imei.ne(DataConstant.IMEI_NULL_TAG)).and(v2Entity.imei.ne(DataConstant.IMEI_TAG))).groupBy(v2Entity.imei, v2Entity.tag).fetch(); + (expression).groupBy(v2Entity.imei, v2Entity.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } + + private BooleanExpression getImeiBooleanExpression(List tagList, Integer vPoint, Date startTimeStamp, Date endTimeStamp) { + BooleanExpression expression = v2Entity.tag.in(tagList).and(v2Entity.gmtCreate.gt(startTimeStamp)).and(v2Entity.gmtCreate.lt(endTimeStamp)).and + (v2Entity.imei.ne(CharSequenceUtil.EMPTY)).and(v2Entity.imei.ne(DataConstant.IMEI_NULL_TAG)).and(v2Entity.imei.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(v2Entity.vpoint.eq(vPoint)); + } + return expression; + } + + private BooleanExpression getOaidBooleanExpression(List tagList, Integer vPoint, Date startTimeStamp, Date endTimeStamp) { + BooleanExpression expression = v2Entity.tag.in(tagList).and(v2Entity.gmtCreate.gt(startTimeStamp)).and(v2Entity.gmtCreate.lt(endTimeStamp)).and(v2Entity.oaid.ne(CharSequenceUtil.EMPTY)).and + (v2Entity.oaid.ne(DataConstant.IDFA_NUM)).and(v2Entity.oaid.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(v2Entity.vpoint.eq(vPoint)); + } + return expression; + } + @Override public Long deleteDateByDateAndLimitNum(DateTime date, Integer num) { return this.newQuery().delete(v2Entity).where(v2Entity.gmtCreate.lt(date)).execute(); 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 1e0a174..58b8445 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java @@ -3,6 +3,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 cn.hutool.core.util.ObjectUtil; import com.baiyee.adcallback.api.constants.SqlConstant; import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto; import com.baiyee.adcallback.api.vo.QueryImeiVO; @@ -15,10 +16,7 @@ import com.baiyee.adcallback.service.KsBackDateService; import com.querydsl.core.Tuple; import com.querydsl.core.types.Projections; import com.querydsl.core.types.SubQueryExpression; -import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.core.types.dsl.SimpleTemplate; -import com.querydsl.core.types.dsl.StringPath; -import com.querydsl.core.types.dsl.StringTemplate; +import com.querydsl.core.types.dsl.*; import com.querydsl.sql.SQLExpressions; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -38,7 +36,7 @@ public class KsBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (Date startTime, Date endTime, List tagList, Integer flag, Integer type) { + (Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint) { Timestamp endTimeStamp = new Timestamp(endTime.getTime()); Timestamp startTimeStamp = new Timestamp(startTime.getTime()); return this.applyJPA(query -> { @@ -52,12 +50,12 @@ public class KsBackDataServiceImpl extends AbstractService t3Oaid = Expressions.template(String.class, "t3.oaid"); SimpleTemplate t3Date = Expressions.template(Date.class, "t3.gmtCreate"); - if (type == 2){ + if (type == 2) { + BooleanExpression expression = getOaidBooleanExpression(tagList, vPoint, startTimeStamp, endTimeStamp); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select (ksNewBackdata.oaid, ksNewBackdata.tag, ksNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (ksNewBackdata).where(ksNewBackdata.tag.in(tagList).and(ksNewBackdata.gmtCreate.gt(startTimeStamp)).and(ksNewBackdata.gmtCreate.lt(endTimeStamp)).and - (ksNewBackdata.oaid.ne(CharSequenceUtil.EMPTY)).and(ksNewBackdata.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(ksNewBackdata.oaid.ne(DataConstant.IDFA_NUM))).groupBy(ksNewBackdata.oaid, ksNewBackdata.tag); + (ksNewBackdata).where(expression).groupBy(ksNewBackdata.oaid, ksNewBackdata.tag); // 结果返回 List voList = query.select(Projections.bean @@ -65,11 +63,11 @@ public class KsBackDataServiceImpl extends AbstractService gmtCreate = SQLExpressions.select (ksNewBackdata.imei, ksNewBackdata.tag, ksNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (ksNewBackdata).where(ksNewBackdata.tag.in(tagList).and(ksNewBackdata.gmtCreate.gt(startTimeStamp)).and(ksNewBackdata.gmtCreate.lt(endTimeStamp)).and - (ksNewBackdata.imei.ne(CharSequenceUtil.EMPTY)).and(ksNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(ksNewBackdata.imei.ne(DataConstant.IMEI_TAG))).groupBy(ksNewBackdata.imei, ksNewBackdata.tag); + (ksNewBackdata).where(expression).groupBy(ksNewBackdata.imei, ksNewBackdata.tag); // 结果返回 List voList = query.select(Projections.bean @@ -81,21 +79,40 @@ public class KsBackDataServiceImpl extends AbstractService imeiVOList = query.select(Projections.bean (QueryImeiVO.class, ksNewBackdata.oaid.as("imei"), ksNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(ksNewBackdata).where - (ksNewBackdata.tag.in(tagList).and(ksNewBackdata.gmtCreate.gt(startTimeStamp)).and(ksNewBackdata.gmtCreate.lt(endTimeStamp)).and(ksNewBackdata.oaid.ne(CharSequenceUtil.EMPTY)).and - (ksNewBackdata.oaid.ne(DataConstant.IMEI_NULL_TAG)).and(ksNewBackdata.oaid.ne(DataConstant.IDFA_NUM))).groupBy(ksNewBackdata.oaid, ksNewBackdata.tag).fetch(); + (expression).groupBy(ksNewBackdata.oaid, ksNewBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); } + BooleanExpression expression = getImeiBooleanExpression(tagList, vPoint, startTimeStamp, endTimeStamp); List imeiVOList = query.select(Projections.bean (QueryImeiVO.class, ksNewBackdata.imei, ksNewBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(ksNewBackdata).where - (ksNewBackdata.tag.in(tagList).and(ksNewBackdata.gmtCreate.gt(startTimeStamp)).and(ksNewBackdata.gmtCreate.lt(endTimeStamp)).and(ksNewBackdata.imei.ne(CharSequenceUtil.EMPTY)).and - (ksNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(ksNewBackdata.imei.ne(DataConstant.IMEI_TAG))).groupBy(ksNewBackdata.imei, ksNewBackdata.tag).fetch(); + (expression).groupBy(ksNewBackdata.imei, ksNewBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } + + private BooleanExpression getImeiBooleanExpression(List tagList, Integer vPoint, Timestamp startTimeStamp, Timestamp endTimeStamp) { + BooleanExpression expression = ksNewBackdata.tag.in(tagList).and(ksNewBackdata.gmtCreate.gt(startTimeStamp)).and(ksNewBackdata.gmtCreate.lt(endTimeStamp)).and + (ksNewBackdata.imei.ne(CharSequenceUtil.EMPTY)).and(ksNewBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(ksNewBackdata.imei.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(ksNewBackdata.vpoint.eq(vPoint)); + } + return expression; + } + + private BooleanExpression getOaidBooleanExpression(List tagList, Integer vPoint, Timestamp startTimeStamp, Timestamp endTimeStamp) { + BooleanExpression expression = ksNewBackdata.tag.in(tagList).and(ksNewBackdata.gmtCreate.gt(startTimeStamp)).and(ksNewBackdata.gmtCreate.lt(endTimeStamp)).and(ksNewBackdata.oaid.ne(CharSequenceUtil.EMPTY)).and + (ksNewBackdata.oaid.ne(DataConstant.IDFA_NUM)).and(ksNewBackdata.oaid.ne(DataConstant.IMEI_TAG)); + if (ObjectUtil.isNotNull(vPoint)) { + expression = expression.and(ksNewBackdata.vpoint.eq(vPoint)); + } + return expression; + } + @Override public Long deleteDateByDateAndLimitNum(DateTime date, Integer num) { Timestamp timestamp = new Timestamp(date.getTime()); 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 103ea05..562657d 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java @@ -38,7 +38,7 @@ public class UcBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (Date startTime, Date endTime, List tagList, Integer flag, Integer type) { + (Date startTime, Date endTime, List tagList, Integer flag, Integer type, Integer vPoint) { return this.applyJPA(query -> { StringTemplate dateExpr; @@ -101,6 +101,9 @@ public class UcBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag - (Date startTime, Date endTime, List tagList, Integer flag, Integer type) { + (Date startTime, Date endTime, List tagList, Integer flag, Integer type,Integer vPoint) { + QTbVivoBackdataEntity vivoBackdata = QTbVivoBackdataEntity.tbVivoBackdataEntity; return this.applyJPA(query -> { StringPath t3 = Expressions.stringPath("t3"); StringTemplate dateExpr; - QTbVivoBackdataEntity vivoBackdata = QTbVivoBackdataEntity.tbVivoBackdataEntity; if (flag == 1) { dateExpr = Expressions.stringTemplate(SqlConstant.DATE_EXPR, vivoBackdata.gmtCreate); SimpleTemplate t3Tag = Expressions.template(String.class, "t3.tag"); @@ -73,10 +73,8 @@ public class VivoBackDataServiceImpl extends AbstractService imeiVOList = query.select(Projections.bean (QueryImeiVO.class, vivoBackdata.oaid.as("imei"), vivoBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(vivoBackdata).where diff --git a/src/main/java/com/baiyee/adcallback/task/NewPlatFormRecordTask.java b/src/main/java/com/baiyee/adcallback/task/NewPlatFormRecordTask.java index 8c084fc..17c32b2 100644 --- a/src/main/java/com/baiyee/adcallback/task/NewPlatFormRecordTask.java +++ b/src/main/java/com/baiyee/adcallback/task/NewPlatFormRecordTask.java @@ -89,7 +89,7 @@ public class NewPlatFormRecordTask { } // 偏移十分钟 DateTime offsetMinute = ObjectUtil.isNull(beginTime) ? - DateUtil.offsetMinute(date, -9) : beginTime; + DateUtil.offsetMinute(date, -9) : DateUtil.offsetMinute(beginTime, -9); beginTime = offsetMinute; log.info("================ the begin time as {} end time as {} ================", offsetMinute, date); List dtoList = backDataEntityService.queryNewPlateFormDTO diff --git a/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java b/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java index 3b34e87..954d10f 100644 --- a/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java +++ b/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java @@ -94,7 +94,7 @@ public class PlatFormRecordTask { } // 偏移十分钟 DateTime offsetMinute = ObjectUtil.isNull(beginTime) ? - DateUtil.offsetMinute(date, -10) : beginTime; + DateUtil.offsetMinute(date, -10) : DateUtil.offsetMinute(beginTime, -9); beginTime = offsetMinute; log.info("================ the begin time as {} end time as {} ================", offsetMinute, date); List dtoList = backDataEntityService.queryPlateFormDTO