yangys
2025-08-30 86c8efdb19a2f4be79a947650ef62ed79382011b
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java
@@ -4,8 +4,8 @@
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.machinefile.service.MachineFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@@ -34,9 +34,9 @@
   @Autowired
   private ParamService paramService;
   /**
    * 文件默认保存小时数
    * 文件默认保存小时数,0不限制
    */
   private static final int DEFAULT_HOUR = 8;
   private static final int DEFAULT_HOUR = 0;
   // 每5秒执行一次
   //@Scheduled(fixedRate = 1000000)
   //@Scheduled(cron = "0 1 0 * * ?") // 每天上午0点1分执行
@@ -62,6 +62,9 @@
      LocalDateTime now = LocalDateTime.now();
      for (Machine machine : machines) {
         int remainHours = machine.getReceiveDirExpiryHours() != null ?machine.getReceiveDirExpiryHours():DEFAULT_HOUR;
         if(remainHours == 0){
            continue;
         }
         LocalDateTime earlyTime = now.minusHours(remainHours);
         List<MachineFile> overTimeFiles = this.machineFileService.lambdaQuery().lt(MachineFile::getFileCreateTime,earlyTime)
            .eq(MachineFile::getDirType,MachineFile.DIR_TYPE_REC)