From c6b49750da5d19383e74e644f4fa1734138aff89 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 20:12:34 +0800
Subject: [PATCH] 增补上传的文件类型字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 206 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 156 insertions(+), 50 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 ce5bf5f..17c3597 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
@@ -3,7 +3,6 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.RuntimeService;
@@ -11,11 +10,15 @@
import org.springblade.core.mp.base.BizServiceImpl;
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.utils.Func;
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.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.utils.FileContentUtil;
+import org.springblade.mdm.utils.ProgramFileNameCheckUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -23,7 +26,6 @@
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import java.util.Map;
/**
* 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
@@ -32,69 +34,173 @@
*/
@Slf4j
@Service
-@AllArgsConstructor
public class FlowProgramFileService extends BizServiceImpl<FlowProgramFileMapper, FlowProgramFile> {
- private final OssTemplate ossTemplate;
- private final RuntimeService runtimeService;
- private final FlowCommonService flowCommonService;
- public void uploadFlowProgramFile(ProgramUploadVO uploadVO) {
-
- Map<String, Object> vars = runtimeService.getVariables(uploadVO.getProcessInstanceId());
- checkFilenames(uploadVO.getFiles(),flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId()));
-
-
- //
- //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);
-
- */
- }
-
- public void checkFilenames(MultipartFile[] files,FlowProgramProperties programProperties){
- for (MultipartFile file : files){
- checkFilename(file.getOriginalFilename(),programProperties);
- }
- }
-
- void checkFilename(String filename,FlowProgramProperties programProperties){
- //绋嬪簭鍚嶇О锛氶浂浠跺彿鍔犲伐搴忓彿锛屾枃浠跺悕搴旇浠ユ寮�澶�
- String expectedProgramName = programProperties.getDrawingNo()+"-"+programProperties.getProcessNo();
- if(!StringUtils.startsWith(filename,expectedProgramName)){
- throw new ServiceException("绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕");
- }
- }
+ @Autowired
+ private OssTemplate ossTemplate;
+ @Autowired
+ private RuntimeService runtimeService;
+ @Autowired
+ private FlowCommonService flowCommonService;
/**
+ * 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
+ * @param uploadVO 涓婁紶瀵硅薄
+ */
+ public void uploadFlowProgramFile(ProgramUploadVO uploadVO) {
+
+ FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
+ MultipartFile file = uploadVO.getFile();
+ if(file.getSize() == 0){
+ throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
+ }
+ ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
+
+ String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo());
+
+ BladeFile bfile = ossTemplate.putFile(file);
+
+ FlowProgramFile progFile = new FlowProgramFile();
+ progFile.setName(file.getOriginalFilename());
+ progFile.setOssName(bfile.getName());
+ progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
+ progFile.setProgramName(programName);
+ progFile.setFileType(uploadVO.getFileType());
+ save(progFile);
+
+ }
+
+
+ /**
+ * 妫�鏌ユ枃浠跺悕鍚堟硶鎬�
+ * @param filename 鏂囦欢鍚�
+ * @param programProperties 绋嬪簭灞炴�э紝鍙戣捣鏃跺～鍐欑殑
+ */
+ /*
+ void checkFilename(String filename,FlowProgramProperties programProperties){
+ //绋嬪簭鍚嶇О锛氶浂浠跺彿鍔犲伐搴忓彿锛屾枃浠跺悕搴旇浠ユ寮�澶�
+ String programNamePrefix = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo()) + "-"+programProperties.getProcessEdition();
+ if(!StringUtils.startsWith(filename,programNamePrefix)){
+
+ IResultCode rc = new IResultCode() {
+ @Override
+ public String getMessage() {
+ return "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+programNamePrefix+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
+ }
+
+ @Override
+ public int getCode() {
+ return 1;
+ }
+ };
+ throw new ServiceException(rc);
+ }
+
+ //鎴彇鍚庨潰鐨勬鏁板拰绗嚑娈�
+ String endPart = StringUtils.removeStart(filename,programNamePrefix+"-");
+
+ //鍘绘帀鎵╁睍鍚�
+ if(endPart.contains(".")){
+ endPart = endPart.substring(0,endPart.indexOf("."));
+ }
+
+ int sepCount = StringUtils.countMatches(endPart,"-");
+ if(sepCount != 1){//- 鍙峰簲璇ユ槸1涓�
+ IResultCode rc = new IResultCode() {
+ @Override
+ public String getMessage() {
+ return "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+programNamePrefix+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
+ }
+
+ @Override
+ public int getCode() {
+ return 2;
+ }
+ };
+ throw new ServiceException(rc);
+ }
+
+ String[] arr = StringUtils.split(endPart,"-");
+ if(!StringUtils.isNumeric(arr[0]) || Func.toInt(arr[0]) >99 || Func.toInt(arr[0]) < 1){
+ IResultCode rc = new IResultCode() {
+ @Override
+ public String getMessage() {
+ return "绋嬪簭娈垫暟涓嶅悎娉曪紝搴斾负涓や綅浠ュ唴鏁存暟";
+ }
+
+ @Override
+ public int getCode() {
+ return 3;
+ }
+ };
+ throw new ServiceException(rc);
+ }
+ int segCount = Func.toInt(arr[0]);
+
+ if(!StringUtils.isNumeric(arr[1]) || Func.toInt(arr[1]) < 1 || Func.toInt(arr[1]) > segCount){
+ IResultCode rc = new IResultCode() {
+ @Override
+ public String getMessage() {
+ return "绋嬪簭娈靛彿涓嶅悎娉曪紝搴斾负涓や綅浠ュ唴鏁存暟涓斿皬浜庣瓑浜庢鏁般��";
+ }
+
+ @Override
+ public int getCode() {
+ return 4;
+ }
+ };
+ throw new ServiceException(rc);
+ }
+ }
+*/
+ /**
* 鑾峰彇鏂囦欢鍐呭
- * @param id
- * @return
+ * @param id 鏂囦欢id
+ * @return 鏂囦欢鍐呭鏂囨湰
*/
public String getFileContent(Long id) {
String result ="";
FlowProgramFile programFile = this.getById(id);
- //if(prog.getIsTextFile()!=null && programFile.getIsTextFile()){
+ /*
String fileName = programFile.getOssName();
try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new RuntimeException(e);
}
- //}else{
- // result = "闈炴枃鏈牸寮忔枃浠�";
- //}
+ */
+
+ String fileName = programFile.getOssName();
+ try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
+ result = FileContentUtil.getContentFromStream(inputStream);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
return result;
}
+ /**
+ * 楠岃瘉绋嬪簭鏂囦欢鐨勫畬鏁存�э紝浠呭湪缂栧埗鑺傜偣浣跨敤
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ */
+ public void checkProgramFiles(String processInstanceId,boolean isPass) {
+ List<FlowProgramFile> flowPrograms = this.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list();
+ if(isPass && flowPrograms.isEmpty()){
+ throw new ServiceException("璇蜂笂浼犵▼搴忔枃浠�");
+ }
+ int totalSeg = 0;
+ if(!flowPrograms.isEmpty()){
+ FlowProgramFile progFile = flowPrograms.get(0);
+ totalSeg = ProgramFileNameCheckUtil.getProgramSegCount(progFile.getName());
+ }
+
+ if(totalSeg != flowPrograms.size()){
+ throw new ServiceException("搴斾笂浼�"+totalSeg+"娈电▼搴忥紝瀹為檯涓婁紶"+flowPrograms.size()+"娈�");
+ }
+
+
+ }
+
}
--
Gitblit v1.9.3