From 78245d16b2147965603d2f35d23b5f4ca3903384 Mon Sep 17 00:00:00 2001 From: bynt Date: Fri, 14 May 2021 17:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buildrecord/repository/BuildRecordRepository.java | 7 ++++--- .../modules/buildrecord/service/BuildRecordService.java | 3 ++- .../buildrecord/service/impl/BuildRecordServiceImpl.java | 4 ++-- .../modules/buildrecord/task/ProduceBigDataTask.java | 1 + .../modules/common/handler/BuildRecordScheduled.java | 4 +--- .../zhengjie/modules/tag/service/impl/TagServiceImpl.java | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/repository/BuildRecordRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/repository/BuildRecordRepository.java index c7eb87f..7e1ac41 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/repository/BuildRecordRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/repository/BuildRecordRepository.java @@ -122,9 +122,10 @@ public interface BuildRecordRepository extends JpaRepository getBuildRecordByTime(DateTime oneMonthAhead); + @Query(value = "select b from BuildRecord b where b.gmtCreate < ?1 and b.level = ?2 and b.isDeleted = false order by b.id ") + List getBuildRecordByTime(DateTime oneMonthAhead, int threeNumber); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/BuildRecordService.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/BuildRecordService.java index 4df442b..8532915 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/BuildRecordService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/BuildRecordService.java @@ -129,9 +129,10 @@ public interface BuildRecordService { /** * 时间查询记录 * @param oneMonthAhead + * @param threeNumber * @return */ - List getBuildRecordByTime(DateTime oneMonthAhead); + List getBuildRecordByTime(DateTime oneMonthAhead, int threeNumber); /** * 修改状态值 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java index 058f4af..301ae8a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java @@ -191,8 +191,8 @@ public class BuildRecordServiceImpl implements BuildRecordService { } @Override - public List getBuildRecordByTime(DateTime oneMonthAhead) { - return buildRecordRepository.getBuildRecordByTime(oneMonthAhead); + public List getBuildRecordByTime(DateTime oneMonthAhead, int threeNumber) { + return buildRecordRepository.getBuildRecordByTime(oneMonthAhead,threeNumber); } @Override diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/ProduceBigDataTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/ProduceBigDataTask.java index 7e64989..e37be4b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/ProduceBigDataTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/ProduceBigDataTask.java @@ -69,6 +69,7 @@ public class ProduceBigDataTask { private void runTask(BuildRecord task) { // 先对任务表进行记录 // fixme 尝试修复id造成的冲突问题 + task.setIsDeleted(Boolean.FALSE); BuildRecordDto buildRecordDto = buildRecordService.create(task); if (buildRecordDto == null || buildRecordDto.getId() == null || buildRecordDto.getId() <= 0) { log.error("============ [create build rec is fail, please check it.] ============"); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/common/handler/BuildRecordScheduled.java b/eladmin-system/src/main/java/me/zhengjie/modules/common/handler/BuildRecordScheduled.java index 9efcf7b..5788117 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/common/handler/BuildRecordScheduled.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/common/handler/BuildRecordScheduled.java @@ -27,8 +27,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.sql.Timestamp; import java.time.LocalTime; -import java.util.Calendar; -import java.util.Date; import java.util.List; /** @@ -182,7 +180,7 @@ public class BuildRecordScheduled { public void deleteBuildRecordTask() { // 偏移一个月 DateTime oneMonthAhead = DateUtil.offsetMonth(DateUtil.date(), -1); - List buildRecordList = buildRecordService.getBuildRecordByTime(oneMonthAhead); + List buildRecordList = buildRecordService.getBuildRecordByTime(oneMonthAhead,DefaultConstant.THREE_NUMBER); if (!CollectionUtils.isEmpty(buildRecordList)) { for (BuildRecord buildRecord : buildRecordList) { if (buildRecord.getId() != null) { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/tag/service/impl/TagServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/tag/service/impl/TagServiceImpl.java index 7258b55..c4d1723 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/tag/service/impl/TagServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/tag/service/impl/TagServiceImpl.java @@ -307,7 +307,7 @@ public class TagServiceImpl implements TagService { String replaceStr = StringUtils.replace(deleteStr, " = ", " < "); Query deleteTagByQuery = entityManager.createNativeQuery(replaceStr); deleteTagByQuery.setParameter("id", id); - CompletableFuture.runAsync(deleteTagByQuery::executeUpdate); + deleteTagByQuery.executeUpdate(); } return result; }