From 18d9c0bdc04e71cf3903c30c139f59dab744cf3f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 15:09:35 +0800
Subject: [PATCH] 偏离回传 流程改名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java | 184 +--------------------------------------------
1 files changed, 6 insertions(+), 178 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java
index c79d935..3854255 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java
@@ -10,10 +10,14 @@
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.entity.ReplaceProgramFile;
import org.springblade.mdm.flow.mapper.ReplaceProgramFileMapper;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
+import org.springblade.mdm.flow.vo.ReplaceUploadVO;
+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;
@@ -36,185 +40,9 @@
private RuntimeService runtimeService;
@Autowired
private FlowCommonService flowCommonService;
+ @Autowired
+ private FlowProgramFileService flowProgramFileService;
- /**
- * 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
- * @param uploadVO 涓婁紶瀵硅薄
- */
- public void uploadFlowProgramFile(ProgramUploadVO uploadVO) {
-
- FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
- MultipartFile file = uploadVO.getFile();
- if(file.getSize() == 0){
- throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
- }
- checkFilename(file.getOriginalFilename(),progProps);
-
- String programName = getProgramName(progProps);
-
- BladeFile bfile = ossTemplate.putFile(file);
-
- ReplaceProgramFile progFile = new ReplaceProgramFile();
- progFile.setName(file.getOriginalFilename());
- progFile.setOssName(bfile.getName());
- progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
-
- progFile.setProgramName(programName);
-
- save(progFile);
-
- }
-
- /**
- * 鑾峰彇绋嬪簭鍚嶇О
- * @param progProps
- * @return
- */
- String getProgramName(FlowProgramProperties progProps){
- return progProps.getDrawingNo()+"-"+progProps.getProcessNo();
- }
-
- /**
- * 妫�鏌ユ枃浠跺悕鍚堟硶鎬�
- * @param filename 鏂囦欢鍚�
- * @param programProperties 绋嬪簭灞炴�э紝鍙戣捣鏃跺～鍐欑殑
- */
- void checkFilename(String filename,FlowProgramProperties programProperties){
- //绋嬪簭鍚嶇О锛氶浂浠跺彿鍔犲伐搴忓彿锛屾枃浠跺悕搴旇浠ユ寮�澶�
- String expectedProgramName = programProperties.getDrawingNo()+"-"+programProperties.getProcessNo();
- if(!StringUtils.startsWith(filename,expectedProgramName)){
-
- IResultCode rc = new IResultCode() {
- @Override
- public String getMessage() {
- return "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
- }
-
- @Override
- public int getCode() {
- return 1;
- }
- };
- throw new ServiceException(rc);
- //throw new ServiceException("绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕");
- }
-
- //鎴彇鍚庨潰鐨勬鏁板拰绗嚑娈�
- String endPart = StringUtils.removeStart(filename,expectedProgramName+"-"+programProperties.getCraftEdition()+"-");
-
- //鍘绘帀鎵╁睍鍚�
- 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 "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
- }
-
- @Override
- public int getCode() {
- return 2;
- }
- };
- throw new ServiceException(rc);
- //throw new ServiceException("绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕");
- }
-
- 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 鏂囦欢id
- * @return 鏂囦欢鍐呭鏂囨湰
- */
- public String getFileContent(Long id) {
- String result ="";
-
- ReplaceProgramFile programFile = this.getById(id);
- 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<ReplaceProgramFile> flowPrograms = this.lambdaQuery().eq(ReplaceProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(ReplaceProgramFile::getCreateTime).list();
- if(isPass && flowPrograms.isEmpty()){
- throw new ServiceException("璇蜂笂浼犵▼搴忔枃浠�");
- }
- int totalSeg = 0;
- if(!flowPrograms.isEmpty()){
- ReplaceProgramFile 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);
- }
public void deleteByTempId(Long tempId) {
this.baseMapper.deleteByTempId(tempId);
--
Gitblit v1.9.3