From 95b1f7b2b35872444acf8e85cc236682d0c4e47e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 11:08:06 +0800
Subject: [PATCH] 分工表加入重复图号的校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 99 +++++++++++++++++++++++++++++--------------------
1 files changed, 59 insertions(+), 40 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..6ee3346 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;
@@ -12,14 +11,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;
@@ -28,7 +23,6 @@
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import java.util.Map;
/**
* 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
@@ -45,57 +39,44 @@
@Autowired
private FlowCommonService flowCommonService;
+ /**
+ * 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
+ * @param uploadVO 涓婁紶瀵硅薄
+ */
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());
+ progFile.setIsCured(0);
+ progFile.setProgramName(programName);
- 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);
+ save(progFile);
- */
}
+ /**
+ * 鑾峰彇绋嬪簭鍚嶇О
+ * @param progProps
+ * @return
+ */
String getProgramName(FlowProgramProperties progProps){
return progProps.getDrawingNo()+"-"+progProps.getProcessNo();
}
- public void checkFilenames(MultipartFile[] files,FlowProgramProperties programProperties){
- for (MultipartFile file : files){
- checkFilename(file.getOriginalFilename(),programProperties);
- }
- }
-
/**
* 妫�鏌ユ枃浠跺悕鍚堟硶鎬�
- * @param filename
- * @param programProperties
+ * @param filename 鏂囦欢鍚�
+ * @param programProperties 绋嬪簭灞炴�э紝鍙戣捣鏃跺～鍐欑殑
*/
void checkFilename(String filename,FlowProgramProperties programProperties){
//绋嬪簭鍚嶇О锛氶浂浠跺彿鍔犲伐搴忓彿锛屾枃浠跺悕搴旇浠ユ寮�澶�
@@ -197,5 +178,43 @@
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 = getProgramSegCount(progFile.getName());
+ }
+ if(totalSeg != flowPrograms.size()){
+ throw new ServiceException("搴斾笂浼�"+totalSeg+"娈电▼搴忥紝瀹為檯涓婁紶"+flowPrograms.size()+"娈�");
+ }
+
+
+ }
+
+ /**
+ * 鏍规嵁鏂囦欢鍚嶈幏鍙栫▼搴忔�绘鏍�
+ * @param filename 鏂囦欢鍚�
+ * @return
+ */
+ int getProgramSegCount(String filename){
+ int idx = filename.lastIndexOf(".");
+ String tempstr = filename.substring(0,idx);//鍘绘帀鎵╁睍鍚�
+ //System.out.println(tempstr);
+ idx = tempstr.lastIndexOf("-");
+ tempstr = tempstr.substring(0,idx);
+ //System.out.println(tempstr);
+ idx = tempstr.lastIndexOf("-");
+ tempstr = tempstr.substring(idx+1);
+ //System.out.println(tempstr);
+ return Func.toInt(tempstr);
+ }
}
--
Gitblit v1.9.3