From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java | 73 ------------------------------------
1 files changed, 1 insertions(+), 72 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 3d2a85b..e4d826d 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
@@ -3,93 +3,22 @@
import jakarta.annotation.PostConstruct;
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;
-import org.springblade.mdm.commons.contants.ParamConstants;
-import org.springblade.mdm.machineback.filewatch.DirectorLockService;
-import org.springblade.mdm.machineback.filewatch.DynamicDirectoryWatcher;
-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.service.NcProgramService;
import org.springblade.system.feign.ISysClient;
import org.springframework.stereotype.Component;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
@Slf4j
@AllArgsConstructor
@Component
public class InitBean {
- private final DirectorLockService directorLockService;
- private final MachineService machineService;
- private final FileWatcherService fileWatcherService;
- 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() {
log.info("搴旂敤鍚姩鏃舵墽琛屽垵濮嬪寲鎿嶄綔 @PostConstruct");
- // 鍒濆鍖栭�昏緫
-
- R<String> networkTypeR = sysClient.getParamValue(ParamConstants.NETWORK_TYPE_KEY);
- String networkType = networkTypeR.getData() == null ? ParamConstants.NETWORK_TYPE_SHEMI : networkTypeR.getData();
- if (networkType.equals(ParamConstants.NETWORK_TYPE_GONGKONG)) {
- initMachineDirMonitor();
- }
-
-
}
-
- /**
- * 鍒濆鍖栨満搴婄洃鎺х洰褰�
- */
- void initMachineDirMonitor() {
- boolean locked = directorLockService.acquireLock();
- if (!locked) {
- log.info("鍥炰紶鎺ユ敹鐩綍宸茬粡琚叾浠栭儴缃茬偣浣嶉攣瀹氾紝鐩存帴杩斿洖");
- return;
- }
- 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())) {
- String dir = StringUtils.removeEnd(StringUtils.removeEnd(m.getProgReceiveDir(), "/"), "\\");
- if (!monitorDirList.contains(dir)) {
- monitorDirList.add(dir);
- }
-
- }
- });
- for (String dir : monitorDirList) {
- Path dirPath = Paths.get(dir);
- try {
- if(!dirPath.toFile().exists()) {
- dirPath.toFile().mkdirs();
- }
- directoryWatcher.addDirectory(dirPath,getListener());
- } catch (Exception e) {
- log.error("娣诲姞鐩戞帶鐩綍寮傚父",e);
- }
- }
-
- }
-
-
- FileWatcherService.FileChangeListener getListener() {
- return new MachineFileBackListener(machineBackFileService,ncProgramService,ossTemplate);
- }
-
}
--
Gitblit v1.9.3