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/config/InitBean.java | 19 +++++++++++++++----
1 files changed, 15 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 cdc92c2..6acb1a6 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
@@ -13,7 +13,7 @@
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;
@@ -24,6 +24,7 @@
@Slf4j
@AllArgsConstructor
@Component
+@EnableAsync
public class InitBean {
private final DirectorLockService directorLockService;
private final DynamicDirectoryWatcher directoryWatcher;
@@ -32,14 +33,21 @@
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();
@@ -54,11 +62,14 @@
* 鍒濆鍖栫洃鎺х洰褰�
*/
void initMachineDirMonitor() {
+ /*
boolean locked = directorLockService.acquireLock();
if (!locked) {
log.info("鍥炰紶鎺ユ敹鐩綍宸茬粡琚叾浠栭儴缃茬偣浣嶉攣瀹氾紝鐩存帴杩斿洖");
return;
}
+
+ */
List<Machine> machineList = machineService.getEnableMachines();;
List<WatchInfo> monitorInfoList = new ArrayList<>();
@@ -66,8 +77,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