yangys
2025-09-13 083df8d788c95c009a94378e620684eb5de2bd21
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java
@@ -1,11 +1,11 @@
package org.springblade.mdm.task;
import lombok.extern.slf4j.Slf4j;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.service.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,15 +34,10 @@
   @Autowired
   private ParamService paramService;
   /**
    * 文件默认保存小时数
    * 文件默认保存小时数,0不限制
    */
   private static final int DEFAULT_HOUR = 8;
   // 每5秒执行一次
   //@Scheduled(fixedRate = 1000000)
   //@Scheduled(cron = "0 1 0 * * ?") // 每天上午0点1分执行
   //@Scheduled(cron = "0 */3 * * * ?")
   //@Scheduled(cron = "0 15 19 * * ?") //test
   //@Scheduled(cron = "${task.cron.machine_file_scan}")
   private static final int DEFAULT_HOUR = 0;
   @Scheduled(cron = "${task.cron.machine_rec_move:0 3 * * * ?}")
   public void execute() {
      String networkType = paramService.getParamValue(ParamService.NETWORK_TYPE,ParamService.NETWORK_TYPE_SHEMI);
@@ -62,9 +57,13 @@
      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)
            .eq(MachineFile::getExceptionType,MachineFile.EXCEPTION_OK)
            .eq(MachineFile::getMachineCode,machine.getCode()).list();
         for(MachineFile overTimeFile : overTimeFiles){