From e2dadb11b97b65089943fb6619b32e6be481bee0 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 29 Jun 2023 10:24:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=88=A0=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()); From c00e34b3ed871b7b941341098c41766dacb3b6b9 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 29 Jun 2023 15:56:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/baiye/module/dao/ClueRepository.java | 7 ++++--- .../main/java/com/baiye/module/service/ClueService.java | 3 ++- .../com/baiye/module/service/impl/ClueServiceImpl.java | 4 ++-- .../src/main/java/com/baiye/task/GenderConversionTask.java | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java index 21ae2bfb..388fc95c 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueRepository.java @@ -32,14 +32,15 @@ public interface ClueRepository extends JpaRepository, JpaSpecificat /** * 修改性别 * - * @param number + * @param setNumber + * @param initialNumber * @param firstId * @param lastId * @return */ @Modifying - @Query(value = "UPDATE Clue set gender = ?1 where id >= ?2 and id <= ?3") - Integer updateGenderById(Integer number, Long firstId, Long lastId); + @Query(value = "UPDATE Clue set gender = ?1 where gender = ?2 and id >= ?3 and id <= ?4") + Integer updateGenderById(Integer setNumber, Integer initialNumber, Long firstId, Long lastId); /** diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java index c1abbc8c..a352c39b 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java @@ -213,11 +213,12 @@ public interface ClueService { * 根据id修改状态 * * @param number + * @param setNumber * @param firstId * @param lastId * @return */ - Boolean updateGenderById(Integer number, Long firstId, Long lastId); + Boolean updateGenderById(Integer number, Integer setNumber, Long firstId, Long lastId); /** diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index cf9993fd..fa9e702e 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -1170,8 +1170,8 @@ public class ClueServiceImpl implements ClueService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean updateGenderById(Integer number, Long firstId, Long lastId) { - return clueRepository.updateGenderById(number, firstId, lastId) > DefaultNumberConstants.ZERO_NUMBER; + public Boolean updateGenderById(Integer number, Integer initialNumber, Long firstId, Long lastId) { + return clueRepository.updateGenderById(number, initialNumber, firstId, lastId) > DefaultNumberConstants.ZERO_NUMBER; } @Override diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java index 01162064..48f766b0 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java @@ -61,7 +61,7 @@ public class GenderConversionTask { String fileUrl = deliveryProperties.getFileUrl(); // 单次查询10000 List> resourceList = clueService.queryUnconvertedResource - (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.TEN_THOUSAND); + (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.FIFTY_THOUSAND); if (resourceList.size() > DefaultNumberConstants.ONE_THOUSAND && CollUtil.isNotEmpty(resourceList)) { // 对应转换 List list = Convert.toList(QueryClueDTO.class, resourceList); @@ -81,7 +81,7 @@ public class GenderConversionTask { String file = fileUrl.concat(StrPool.SLASH).concat(taskImeiName); // 压缩文件并发送 FileAndGenderUtil.zipFileAndSendGenderMail(stringList, file, taskImeiName, deliveryProperties); - clueService.updateGenderById(DefaultNumberConstants.FOUR_NUMBER, firstId, lastId); + clueService.updateGenderById(DefaultNumberConstants.FOUR_NUMBER, DefaultNumberConstants.ZERO_NUMBER, firstId, lastId); genderRecordService.saveDeliveryRecord(taskImeiName, list.size(), DefaultNumberConstants.ONE_NUMBER); log.info("============== the save num as {} first id {} last id {} ================", stringList.size(), firstId, lastId); } From b7e0a5fab50e327644f762d6b030a6aca8af396a Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 29 Jun 2023 15:59:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/baiye/task/GenderConversionTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java index 48f766b0..3d79e0dd 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java @@ -61,7 +61,7 @@ public class GenderConversionTask { String fileUrl = deliveryProperties.getFileUrl(); // 单次查询10000 List> resourceList = clueService.queryUnconvertedResource - (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.FIFTY_THOUSAND); + (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.TEN_THOUSAND); if (resourceList.size() > DefaultNumberConstants.ONE_THOUSAND && CollUtil.isNotEmpty(resourceList)) { // 对应转换 List list = Convert.toList(QueryClueDTO.class, resourceList); From 05ef8dd6cb6a3d3f98523c971707ffc8e04c1e32 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 29 Jun 2023 15:59:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application.yml | 2 +- .../src/main/java/com/baiye/task/GenderConversionTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml index b3c6fdb3..638c1612 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml @@ -9,7 +9,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java index 3d79e0dd..c38faaa3 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java @@ -55,7 +55,7 @@ public class GenderConversionTask { private final GenderRecordService genderRecordService; - @Scheduled(cron = "0 0/30 0-6 * * ? ") + @Scheduled(cron = "0 0/20 0-6 * * ? ") @Transactional(rollbackFor = Exception.class) public void exchangeResource() { String fileUrl = deliveryProperties.getFileUrl(); From e687d76de2355645570e6a098e2d13ac161eb294 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 29 Jun 2023 16:01:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml index 638c1612..b3c6fdb3 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml @@ -9,7 +9,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: