diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 1ecd2f648..a5ca80d3f 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.TimeInterval; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -88,7 +89,7 @@ public class AuditServiceImpl extends ServiceImpl implem @Value("${clear.num}") private Integer clearHistoryLog; - private IConfigService iConfigService; + private final IConfigService iConfigService; @Override public Page getAuditLog(AuditParam auditParam) { @@ -157,12 +158,13 @@ public class AuditServiceImpl extends ServiceImpl implem @Override public void logFileWriter() { + TimeInterval timeInterval = new TimeInterval(); //限制多次点击 String logFileWriter = redisUtil.getStringByKey("logFileWriter"); if (StrUtil.isNotBlank(logFileWriter) || ObjectUtil.equals(logFileWriter, "1")) { throw new BusinessException(AuditLogEnum.MULTIPLE_CLICKS_LOGFILEWRITER); } - redisUtil.saveByKey("logFileWriter", "1"); + redisUtil.saveByKeyWithExpire("logFileWriter", "1",600L); Config config = iConfigService.getOne(new LambdaQueryWrapper().eq(Config::getState, DataStateEnum.ENABLE.getCode())); @@ -228,6 +230,7 @@ public class AuditServiceImpl extends ServiceImpl implem excelWriter.finish(); } redisUtil.delete("logFileWriter"); + System.out.println("日志备份结束,共花费时间"+timeInterval.intervalSecond()+"S"); } @@ -253,7 +256,7 @@ public class AuditServiceImpl extends ServiceImpl implem if (StrUtil.isNotBlank(logFileWriter) || ObjectUtil.equals(logFileWriter, "1")) { throw new BusinessException(AuditLogEnum.MULTIPLE_CLICKS_LOGFILEWRITER); } - redisUtil.saveByKey("recoverLogFile", "1"); + redisUtil.saveByKeyWithExpire("recoverLogFile", "1",600L); File newFile = getLastFile(); if (FileUtil.isEmpty(newFile)) { throw new BusinessException(AuditLogEnum.NOT_FIND_FILE);