From b7af95d487f49490de16f9636147e5a40911e157 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 23:36:48 +0800
Subject: [PATCH] 确认表增加程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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..aa2ce55 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
@@ -56,6 +56,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);
}
@@ -72,7 +76,15 @@
}
-
+ /**
+ * 鍒ゆ柇閭ｆ祦绋嬩笅鏄惁鏈夊悓鍚嶉棶棰�
+ * @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 +98,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 = "<闈炴枃鏈枃浠�>";
@@ -131,4 +146,14 @@
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