From e2dadb11b97b65089943fb6619b32e6be481bee0 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 29 Jun 2023 10:24:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baiye/modules/platform/repository/TaskImeiRepository.java | 4 +++- .../com/baiye/modules/platform/service/TaskImeiService.java | 4 +++- .../modules/platform/service/impl/TaskImeiServiceImpl.java | 4 ++-- .../src/main/java/com/baiye/timed/DeliveryBalanceTask.java | 3 ++- .../src/main/java/com/baiye/timed/UpdateImeiTask.java | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/TaskImeiRepository.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/TaskImeiRepository.java index 9f4373e6..43901770 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/TaskImeiRepository.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/TaskImeiRepository.java @@ -29,9 +29,11 @@ public interface TaskImeiRepository extends JpaRepository, JpaSp * 状态查找 * * @param num + * @param beginOfDay * @return */ - List findByStatus(Integer num); + @Query("from TaskImei t where t.status = ?1 and t.createTime > ?2") + List findByStatusAndCreateTime(Integer num, DateTime beginOfDay); /** * 修改兑换数量 diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskImeiService.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskImeiService.java index bb659ea2..1ee6cf65 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskImeiService.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskImeiService.java @@ -18,10 +18,12 @@ public interface TaskImeiService { /** * 状态查找集合 + * * @param num + * @param beginOfDay * @return */ - List findByStatus(Integer num); + List findByStatusAndTime(Integer num, DateTime beginOfDay); /** * 接收消息 diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java index f4255653..3025bfcf 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java @@ -57,8 +57,8 @@ public class TaskImeiServiceImpl implements TaskImeiService { @Override - public List findByStatus(Integer num) { - return taskImeiRepository.findByStatus(num); + public List findByStatusAndTime(Integer num, DateTime beginOfDay) { + return taskImeiRepository.findByStatusAndCreateTime(num, beginOfDay); } /** diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java index bc7f6669..4bc24684 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java @@ -77,8 +77,9 @@ public class DeliveryBalanceTask { @Scheduled(cron = "0 0/15 * * * ? ") @Transactional(rollbackFor = Exception.class) public void cashResources() { + DateTime beginOfDay = DateUtil.beginOfDay(DateUtil.date()); // 查询所有未兑换的 - List imeiList = taskImeiService.findByStatus(DefaultNumberConstants.ZERO_NUMBER); + List imeiList = taskImeiService.findByStatusAndTime(DefaultNumberConstants.ZERO_NUMBER, beginOfDay); if (CollUtil.isNotEmpty(imeiList)) { // 根据任务id分组 Map> listMap = imeiList.stream().collect(Collectors.groupingBy(TaskImei::getTaskId)); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/UpdateImeiTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/UpdateImeiTask.java index d09168f6..1fd96244 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/UpdateImeiTask.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/UpdateImeiTask.java @@ -35,7 +35,7 @@ public class UpdateImeiTask { public void updateImeiByDate() { log.info("================= the update imei time as {} =================", DateUtil.date()); - DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), -DefaultNumberConstants.TWO_NUMBER); + DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), -DefaultNumberConstants.ONE_NUMBER); Boolean result = taskImeiService.updateImeiByDate(DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.ZERO_NUMBER, dateTime); log.info("================= the update imei time as {} the result as {} =================", DateUtil.date(), result); } @@ -56,7 +56,7 @@ public class UpdateImeiTask { long totalDeleted = 0L; String deleteStr = "DELETE FROM tb_task_imei WHERE create_time <:DATE "; // 时间偏移六个月 - DateTime date = DateUtil.offsetMonth(DateUtil.date(), -DefaultNumberConstants.SIX_NUMBER); + DateTime date = DateUtil.offsetMonth(DateUtil.date(), -DefaultNumberConstants.ONE_NUMBER); do { Query deleteTagByQuery = entityManager.createNativeQuery(deleteStr.concat(" limit 50000")); deleteTagByQuery.setParameter("DATE", date.toDateStr());