From 44fda5fa3787c78e74d62f9713dd36abdeadcac8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 18 七月 2025 21:27:38 +0800
Subject: [PATCH] 上传接口调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 a837e3b..c4787dd 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
@@ -4,6 +4,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -13,6 +14,7 @@
import org.springblade.mdm.machineback.filewatch.FileWatcherService;
import org.springblade.mdm.machineback.filewatch.MachineFileBackListener;
import org.springblade.mdm.machineback.service.MachineBackFileService;
+import org.springblade.mdm.program.filewatch.ProgramBackMonitor;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.system.feign.ISysClient;
import org.springframework.context.annotation.Bean;
@@ -30,20 +32,28 @@
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 ProgramBackMonitor programBackMonitor;
//private final FileWatcherService.FileChangeListener listener;
@PostConstruct
public void init() {
- System.out.println("搴旂敤鍚姩鏃舵墽琛屽垵濮嬪寲鎿嶄綔 @PostConstruct");
+ log.info("搴旂敤鍚姩鏃舵墽琛屽垵濮嬪寲鎿嶄綔 @PostConstruct");
+
+ programBackMonitor.monitorDir();
// 鍒濆鍖栭�昏緫
+ /*
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();
}
+ */
+
}
/**
@@ -82,7 +92,7 @@
FileWatcherService.FileChangeListener getListener() {
- return new MachineFileBackListener(machineBackFileService,ncProgramService);
+ return new MachineFileBackListener(machineBackFileService,ncProgramService,ossTemplate);
}
--
Gitblit v1.9.3