From 88748094ae17ca3b6423c54d307f0d5c40c8f420 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 14:44:13 +0800
Subject: [PATCH] 增加文件完整性校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 170 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 142 insertions(+), 28 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 3be54f8..085a2a3 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
@@ -11,18 +11,19 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.Map;
+import java.util.List;
/**
* 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
@@ -31,45 +32,119 @@
*/
@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;
+
public void uploadFlowProgramFile(ProgramUploadVO uploadVO) {
- Map<String, Object> vars = runtimeService.getVariables(uploadVO.getProcessInstanceId());
- checkFilenames(uploadVO.getFiles(),flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId()));
+ FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
+ MultipartFile file = uploadVO.getFile();
+ checkFilename(file.getOriginalFilename(),progProps);
+ String programName = getProgramName(progProps);
- //
- //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);
+ BladeFile bfile = ossTemplate.putFile(file);
- */
+ FlowProgramFile progFile = new FlowProgramFile();
+ progFile.setName(file.getOriginalFilename());
+ progFile.setOssName(bfile.getName());
+ progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
+
+ progFile.setProgramName(programName);
+
+ save(progFile);
+
}
- public void checkFilenames(MultipartFile[] files,FlowProgramProperties programProperties){
- for (MultipartFile file : files){
- checkFilename(file.getOriginalFilename(),programProperties);
- }
+ 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)){
- throw new ServiceException("绋嬪簭鏂囦欢鍚嶄笉鍚堟硶锛屽簲涓猴細"+expectedProgramName+"-"+programProperties.getCraftEdition()+"-[娈垫暟]-[娈靛彿].[鏂囦欢鎵╁睍鍚峕");
+
+ 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);
}
}
@@ -94,4 +169,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