From 3c1c93e559d2dc060cdfc2ab7f0c36378230abab Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 八月 2025 14:24:13 +0800
Subject: [PATCH] 机床文件移动/删除 0小时不处理
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/MachineFileService.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/MachineFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/MachineFileService.java
index 33915b3..c64c04a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/MachineFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/MachineFileService.java
@@ -9,10 +9,15 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.oss.model.BladeFile;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.gkw.programnode.entity.MachineFileChangeHis;
import org.springblade.mdm.gkw.programnode.mapper.MachineFileMapper;
+import org.springblade.mdm.gkw.programnode.vo.MachineFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
@@ -26,6 +31,8 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
/**
* 鏈哄簥鏂囦欢
@@ -37,6 +44,8 @@
@AllArgsConstructor
public class MachineFileService extends BizServiceImpl<MachineFileMapper, MachineFile> {
private final MachineService machineService;
+ private final MachineFileChangeHisService machineFileChangeHisService;
+ private final OssTemplate ossTemplate;
/**
* 妫�娴嬫枃浠舵槸鍚﹀瓨鍦�
* @param name 鏂囦欢鍚�
@@ -106,10 +115,22 @@
String filePathStr = getBasePath(machine,machineFile.getDirType())+ File.separator+machineFile.getName();
Path filePath = Paths.get(filePathStr);
+
+ BladeFile bfile;
+ try (InputStream inputStream = Files.newInputStream(filePath)) {
+ bfile = ossTemplate.putFile(machineFile.getName(), inputStream);
+ }
String charsetName = "UTF-8";
try (InputStream inputStream = Files.newInputStream(filePath)) {
// 浣跨敤杈撳叆娴佽鍙栨枃浠跺唴瀹�
charsetName = FileContentUtil.detectFromInputStream(inputStream);
+
+ //淇濆瓨鍘嗗彶璁板綍
+ MachineFileChangeHis his = new MachineFileChangeHis();
+ his.setMachineFileId(id);
+ his.setOssName(bfile.getName());
+
+ this.machineFileChangeHisService.save(his);
} catch (IOException e) {
log.error("璇诲彇鏂囦欢缂栫爜澶辫触",e);
throw new ServiceException("鑾峰彇鏂囦欢缂栫爜澶辫触");
@@ -153,4 +174,13 @@
IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
return page;
}
+
+ /**
+ * 鏈哄簥鏂囦欢鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ public IPage<MachineFile> pageQuery(MachineFileQueryVO query) {
+ return baseMapper.pageQuery(Condition.getPage(query),query);
+ }
}
--
Gitblit v1.9.3