From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/config/InitBean.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 6acb1a6..08f278e 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
@@ -6,6 +6,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.commons.service.MachineDirTranslator;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.machinefile.entity.MachineFile;
@@ -34,10 +35,7 @@
private final ProgramAnnotationService annotationService;
private final MachineFileScanService machineFileScanService;
private final TaskDispatchService taskDispatchService;
-
- //@Value("${task.file_scan_on_start:true}")
- //@Value("${task.fileScanOnStart:true}")
- //public boolean fileScanOnStart;
+ private final MachineDirTranslator dirTranslator;
private final TaskPropertieBean taskPropertieBean;
@PostConstruct
public void init() {
@@ -52,7 +50,6 @@
log.info("宸ユ帶缃戝惎鍔ㄦ枃浠剁洃鎺�");
initMachineDirMonitor();
}else{
-
//娑夊瘑缃�
taskDispatchService.resetDrawingNos();
}
@@ -76,6 +73,7 @@
machineList.forEach(m -> {
addToWatchDirList(monitorInfoList,m);
});
+
for (WatchInfo info : monitorInfoList) {
try {
Path dirPath = Paths.get(info.getPath());
@@ -94,7 +92,8 @@
String dir;
//鍔犲叆send鏂囦欢澶�
if (StringUtils.isNotEmpty(machine.getProgSendDir())) {
- dir = StringUtils.removeEnd(StringUtils.removeEnd(machine.getProgSendDir(), "/"), "\\");
+ //dir = dirTranslator.trans(StringUtils.removeEnd(StringUtils.removeEnd(machine.getProgSendDir(), "/"), "\\"));
+ dir = fixMachineDir(machine.getProgSendDir());
WatchInfo watchInfo = new WatchInfo();
watchInfo.setMachine(machine);
watchInfo.setDirType(MachineFile.DIR_TYPE_SEND);
@@ -106,7 +105,8 @@
//鍔犲叆rec鏂囦欢澶�
if (StringUtils.isNotEmpty(machine.getProgReceiveDir())) {
- dir = StringUtils.removeEnd(StringUtils.removeEnd(machine.getProgReceiveDir(), "/"), "\\");
+ //dir = StringUtils.removeEnd(StringUtils.removeEnd(machine.getProgReceiveDir(), "/"), "\\");
+ dir = fixMachineDir(machine.getProgReceiveDir());
WatchInfo watchInfo = new WatchInfo();
watchInfo.setMachine(machine);
watchInfo.setDirType(MachineFile.DIR_TYPE_REC);
@@ -118,7 +118,8 @@
//鍔犲叆temp鏂囦欢澶�
if (StringUtils.isNotEmpty(machine.getProgTempDir())) {
- dir = StringUtils.removeEnd(StringUtils.removeEnd(machine.getProgTempDir(), "/"), "\\");
+ //dir = StringUtils.removeEnd(StringUtils.removeEnd(machine.getProgTempDir(), "/"), "\\");
+ dir = fixMachineDir(machine.getProgTempDir());
WatchInfo watchInfo = new WatchInfo();
watchInfo.setMachine(machine);
watchInfo.setDirType(MachineFile.DIR_TYPE_TEMP);
@@ -129,6 +130,15 @@
}
}
+ /**
+ * 缈昏瘧鍏变韩鏂囦欢澶硅矾寰勫埌 鏍囧噯缃戠粶璺緞锛屽幓鎺夋湯灏捐矾寰勫垎鍓蹭笉
+ * @param dirpath 鍘熷璺緞
+ * @return 杞崲鍚庣殑璺緞
+ */
+ String fixMachineDir(String dirpath){
+ return dirTranslator.trans(StringUtils.removeEnd(StringUtils.removeEnd(dirpath, "/"), "\\"));
+ }
+
FileWatcherService.FileChangeListener getListener(WatchInfo info) {
return new MachineFileChangeListener(machineFileService,annotationService,info);
}
--
Gitblit v1.9.3