From c6eb32465dafc382c788cd6c8ee36ce99977c37f Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 11 Jul 2023 17:38:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BdBackDataServiceImpl.java | 13 +++++++------ .../service/impl/JlV1BackDataServiceImpl.java | 8 ++++---- .../service/impl/JlV2BackDataServiceImpl.java | 10 +++++----- .../service/impl/KsBackDataServiceImpl.java | 13 +++++++------ .../service/impl/UcBackDataServiceImpl.java | 13 +++++++------ 5 files changed, 30 insertions(+), 27 deletions(-) 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 382e754..2bbff33 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/BdBackDataServiceImpl.java @@ -39,7 +39,8 @@ public class BdBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag (Date startTime, Date endTime, List tagList, Integer flag) { - + Timestamp endTimeStamp = new Timestamp(endTime.getTime()); + Timestamp startTimeStamp = new Timestamp(startTime.getTime()); return this.applyJPA(query -> { StringTemplate dateExpr; StringPath t3 = Expressions.stringPath("t3"); @@ -50,9 +51,9 @@ public class BdBackDataServiceImpl extends AbstractService t3Date = Expressions.template(Date.class, "t3.gmtCreate"); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select - (bdNewBackdata.imei, bdNewBackdata.tag,bdNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (bdNewBackdata).where(bdNewBackdata.tag.in(tagList).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.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); // 结果返回 List voList = query.select(Projections.bean @@ -66,8 +67,8 @@ public class BdBackDataServiceImpl extends AbstractService 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.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(); + (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(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } 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 936ff78..93d1f66 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/JlV1BackDataServiceImpl.java @@ -55,8 +55,8 @@ 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.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(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); // 结果返回 List voList = query.select(Projections.bean @@ -70,8 +70,8 @@ public class JlV1BackDataServiceImpl extends AbstractService 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.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(); + (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(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } 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 99e9955..816b609 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/JlV2BackDataServiceImpl.java @@ -47,9 +47,9 @@ public class JlV2BackDataServiceImpl extends AbstractService t3Date = Expressions.template(Date.class, "t3.gmtCreate"); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select - (v2Entity.imei, v2Entity.tag,v2Entity.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (v2Entity).where(v2Entity.tag.in(tagList).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.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); // 结果返回 List voList = query.select(Projections.bean @@ -63,8 +63,8 @@ public class JlV2BackDataServiceImpl extends AbstractService 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.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(); + (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(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } 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 cf53831..5779e85 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/KsBackDataServiceImpl.java @@ -39,7 +39,8 @@ public class KsBackDataServiceImpl extends AbstractService queryByTagAndTimeAndFlag (Date startTime, Date endTime, List tagList, Integer flag) { - + Timestamp endTimeStamp = new Timestamp(endTime.getTime()); + Timestamp startTimeStamp = new Timestamp(startTime.getTime()); return this.applyJPA(query -> { StringTemplate dateExpr; StringPath t3 = Expressions.stringPath("t3"); @@ -51,9 +52,9 @@ public class KsBackDataServiceImpl extends AbstractService t3Date = Expressions.template(Date.class, "t3.gmtCreate"); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select - (ksNewBackdata.imei, ksNewBackdata.tag,ksNewBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (ksNewBackdata).where(ksNewBackdata.tag.in(tagList).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.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); // 结果返回 List voList = query.select(Projections.bean @@ -67,8 +68,8 @@ public class KsBackDataServiceImpl extends AbstractService 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.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(); + (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(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); } 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 da16dff..3b90683 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/UcBackDataServiceImpl.java @@ -43,7 +43,8 @@ public class UcBackDataServiceImpl extends AbstractService { StringTemplate dateExpr; StringPath t3 = Expressions.stringPath("t3"); - + Timestamp endTimeStamp = new Timestamp(endTime.getTime()); + Timestamp startTimeStamp = new Timestamp(startTime.getTime()); if (flag == 1) { dateExpr = Expressions.stringTemplate(SqlConstant.DATE_EXPR, ucBackdata.gmtCreate); SimpleTemplate t3Tag = Expressions.template(String.class, "t3.tag"); @@ -51,9 +52,9 @@ public class UcBackDataServiceImpl extends AbstractService t3Date = Expressions.template(Date.class, "t3.gmtCreate"); // 封装子查询 SubQueryExpression gmtCreate = SQLExpressions.select - (ucBackdata.imei, ucBackdata.tag,ucBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from - (ucBackdata).where(ucBackdata.tag.in(tagList).and(ucBackdata.imei.ne(CharSequenceUtil.EMPTY).and - (ucBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(ucBackdata.imei.ne(DataConstant.IMEI_TAG)))).groupBy(ucBackdata.imei,ucBackdata.tag); + (ucBackdata.imei, ucBackdata.tag, ucBackdata.gmtCreate.max().as(SqlConstant.CREATE_TIME)).from + (ucBackdata).where(ucBackdata.tag.in(tagList).and(ucBackdata.gmtCreate.gt(startTimeStamp)).and(ucBackdata.gmtCreate.lt(endTimeStamp)).and + (ucBackdata.imei.ne(CharSequenceUtil.EMPTY)).and(ucBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(ucBackdata.imei.ne(DataConstant.IMEI_TAG))).groupBy(ucBackdata.imei, ucBackdata.tag); // 结果返回 List voList = query.select(Projections.bean @@ -67,8 +68,8 @@ public class UcBackDataServiceImpl extends AbstractService imeiVOList = query.select(Projections.bean (QueryImeiVO.class, ucBackdata.imei, ucBackdata.tag, dateExpr.as(SqlConstant.CREATE_TIME))).distinct().from(ucBackdata).where - (ucBackdata.tag.in(tagList).and(ucBackdata.imei.ne(CharSequenceUtil.EMPTY).and(ucBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(ucBackdata.imei.ne - (DataConstant.IMEI_TAG)))).groupBy(ucBackdata.imei,ucBackdata.tag).fetch(); + (ucBackdata.tag.in(tagList).and(ucBackdata.gmtCreate.gt(startTimeStamp)).and(ucBackdata.gmtCreate.lt(endTimeStamp)).and(ucBackdata.imei.ne(CharSequenceUtil.EMPTY)).and + (ucBackdata.imei.ne(DataConstant.IMEI_NULL_TAG)).and(ucBackdata.imei.ne(DataConstant.IMEI_TAG))).groupBy(ucBackdata.imei, ucBackdata.tag).fetch(); return Convert.toList(DmpMonitorJpaDto.class, imeiVOList); }); }