diff --git a/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java index 6a56d66..8485478 100644 --- a/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java +++ b/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java @@ -20,15 +20,13 @@ public interface TbJlTripartiteDataEntityRepository extends BaseRepository= :startDate and gmtCreate < :endDate") - List queryPlateFormDTO(@Param("imeiStrFirst") String imeiStrFirst, @Param("imeiSecond") String imeiSecond, @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate); + " TbJlTripartiteDataEntity where gmtCreate >= :startDate and gmtCreate < :endDate") + List queryPlateFormDTO( @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate); diff --git a/src/main/java/com/baiyee/adcallback/service/TripartiteService.java b/src/main/java/com/baiyee/adcallback/service/TripartiteService.java index 94d9afb..e01630b 100644 --- a/src/main/java/com/baiyee/adcallback/service/TripartiteService.java +++ b/src/main/java/com/baiyee/adcallback/service/TripartiteService.java @@ -13,11 +13,9 @@ public interface TripartiteService { /** * - * @param empty - * @param imeiStr * @param offsetMinute * @param date * @return */ - List queryTripartiteData(String empty, String imeiStr, DateTime offsetMinute, DateTime date); + List queryTripartiteData(DateTime offsetMinute, DateTime date); } diff --git a/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java index 23d8c95..6b2df90 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java @@ -20,7 +20,7 @@ public class TripartiteServiceImpl implements TripartiteService { private final TbJlTripartiteDataEntityRepository jlTripartiteDataEntityRepository; @Override - public List queryTripartiteData(String empty, String imeiStr, DateTime offsetMinute, DateTime date) { - return jlTripartiteDataEntityRepository.queryPlateFormDTO(empty, imeiStr, offsetMinute, date); + public List queryTripartiteData( DateTime offsetMinute, DateTime date) { + return jlTripartiteDataEntityRepository.queryPlateFormDTO(offsetMinute, date); } } diff --git a/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java b/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java index 553537d..b047327 100644 --- a/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java +++ b/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java @@ -60,8 +60,7 @@ public class TripartiteRecordTask { DateUtil.offsetMinute(date, -15) : DateUtil.offsetMinute(beginTime, -15); beginTime = offsetMinute; log.info("================ the begin time as {} end time as {} ================", offsetMinute, date); - List dtoList = tripartiteService.queryTripartiteData - (CharSequenceUtil.EMPTY, "__IMEI__", offsetMinute, date); + List dtoList = tripartiteService.queryTripartiteData(offsetMinute, date); log.info("================ the dto list as {} ================", dtoList.size()); if (CollUtil.isNotEmpty(dtoList)) { List list = Lists.newArrayList();