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/flow/service/FlowProgramFileService.java | 147 ++++++++++++++++++++++++++++++++----------------
1 files changed, 97 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..1dd1748 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
@@ -1,9 +1,10 @@
package org.springblade.mdm.flow.service;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
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,19 +12,23 @@
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;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import java.util.Map;
/**
* 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
@@ -32,69 +37,111 @@
*/
@Slf4j
@Service
-@AllArgsConstructor
public class FlowProgramFileService extends BizServiceImpl<FlowProgramFileMapper, FlowProgramFile> {
- private final OssTemplate ossTemplate;
- private final RuntimeService runtimeService;
- private final FlowCommonService flowCommonService;
+ @Autowired
+ private OssTemplate ossTemplate;
+ @Autowired
+ private RuntimeService runtimeService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+
+ /**
+ * 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
+ * @param uploadVO 涓婁紶瀵硅薄
+ */
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);
+ FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
+ MultipartFile file = uploadVO.getFile();
+ if(file.getSize() == 0){
+ throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
}
+ if(FlowProgramFile.TYPE_PROGRAM.equals(uploadVO.getFileType())) {
+ ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(), progProps);
+ }
+
+ BladeFile bfile = ossTemplate.putFile(file);
+
+ FlowProgramFile progFile = new FlowProgramFile();
+ progFile.setName(file.getOriginalFilename());
+ progFile.setOssName(bfile.getName());
+ progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
+ progFile.setProgramName(NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo()));
+ progFile.setFileType(uploadVO.getFileType());
+ save(progFile);
+
}
- void checkFilename(String filename,FlowProgramProperties programProperties){
- //绋嬪簭鍚嶇О锛氶浂浠跺彿鍔犲伐搴忓彿锛屾枃浠跺悕搴旇浠ユ寮�澶�
- String expectedProgramName = programProperties.getDrawingNo()+"-"+programProperties.getProcessNo();
- if(!StringUtils.startsWith(filename,expectedProgramName)){
- throw new ServiceException("绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕");
- }
- }
/**
* 鑾峰彇鏂囦欢鍐呭
- * @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);
+
+ String fileName = programFile.getOssName();
+ try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
+ ByteArrayInputStream bos = new ByteArrayInputStream(inputStream.readAllBytes());
+ boolean isText = StringUtils.endsWithIgnoreCase(fileName,".txt") || StringUtils.endsWithIgnoreCase(fileName,".nc")|| StringUtils.endsWithIgnoreCase(fileName,".xml");
+ if(!isText){
+ isText= FileContentUtil.isTextFile(bos);
}
- //}else{
- // result = "闈炴枃鏈牸寮忔枃浠�";
- //}
+ if(isText){
+ bos.reset();
+ result = FileContentUtil.getContentFromStream(bos);
+ }else{
+ result = "<闈炴枃鏈枃浠�>";
+ }
+ } 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();
+ List<FlowProgramFile> purePrograms = flowPrograms.stream().filter(FlowProgramFile::isProgram).toList();
+ if(isPass && purePrograms.isEmpty()){
+ throw new ServiceException("璇蜂笂浼犵▼搴忔枃浠�");
+ }
+ int totalSeg = 0;
+ if(!purePrograms.isEmpty()){
+ FlowProgramFile progFile = purePrograms.get(0);
+ totalSeg = ProgramFileNameCheckUtil.getProgramSegCount(progFile.getName());
+ }
+
+ if(totalSeg != purePrograms.size()){
+ throw new ServiceException("搴斾笂浼�"+totalSeg+"娈电▼搴忥紝瀹為檯涓婁紶"+flowPrograms.size()+"娈�");
+ }
+
+ }
+
+ public void download(Long id, HttpServletResponse response) throws IOException {
+ FlowProgramFile flowFile = this.getById(id);
+ response.setHeader("Content-Disposition", "attachment; filename="+flowFile.getName());
+ response.setContentType("application/octet-stream");
+ try(InputStream ins = ossTemplate.statFileStream(flowFile.getOssName());){
+ IOUtils.copy(ins,response.getOutputStream());
+ }
+ }
+
+ /**
+ * 鑾峰彇鍏充簬娴佺▼鐨勬墍鏈夋枃浠�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return 娴佺▼鍏宠仈鐨勬枃浠跺垪琛�
+ */
+ public List<FlowProgramFile> listByProcessInstanceId(String processInstanceId){
+ return lambdaQuery()
+ .eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();
+ }
}
--
Gitblit v1.9.3