From 2f7738d809f1b3e31ec61e97c7be974beda3be30 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 16:27:00 +0800
Subject: [PATCH] 新增文件编辑和保存接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 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 c4787dd..3d2a85b 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
@@ -8,16 +8,14 @@
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.ParamContants;
+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.filewatch.ProgramBackMonitor;
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;
@@ -37,27 +35,25 @@
private final MachineBackFileService machineBackFileService;
private final NcProgramService ncProgramService;
private final OssTemplate ossTemplate;
-
- private final ProgramBackMonitor programBackMonitor;
+ private final ISysClient sysClient;
//private final FileWatcherService.FileChangeListener listener;
@PostConstruct
public void init() {
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)) {
+
+ 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();
@@ -65,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