From ee6af8dff591418168d5104d281a6f0bf3c961e8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 20:48:48 +0800
Subject: [PATCH] 现场编制功能适配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java
index 2fbd7d6..671c44d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java
@@ -7,12 +7,13 @@
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.flow.service.TaskDispatchService;
import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.machinefile.filewatch.*;
import org.springblade.mdm.machinefile.service.MachineFileScanService;
import org.springblade.mdm.machinefile.service.MachineFileService;
import org.springblade.mdm.program.service.ProgramAnnotationService;
-import org.springblade.system.feign.ISysClient;
+import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Component;
import java.nio.file.Path;
@@ -23,6 +24,7 @@
@Slf4j
@AllArgsConstructor
@Component
+@EnableAsync
public class InitBean {
private final DirectorLockService directorLockService;
private final DynamicDirectoryWatcher directoryWatcher;
@@ -31,17 +33,28 @@
private final ParamService paramService;
private final ProgramAnnotationService annotationService;
private final MachineFileScanService machineFileScanService;
- private final ISysClient sysClient;
+ private final TaskDispatchService taskDispatchService;
+ //@Value("${task.file_scan_on_start:true}")
+ //@Value("${task.fileScanOnStart:true}")
+ //public boolean fileScanOnStart;
+ private final TaskPropertieBean taskPropertieBean;
@PostConstruct
public void init() {
log.info("搴旂敤鍚姩鏃舵墽琛屽垵濮嬪寲鎿嶄綔 @PostConstruct");
String networkType = paramService.networkType();
if(!ParamService.NETWORK_TYPE_SHEMI.equals(networkType)) {
- machineFileScanService.scanMachineFile();//鍚姩鎵ц涓�娆℃壂鎻�
+ if(taskPropertieBean.isFileScanOnStart()) {
+ machineFileScanService.scanMachineFile();
+ }
+
//宸ユ帶缃戞墠鍚姩鏂囦欢鐩戞帶
log.info("宸ユ帶缃戝惎鍔ㄦ枃浠剁洃鎺�");
initMachineDirMonitor();
+ }else{
+
+ //娑夊瘑缃�
+ taskDispatchService.resetDrawingNos();
}
}
@@ -61,8 +74,8 @@
addToWatchDirList(monitorInfoList,m);
});
for (WatchInfo info : monitorInfoList) {
- Path dirPath = Paths.get(info.getPath());
try {
+ Path dirPath = Paths.get(info.getPath());
if(!dirPath.toFile().exists()) {
dirPath.toFile().mkdirs();
}
--
Gitblit v1.9.3