From bc4056543fdbef38ac8bf1648df934d5bc8e5bde Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 八月 2025 01:31:11 +0800
Subject: [PATCH] 调试固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 8decdc5..972dc77 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
@@ -16,7 +16,6 @@
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.system.feign.ISysClient;
-import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import java.nio.file.Path;
@@ -31,25 +30,30 @@
private final DirectorLockService directorLockService;
private final MachineService machineService;
private final FileWatcherService fileWatcherService;
- private final ISysClient sysClient;
+
private final DynamicDirectoryWatcher directoryWatcher;
private final MachineBackFileService machineBackFileService;
private final NcProgramService ncProgramService;
private final OssTemplate ossTemplate;
+ private final ISysClient sysClient;
//private final FileWatcherService.FileChangeListener listener;
@PostConstruct
public void init() {
- System.out.println("搴旂敤鍚姩鏃舵墽琛屽垵濮嬪寲鎿嶄綔 @PostConstruct");
+ log.info("搴旂敤鍚姩鏃舵墽琛屽垵濮嬪寲鎿嶄綔 @PostConstruct");
+
// 鍒濆鍖栭�昏緫
+
R<String> networkTypeR = sysClient.getParamValue(ParamContants.NETWORK_TYPE_KEY);
String networkType = networkTypeR.getData() == null ? ParamContants.NETWORK_TYPE_SHEMI : networkTypeR.getData();
if (networkType.equals(ParamContants.NETWORK_TYPE_GONGKONG)) {
initMachineDirMonitor();
}
+
+
}
/**
- * 鍒濆鍖栫洃鎺х洰褰�
+ * 鍒濆鍖栨満搴婄洃鎺х洰褰�
*/
void initMachineDirMonitor() {
boolean locked = directorLockService.acquireLock();
@@ -57,7 +61,7 @@
log.info("鍥炰紶鎺ユ敹鐩綍宸茬粡琚叾浠栭儴缃茬偣浣嶉攣瀹氾紝鐩存帴杩斿洖");
return;
}
- List<Machine> machineList = machineService.list();
+ List<Machine> machineList = machineService.lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).list();
List<String> monitorDirList = new ArrayList<String>();
machineList.forEach(m -> {
if (StringUtils.isNotEmpty(m.getProgReceiveDir())) {
--
Gitblit v1.9.3