修改删除tag表逻辑(等级三级且time大于0)

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

@@ -112,11 +112,12 @@ public interface BuildRecordRepository extends JpaRepository<BuildRecord, Intege
 
     /**
      * 修改删除记录
+     * @param result
      * @param id
      */
     @Modifying
-    @Query(value = "update BuildRecord set isDeleted = 1 where id = ?1")
-    void updateIsDeleteByBuildId(Integer id);
+    @Query(value = "update BuildRecord set isDeleted = ?1 where id = ?2")
+    void updateIsDeleteByBuildId(boolean result, Integer id);
 
 
     /**
@@ -128,4 +129,13 @@ public interface BuildRecordRepository extends JpaRepository<BuildRecord, Intege
      */
     @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, int threeNumber);
+
+    /**
+     * 查询所有三级 time
+     * @param threeNumber
+     * @param flag
+     * @return
+     */
+    @Query(value = "select  b from  BuildRecord b where b.level = ?1  and b.isDeleted = ?2 and b.timePeriod > 0 order by b.id")
+    List<BuildRecord> getBuildRecordByIsDelete(int threeNumber, Boolean flag);
 }

eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/BuildRecordService.java

@@ -136,7 +136,16 @@ public interface BuildRecordService {
 
     /**
      * 修改状态值
+     * @param result
      * @param id
      */
-    void updateIsDeleteByBuildId(Integer id);
+    void updateIsDeleteByBuildId(boolean result, Integer id);
+
+    /**
+     * 查询任务
+     * @param threeNumber
+     * @param flag
+     * @return
+     */
+    List<BuildRecord> getBuildRecordByIsDelete(int threeNumber, Boolean flag);
 }

eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/dto/BuildRecordQueryCriteria.java

@@ -39,5 +39,8 @@ public class BuildRecordQueryCriteria{
     @Query(type = Query.Type.EQUAL)
     private Boolean flag;
 
+    @Query(type = Query.Type.EQUAL)
+    private Boolean isDeleted;
+
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/service/impl/BuildRecordServiceImpl.java

@@ -69,6 +69,7 @@ public class BuildRecordServiceImpl implements BuildRecordService {
         if (criteria.getFlag() != null && !criteria.getFlag()) {
             criteria.setParentId(null);
             criteria.setLevel(DefaultConstant.THREE_NUMBER);
+            criteria.setIsDeleted(Boolean.FALSE);
         }
         // 无实体对应 赋初始值
         criteria.setFlag(null);
@@ -101,9 +102,14 @@ public class BuildRecordServiceImpl implements BuildRecordService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BuildRecordDto create(BuildRecord resources) {
+        // 修改时间周期
+        resources.setTimePeriod(resources.getTimePeriod() != null ?
+                resources.getTimePeriod() : DefaultConstant.ONE_THOUSAND);
+
         if (resources.getLevel() != null &&
                 resources.getLevel().equals(DefaultConstant.ONE_NUMBER)) {
             resources.setParentId(DefaultConstant.ZERO_NUMBER);
+            resources.setIsDeleted(Boolean.FALSE);
         }
         return buildRecordMapper.toDto(buildRecordRepository.save(resources));
     }
@@ -197,8 +203,13 @@ public class BuildRecordServiceImpl implements BuildRecordService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateIsDeleteByBuildId(Integer id) {
-         buildRecordRepository.updateIsDeleteByBuildId(id);
+    public void updateIsDeleteByBuildId(boolean result, Integer id) {
+         buildRecordRepository.updateIsDeleteByBuildId(result,id);
+    }
+
+    @Override
+    public List<BuildRecord> getBuildRecordByIsDelete(int threeNumber, Boolean flag) {
+        return buildRecordRepository.getBuildRecordByIsDelete(threeNumber,flag);
     }
 
     /**

eladmin-system/src/main/java/me/zhengjie/modules/common/consts/DefaultConstant.java

@@ -48,5 +48,11 @@ public class DefaultConstant {
      */
     public static final int TEN_NUMBER = 10;
 
+    /**
+     * 10
+     */
+    public static final int ONE_THOUSAND = 1000;
+
+
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/common/handler/BuildRecordScheduled.java

@@ -95,7 +95,6 @@ public class BuildRecordScheduled {
 
 
     @Scheduled(cron = "0 0 4 * * ?")
-    // @Scheduled(cron = "0 0/1 * * * ?")
     public void resendBuildRecordTask() {
         log.info("scheduled resendBuildRecordTask start time [{}]", LocalTime.now());
         // 偏移天数
@@ -176,24 +175,32 @@ public class BuildRecordScheduled {
     /**
      * 凌晨一点 查询定时任务 删除记录
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    // @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     public void deleteBuildRecordTask() {
-        // 偏移一个月
-        DateTime oneMonthAhead = DateUtil.offsetMonth(DateUtil.date(), -1);
-        List<BuildRecord> buildRecordList = buildRecordService.getBuildRecordByTime(oneMonthAhead,DefaultConstant.THREE_NUMBER);
-        if (!CollectionUtils.isEmpty(buildRecordList)) {
-            for (BuildRecord buildRecord : buildRecordList) {
-                if (buildRecord.getId() != null) {
+        List<BuildRecord> buildRecordByIsDelete =
+                buildRecordService.getBuildRecordByIsDelete
+                        (DefaultConstant.THREE_NUMBER, Boolean.FALSE);
+
+        if (!CollectionUtils.isEmpty(buildRecordByIsDelete)) {
+            for (BuildRecord buildRecord : buildRecordByIsDelete) {
+                // 查询已做非空判断
+                buildRecord.setTimePeriod(buildRecord.getTimePeriod() != null ?
+                        buildRecord.getTimePeriod() - DefaultConstant.ONE_NUMBER : 0);
+
+                if (buildRecord.getId() != null &&
+                        buildRecord.getTimePeriod().equals(DefaultConstant.ZERO_NUMBER)) {
                     boolean result = tagService.deleteByTaskId(buildRecord.getId());
-                    if (result) {
-                        // 修改状态
-                        buildRecordService.updateIsDeleteByBuildId(buildRecord.getId());
+                    if (!result) {
+                        // 删除失败周期重试
+                        buildRecord.setTimePeriod
+                                (buildRecord.getTimePeriod() + DefaultConstant.ONE_NUMBER);
                     }
+                    buildRecord.setIsDeleted(result);
                     log.info("deleteBuildRecordTask buildRecord as  [{}] result as [{}]", buildRecord.getTaskName(), result);
                 }
+                buildRecordService.update(buildRecord);
             }
         }
     }
-
-
 }

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ZipUtils.java

@@ -21,6 +21,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
+import me.zhengjie.modules.buildrecord.util.WordFilter;
 import org.apache.commons.lang3.StringUtils;
 
 import net.lingala.zip4j.core.ZipFile;
@@ -224,7 +226,10 @@ public class ZipUtils {
 	}
 
 	public static void main(String[] args) {
-		zip("C:\\Users\\Administrator\\Desktop\\123\\", "C:\\Users\\Administrator\\Desktop\\123\\cc.zip", "123");
+		Integer integer = 127;
+		Integer integer1 = 127;
+		System.out.println(integer.equals(integer1));
+
 
 //		try {
 //			File[] files = unzip("d:\\test\\汉字.zip", "aa");

eladmin-system/src/main/java/me/zhengjie/modules/tag/service/impl/TagServiceImpl.java

@@ -49,13 +49,13 @@ import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 
 /**
+ * @author x
  * @website https://el-admin.vip
  * @description 服务实现
-* @author x
  * @date 2020-09-22
  **/
 @Slf4j
@@ -290,6 +290,7 @@ public class TagServiceImpl implements TagService {
         return Boolean.FALSE;
     }
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteByTaskId(Integer id) {
@@ -303,13 +304,36 @@ public class TagServiceImpl implements TagService {
         // 执行删除任务
         boolean result = deleteQuery.executeUpdate() > 0;
         if (result) {
+            //数据中需要删除的数据量
+            long expiredCount;
+            //已经删除数据量
+            long totalDeleted = 0L;
             // 删除之前记录 分表情况下,单次可能会有遗漏 多次并不影响
             String replaceStr = StringUtils.replace(deleteStr, " = ", " < ");
-            Query deleteTagByQuery = entityManager.createNativeQuery(replaceStr);
+            do {
+                Query deleteTagByQuery = entityManager.createNativeQuery(replaceStr + " limit 50000");
                 deleteTagByQuery.setParameter("id", id);
-            deleteTagByQuery.executeUpdate();
+                int executeUpdate = deleteTagByQuery.executeUpdate();
+                totalDeleted += executeUpdate;
+                expiredCount = queryCount(resultId, id);
+            } while (expiredCount > 0);
+            log.info("========  delete tag{} table size as [{}]   ========", resultId, totalDeleted);
         }
         return result;
     }
+
+    /**
+     * 查询数据
+     * @param resultId
+     * @param id
+     * @return
+     */
+    private Long queryCount(int resultId, int id) {
+        String sql = "select count(1)  FROM  dc_tag" + resultId + "  where  task_id < :id ";
+        Query selectQueryCount = entityManager.createNativeQuery(sql);
+        selectQueryCount.setParameter("id", id);
+        BigInteger bigInteger = (BigInteger) selectQueryCount.getSingleResult();
+        return bigInteger.longValue();
+    }
 }