优化代码增加默认值

eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/repository/BuildRecordRepository.java

@@ -122,9 +122,10 @@ public interface BuildRecordRepository extends JpaRepository<BuildRecord, Intege
     /**
      * 时间查询记录
      * @param oneMonthAhead
+     * @param threeNumber
      * @return
-     *  采用正序
+     * 采用正序
      */
-    @Query(value = "select  b from  BuildRecord b where b.gmtCreate < ?1 and b.isDeleted is null order by b.id ")
+    @Query(value = "select  b from  BuildRecord b where b.gmtCreate < ?1  and b.level = ?2 and b.isDeleted = false order by b.id ")
-    List<BuildRecord> getBuildRecordByTime(DateTime oneMonthAhead);
+    List<BuildRecord> getBuildRecordByTime(DateTime oneMonthAhead, int threeNumber);
 }

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<BuildRecord> getBuildRecordByTime(DateTime oneMonthAhead);
+    List<BuildRecord> getBuildRecordByTime(DateTime oneMonthAhead, int threeNumber);
 
     /**
      * 修改状态值

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<BuildRecord> getBuildRecordByTime(DateTime oneMonthAhead) {
+    public List<BuildRecord> getBuildRecordByTime(DateTime oneMonthAhead, int threeNumber) {
-        return buildRecordRepository.getBuildRecordByTime(oneMonthAhead);
+        return buildRecordRepository.getBuildRecordByTime(oneMonthAhead,threeNumber);
     }
 
     @Override

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.] ============");

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<BuildRecord> buildRecordList = buildRecordService.getBuildRecordByTime(oneMonthAhead);
+        List<BuildRecord> buildRecordList = buildRecordService.getBuildRecordByTime(oneMonthAhead,DefaultConstant.THREE_NUMBER);
         if (!CollectionUtils.isEmpty(buildRecordList)) {
             for (BuildRecord buildRecord : buildRecordList) {
                 if (buildRecord.getId() != null) {

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;
     }