From 7551b1ae51da67627f7ed03276707127dfc9cdc6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 17 七月 2025 17:29:49 +0800
Subject: [PATCH] 机床回传文件调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java
index 992ac84..2b0af03 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java
@@ -1,12 +1,15 @@
package org.springblade.mdm.machineback.filewatch;
-import lombok.SneakyThrows;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.oss.model.BladeFile;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcProgramService;
+import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;
@@ -14,9 +17,11 @@
public class MachineFileBackListener implements FileWatcherService.FileChangeListener{
private final MachineBackFileService machineBackFileService;
private final NcProgramService ncProgramService;
- public MachineFileBackListener(MachineBackFileService backService, NcProgramService aNcProgramService) {
+ private final OssTemplate ossTemplate;
+ public MachineFileBackListener(MachineBackFileService backService, NcProgramService aNcProgramService,OssTemplate aOssTemplate) {
this.machineBackFileService = backService;
this.ncProgramService = aNcProgramService;
+ this.ossTemplate = aOssTemplate;
}
@Override
public void onFileCreated(Path filePath) {
@@ -39,6 +44,14 @@
return;
}
backFile.setNcProgramId(prog.getId());
+
+ //鏇存柊绋嬪簭鐨勬枃浠跺湴鍧�
+ try(FileInputStream fins = new FileInputStream(filePath.toFile());){
+ BladeFile bfile = ossTemplate.putFile(programName, fins);
+ backFile.setOssName(bfile.getName());
+ }
+
+
machineBackFileService.save(backFile);
}else{
log.warn("鏂囦欢浼犺緭涓紝鍚庣画鍐嶆搷浣渰}",filePath);
@@ -47,7 +60,7 @@
log.error("鍥炰紶鏂囦欢鎿嶄綔IO閿欒",e);
throw new RuntimeException(e);
} catch (InterruptedException e) {
- log.error("sleep鍑洪敊");
+ log.error("sleep鍑洪敊",e);
} catch (Exception e) {
log.error("鏈哄簥鍥炰紶鏂囦欢澶勭悊寮傚父",e);
}
--
Gitblit v1.9.3