From 0ef4cc755bddd87799b8bfdd65c8123df6e149d0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 23:52:51 +0800
Subject: [PATCH] 锁定流程完成
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/MachineFileService.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 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 dbe2c10..33915b3 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
@@ -1,19 +1,21 @@
package org.springblade.mdm.gkw.programnode.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.tool.utils.Charsets;
-import org.springblade.core.tool.utils.Func;
+import org.springblade.core.mp.support.Condition;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.mapper.MachineFileMapper;
+import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
+import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
+import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,11 +23,9 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.List;
/**
* 鏈哄簥鏂囦欢
@@ -40,12 +40,14 @@
/**
* 妫�娴嬫枃浠舵槸鍚﹀瓨鍦�
* @param name 鏂囦欢鍚�
- * @param md5 鏂囦欢md5
+ * @param dirType 鏂囦欢澶圭被鍨�
* @param machineCode 鎵�灞炴満搴�
* @return 鏄惁瀛樺湪浜庡簱鍐�
*/
- public boolean fileExists(String name, String md5,String machineCode) {
- return this.lambdaQuery().eq(MachineFile::getName, name).eq(MachineFile::getMd5, md5).eq(MachineFile::getMachineCode, machineCode).count()>0;
+ public boolean fileExists(String name, String dirType,String machineCode) {
+ return this.lambdaQuery().eq(MachineFile::getName, name)
+ .eq(MachineFile::getDirType, dirType)
+ .eq(MachineFile::getMachineCode, machineCode).count()>0;
}
@Transactional(readOnly = true)
@@ -98,7 +100,7 @@
}
@Transactional
- public void saveFileConent(Long id, String content) throws IOException {
+ public void saveFileContent(Long id, String content) throws IOException {
MachineFile machineFile = getById(id);
Machine machine = machineService.getByCode(machineFile.getMachineCode());
@@ -112,8 +114,43 @@
log.error("璇诲彇鏂囦欢缂栫爜澶辫触",e);
throw new ServiceException("鑾峰彇鏂囦欢缂栫爜澶辫触");
}
-
FileUtils.writeStringToFile(filePath.toFile(),content,charsetName);
+ }
+ /**
+ * 鑾峰彇鏂囦欢鐨勮緭鍏ユ祦
+ * @param machineFile
+ * @return
+ * @throws IOException
+ */
+ public InputStream getInputStream(MachineFile machineFile) throws IOException {
+
+ Machine machine = machineService.getByCode(machineFile.getMachineCode());
+
+ String filePathStr = getBasePath(machine,machineFile.getDirType())+ File.separator+machineFile.getName();
+ Path filePath = Paths.get(filePathStr);
+ return Files.newInputStream(filePath);
+
+ }
+
+ @Transactional(readOnly = true)
+ public IPage<MachineBackFileVO> machineBackFilePageQuery(MachineBackFileQueryVO query) {
+ return this.baseMapper.machineBackFilePageQuery(Condition.getPage(query),query);
+ }
+
+ public MachineFile getExistsFile(String name, String dirType, String machineCode) {
+ return this.lambdaQuery().eq(MachineFile::getName, name)
+ .eq(MachineFile::getDirType, dirType)
+ .eq(MachineFile::getMachineCode, machineCode).list().stream().findFirst().orElse(null);
+ }
+
+ /**
+ * 鍥炰紶绋嬪簭澶勭悊 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ public IPage<MachineBackFileVO> handlePageQuery(MachineBackFileHandleQueryVO query) {
+ IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
+ return page;
}
}
--
Gitblit v1.9.3