From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java
index 66ab867..9a574ed 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java
@@ -1,49 +1,39 @@
package org.springblade.mdm.task;
-import org.springblade.core.tool.utils.FileUtil;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.gkw.programnode.entity.MachineFile;
-import org.springblade.mdm.gkw.programnode.service.MachineFileService;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
+import org.springblade.mdm.commons.service.ParamService;
+import org.springblade.mdm.machinefile.service.MachineFileScanService;
+import org.springblade.mdm.machinefile.service.MachineFileService;
+import org.springblade.mdm.program.service.ProgramAnnotationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.io.IOException;
-import java.io.File;
-import java.util.List;
-
+@Slf4j
@Component
@EnableScheduling
public class MachineFileScanTask {
@Autowired
- private MachineFileService machineFileService;
+ private ParamService paramService;
@Autowired
- private MachineService machineService;
+ private MachineFileScanService machineFileScanService;
// 姣�5绉掓墽琛屼竴娆�
- @Scheduled(fixedRate = 1000000)
+ //@Scheduled(fixedRate = 1000000)
//@Scheduled(cron = "0 1 0 * * ?") // 姣忓ぉ涓婂崍0鐐�1鍒嗘墽琛�
- public void executeEvery5Seconds() {
- System.out.println("瀹氭椂浠诲姟鎵ц: " + System.currentTimeMillis());
- }
+ //@Scheduled(cron = "0 */5 * * * ?")
+ //@Scheduled(cron = "0 15 19 * * ?") //test
+ @Scheduled(cron = "${task.cron.machine_file_scan:0 1 0 * * ?}")
+ public void execute() {
+ String networkType = paramService.getParamValue(ParamService.NETWORK_TYPE,ParamService.NETWORK_TYPE_SHEMI);
-
- public void scanMachineFile() {
- List<Machine> machines = machineService.lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).list();
- for (Machine machine : machines) {
-
+ if(!ParamService.NETWORK_TYPE_SHEMI.equals(networkType)){
+ //闈炴秹瀵嗙綉锛屾墠鎵弿鐩綍鏂囦欢
+ machineFileScanService.scanMachineFile();
}
}
- void scanReceiveDir(Machine machine){
- List<File> files = FileUtil.list(machine.getProgReceiveDir());
-
-
- for(File f : files){
- MachineFile mf = new MachineFile();
- mf.setName(f.getName());
- mf.setDirType(MachineFile.DIR_TYPE_REC);
- }
- }
}
--
Gitblit v1.9.3