From 083df8d788c95c009a94378e620684eb5de2bd21 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:08:09 +0800
Subject: [PATCH] 注释问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java
index 1291519..6ae2543 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java
+++ b/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){
--
Gitblit v1.9.3