From f2501d5bf27a67d3ea6fbf9ec7c1272524ca4af4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 13:24:19 +0800
Subject: [PATCH] 上传文件改单个
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 48 ++++++++++--------------------------------------
1 files changed, 10 insertions(+), 38 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
index a4593ff..a6de868 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
@@ -12,14 +12,10 @@
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.tool.api.IResultCode;
-import org.springblade.core.tool.api.ResultCode;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.NumberUtil;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.mapper.FlowProgramFileMapper;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -27,8 +23,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
/**
* 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
@@ -47,49 +41,27 @@
public void uploadFlowProgramFile(ProgramUploadVO uploadVO) {
- //Map<String, Object> vars = runtimeService.getVariables(uploadVO.getProcessInstanceId());
-
FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
- checkFilenames(uploadVO.getFiles(),progProps);
+ MultipartFile file = uploadVO.getFile();
+ checkFilename(file.getOriginalFilename(),progProps);
String programName = getProgramName(progProps);
- for(MultipartFile file : uploadVO.getFiles()) {
- BladeFile bfile = ossTemplate.putFile(file);
- FlowProgramFile progFile = new FlowProgramFile();
- progFile.setName(file.getOriginalFilename());
- progFile.setOssName(bfile.getName());
- progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
+ BladeFile bfile = ossTemplate.putFile(file);
- progFile.setProgramName(programName);
+ FlowProgramFile progFile = new FlowProgramFile();
+ progFile.setName(file.getOriginalFilename());
+ progFile.setOssName(bfile.getName());
+ progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
- save(progFile);
- }
- //
- //BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
- //String link = bfile.getLink();
- //淇濆瓨profame
- /*
- NcProgram prog = new NcProgram();
- prog.setCode(generageCode());
- prog.setName(file.getOriginalFilename());
- prog.setNcNodeId(uploadVO.getNodeId());
- prog.setOssName(bfile.getName());
- prog.setDrawingNo(uploadVO.getDrawingNo());
- prog.setProcessEdition(uploadVO.getProcessEdition());
- prog.setIsLastEdition(1);
+ progFile.setProgramName(programName);
- */
+ save(progFile);
+
}
String getProgramName(FlowProgramProperties progProps){
return progProps.getDrawingNo()+"-"+progProps.getProcessNo();
- }
-
- public void checkFilenames(MultipartFile[] files,FlowProgramProperties programProperties){
- for (MultipartFile file : files){
- checkFilename(file.getOriginalFilename(),programProperties);
- }
}
/**
--
Gitblit v1.9.3