diff --git a/src/main/java/com/baiyee/adcallback/common/enums/DeliveryPlatformEnum.java b/src/main/java/com/baiyee/adcallback/common/enums/DeliveryPlatformEnum.java index 84f5006..3ca9b73 100644 --- a/src/main/java/com/baiyee/adcallback/common/enums/DeliveryPlatformEnum.java +++ b/src/main/java/com/baiyee/adcallback/common/enums/DeliveryPlatformEnum.java @@ -26,12 +26,17 @@ public enum DeliveryPlatformEnum { /** * VIVO */ - VIVO("VIVO", 4), + VV("VV", 4), /** * 百度 */ - BD("BD", 5); + BD("BD", 5), + + /** + * 广点通 + */ + GD("GD", 6); /** * 类型 diff --git a/src/main/java/com/baiyee/adcallback/common/enums/TableEnum.java b/src/main/java/com/baiyee/adcallback/common/enums/TableEnum.java index f62cbdd..ebbdee6 100644 --- a/src/main/java/com/baiyee/adcallback/common/enums/TableEnum.java +++ b/src/main/java/com/baiyee/adcallback/common/enums/TableEnum.java @@ -26,12 +26,17 @@ public enum TableEnum { /** * VIVO */ - VIVO("tb_vivo_backdata"), + VV("tb_vivo_backdata"), /** * 百度 */ - BD("tb_bd_backdata"); + BD("tb_bd_backdata"), + + /** + * 广点通 + */ + GD("tb_gdt_backdata"); /** * 类型 diff --git a/src/main/java/com/baiyee/adcallback/service/impl/AnalysisServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/AnalysisServiceImpl.java index b456fc0..e8be83b 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/AnalysisServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/AnalysisServiceImpl.java @@ -52,11 +52,11 @@ public class AnalysisServiceImpl implements AnalysisService { // 不传入结束时间默认今天 Date endTime = dto.getEndTime() != null ? dto.getEndTime() - : DateUtil.beginOfDay(DateUtil.date()); + : DateUtil.beginOfDay(DateUtil.date()); // 开始时间为空将往前一周 Date startTime = dto.getStartTime() != null ? dto.getStartTime() - : DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.date(), 7)); + : DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.date(), 7)); String formatDate = DateUtil.formatDate(startTime); Integer deliveryQuantity = dto.getDeliveryQuantity(); Long between = DateUtil.between(startTime, endTime, DateUnit.DAY); @@ -110,7 +110,7 @@ public class AnalysisServiceImpl implements AnalysisService { break; case 4: // VIVO - sqlString = SqlConstant.PARSE_DATA_SQL.replaceAll(SqlConstant.TABLE_STR, TableEnum.VIVO.getTableName()); + sqlString = SqlConstant.PARSE_DATA_SQL.replaceAll(SqlConstant.TABLE_STR, TableEnum.VV.getTableName()); break; case 5: //百度 diff --git a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java index 0203647..4a07af7 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java @@ -74,12 +74,16 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService { break; case 4: // VIVO - imel = getImeiNumJpa(TableEnum.VIVO.getTableName(), startDate, endDate, tag); + imel = getImeiNumJpa(TableEnum.VV.getTableName(), startDate, endDate, tag); break; case 5: //百度 imel = getImeiNumJpa(TableEnum.BD.getTableName(), startDate, endDate, tag); break; + case 6: + //广点通 + imel = getImeiNumJpa(TableEnum.GD.getTableName(), startDate, endDate, tag); + break; default: break; }