From 6b7db6b11ebcc2e8e1eff86443e77fe63e5d8080 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 21:38:52 +0800
Subject: [PATCH] 优化程序名解析
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 f329e43..e2c00c0 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
@@ -12,8 +12,10 @@
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.UrlUtil;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.mapper.FlowProgramFileMapper;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
@@ -56,6 +58,10 @@
if(file.getSize() == 0){
throw new ServiceException("绋嬪簭鏂囦欢涓嶅彲涓虹┖鏂囦欢");
}
+ if(exists(file.getOriginalFilename(),uploadVO.getProcessInstanceId())){
+ throw new ServiceException("鍚屽悕鏂囦欢宸插瓨鍦細"+file.getOriginalFilename());
+ }
+
if(FlowProgramFile.TYPE_PROGRAM.equals(uploadVO.getFileType())) {
ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(), progProps);
}
@@ -66,13 +72,21 @@
progFile.setName(file.getOriginalFilename());
progFile.setOssName(bfile.getName());
progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
- progFile.setProgramName(NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo()));
+ progFile.setProgramName(NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo(),progProps.getProcessEdition()));
progFile.setFileType(uploadVO.getFileType());
save(progFile);
}
-
+ /**
+ * 鍒ゆ柇閭ｆ祦绋嬩笅鏄惁鏈夊悓鍚嶉棶棰�
+ * @param filename 鏂囦欢鍚�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return 鏄惁
+ */
+ boolean exists(String filename,String processInstanceId){
+ return lambdaQuery().eq(FlowProgramFile::getName, filename).eq(FlowProgramFile::getProcessInstanceId, processInstanceId).count()>0;
+ }
/**
* 鑾峰彇鏂囦欢鍐呭
* @param id 鏂囦欢id
@@ -86,9 +100,12 @@
String fileName = programFile.getOssName();
try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
ByteArrayInputStream bos = new ByteArrayInputStream(inputStream.readAllBytes());
- boolean isText= FileContentUtil.isTextFile(bos);
+ boolean isText = StringUtils.endsWithIgnoreCase(fileName,".txt") || StringUtils.endsWithIgnoreCase(fileName,".nc")|| StringUtils.endsWithIgnoreCase(fileName,".xml");
+ if(!isText){
+ isText= FileContentUtil.isTextFile(bos);
+ }
if(isText){
- bos.reset();
+ bos.reset();
result = FileContentUtil.getContentFromStream(bos);
}else{
result = "<闈炴枃鏈枃浠�>";
@@ -125,10 +142,20 @@
public void download(Long id, HttpServletResponse response) throws IOException {
FlowProgramFile flowFile = this.getById(id);
- response.setHeader("Content-Disposition", "attachment; filename="+flowFile.getName());
+ response.setHeader("Content-Disposition", "attachment; filename="+ UrlUtil.encode(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