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 | 74 +++++++++++++++----------------------
1 files changed, 30 insertions(+), 44 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 6ee3346..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
@@ -15,6 +15,9 @@
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.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;
@@ -47,9 +50,12 @@
FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
MultipartFile file = uploadVO.getFile();
- checkFilename(file.getOriginalFilename(),progProps);
+ if(file.getSize() == 0){
+ throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
+ }
+ ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
- String programName = getProgramName(progProps);
+ String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo());
BladeFile bfile = ossTemplate.putFile(file);
@@ -57,36 +63,28 @@
progFile.setName(file.getOriginalFilename());
progFile.setOssName(bfile.getName());
progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
- progFile.setIsCured(0);
progFile.setProgramName(programName);
-
+ progFile.setFileType(uploadVO.getFileType());
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)){
+ String programNamePrefix = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo()) + "-"+programProperties.getProcessEdition();
+ if(!StringUtils.startsWith(filename,programNamePrefix)){
IResultCode rc = new IResultCode() {
@Override
public String getMessage() {
- return "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
+ return "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+programNamePrefix+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
}
@Override
@@ -95,11 +93,10 @@
}
};
throw new ServiceException(rc);
- //throw new ServiceException("绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕");
}
//鎴彇鍚庨潰鐨勬鏁板拰绗嚑娈�
- String endPart = StringUtils.removeStart(filename,expectedProgramName+"-"+programProperties.getCraftEdition()+"-");
+ String endPart = StringUtils.removeStart(filename,programNamePrefix+"-");
//鍘绘帀鎵╁睍鍚�
if(endPart.contains(".")){
@@ -111,7 +108,7 @@
IResultCode rc = new IResultCode() {
@Override
public String getMessage() {
- return "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
+ return "绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+programNamePrefix+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕";
}
@Override
@@ -120,7 +117,6 @@
}
};
throw new ServiceException(rc);
- //throw new ServiceException("绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕");
}
String[] arr = StringUtils.split(endPart,"-");
@@ -155,26 +151,32 @@
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;
}
@@ -190,7 +192,7 @@
int totalSeg = 0;
if(!flowPrograms.isEmpty()){
FlowProgramFile progFile = flowPrograms.get(0);
- totalSeg = getProgramSegCount(progFile.getName());
+ totalSeg = ProgramFileNameCheckUtil.getProgramSegCount(progFile.getName());
}
if(totalSeg != flowPrograms.size()){
@@ -200,21 +202,5 @@
}
- /**
- * 鏍规嵁鏂囦欢鍚嶈幏鍙栫▼搴忔�绘鏍�
- * @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