From 4f91b953e8f0ae7c63aea01a57367b6b57639a7f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 05 八月 2025 10:58:52 +0800
Subject: [PATCH] 清除无用的显示ncprogram的内容代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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..1b8062a 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,7 @@
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.utils.FileContentUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -47,6 +48,9 @@
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);
@@ -158,23 +162,29 @@
/**
* 鑾峰彇鏂囦欢鍐呭
- * @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;
}
--
Gitblit v1.9.3