From c9cc74fad46adaa4bc448cba673e830baf705fce Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 24 六月 2025 17:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/listener/FileListener.java | 55 +++++++++++++------------------------------------------
1 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/listener/FileListener.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/listener/FileListener.java
index d7d6b1f..bfd8427 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/listener/FileListener.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/listener/FileListener.java
@@ -2,22 +2,25 @@
import org.apache.commons.io.monitor.FileAlterationListener;
import org.apache.commons.io.monitor.FileAlterationObserver;
-import org.jeecg.common.util.FileUtil;
-import org.jeecg.modules.dnc.service.IDocInfoService;
-import org.jeecg.modules.dnc.utils.file.FileUtilS;
+import org.jeecg.modules.dnc.dto.TransferPackage;
+import org.jeecg.modules.dnc.service.impl.DataImportService;
+import org.jeecg.modules.dnc.service.impl.FileFerryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.File;
-import java.util.Objects;
@Component
public class FileListener implements FileAlterationListener {
private static final Logger log = LoggerFactory.getLogger(FileListener.class);
+
@Autowired
- private IDocInfoService docInfoService; // 鏂囨。鏈嶅姟
+ private FileFerryService fileFerryService;
+
+ @Autowired
+ private DataImportService dataImportService;
@Override
public void onStart(FileAlterationObserver observer) {
@@ -43,6 +46,11 @@
public void onFileCreate(File file) {
String filePath = file.getAbsolutePath();
log.info("[鏂板缓]: {}", filePath);
+ if (filePath.endsWith(".ferry")){
+ TransferPackage data = fileFerryService.importData(filePath);
+ dataImportService.importTransferPackage(data);
+ log.info("鏂囦欢瀵煎叆瀹屾垚");
+ }
}
@Override
public void onFileChange(File file) {
@@ -58,42 +66,5 @@
public void onStop(FileAlterationObserver observer) {
// log.info("缁撴潫鐩戝惉鐩綍: {}", observer.getDirectory().getAbsolutePath());
}
-
- /**
- * 宸ユ帶缃戣В鏋愭秹瀵嗙綉浼犺繃鏉ョ殑NC鏂囦欢涓巒c鏂囦欢杩涜瑙ｆ瀽
- * @param file
- */
- private void handleIndustrialDocFile(File file) {
- log.info("宸ユ帶缃戣В鏋愭秹瀵嗙綉浼犺繃鏉ョ殑NC鏂囦欢涓巒c鏂囦欢杩涜瑙ｆ瀽: {}", file.getAbsolutePath());
- try {
- if (Objects.equals(FileUtil.getFileSuffix(file.getName()), "nc")) {
- boolean success = docInfoService.addDocInfoAnalysisGwNcService(file.getAbsolutePath(), file);
- if (success) {
- FileUtilS.copyFileRec(file.getAbsolutePath());
- FileUtilS.fileRecDelete(file.getAbsolutePath());
- }
- }else if (Objects.equals(FileUtil.getFileSuffix(file.getName()), "txt")) {
- //todo 鏄惁瑙ｆ瀽宸ヤ綔娴佹搷浣�
-
- }
- } catch (Exception e) {
- log.error("宸ユ帶缃戣В鏋愭秹瀵嗙綉浼犺繃鏉ョ殑NC鏂囦欢涓巒c鏂囦欢杩涜瑙ｆ瀽: {}", e.getMessage());
- }
- }
-
- /**
- * 娑夊瘑缃戣В鏋愬伐鎺х綉浼犺繃鏉ョ殑NC鏂囦欢涓巒c鏂囦欢杩涜瑙ｆ瀽锛堢▼搴忓洖浼狅級
- * @param file
- */
- private void handleSecretDocFile(File file) {
- log.info("娑夊瘑缃戣В鏋愬伐鎺х綉浼犺繃鏉ョ殑NC鏂囦欢涓巒c鏂囦欢杩涜瑙ｆ瀽: {}", file.getAbsolutePath());
- try {
- boolean b= docInfoService.addDocInfoAnalysisSmwNcService(file.getAbsolutePath(), file);
-
- }catch (Exception e) {
- log.error("娑夊瘑缃戣В鏋愬伐鎺х綉浼犺繃鏉ョ殑NC鏂囦欢涓巒c鏂囦欢杩涜瑙ｆ瀽: {}", e.getMessage());
- }
- }
-
}
--
Gitblit v1.9.3