From c32ee236fe0ae2f2c27503138160e93c2319bc56 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 14:54:04 +0800
Subject: [PATCH] 调整回传文件查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 46 ++--------------------------------------------
1 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index eb4769a..d723e44 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -176,50 +176,7 @@
DecimalFormat df = new DecimalFormat("0000000000");
return df.format(program.getId());
}
- /**
- * 鍒犻櫎涓�涓▼搴�
- * @param id 绋嬪簭id
- */
- public String getFileContent(Long id) {
- String result ="";
- NcProgram prog = this.getById(id);
- if(prog.getIsTextFile()!=null && prog.getIsTextFile()){
- String fileName = prog.getOssName();
- try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
- result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }else{
- result = "闈炴枃鏈牸寮忔枃浠�";
- }
- return result;
- }
-
- /**
- * 鑾峰彇鏂囦欢鍐呴タ鍝﹂偅涓�
- * @param ncNodeId 鑺傜偣id
- */
- public String getFileContentByNodeId(Long ncNodeId) {
- String result ="";
- NcNode node = this.nodeService.getById(ncNodeId);
- LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(NcProgram::getBindNcNodeId, ncNodeId);
- wrapper.eq(NcProgram::getIsLastEdition,1);
- NcProgram prog = this.getOne(wrapper);
- if(prog.getIsTextFile()!=null && prog.getIsTextFile()){
- String fileName = prog.getOssName();
- try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
- result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }else{
- result = "闈炴枃鏈牸寮忔枃浠�";
- }
- return result;
- }
/**
* 鍒犻櫎涓�涓▼搴�
* @param id
@@ -370,6 +327,7 @@
* @param bindNodeId
* @return
*/
+ /*
public List<NcProgramVO> historyByBindNode(Long bindNodeId) {
NcProgram program = this.getByBindNodeId(bindNodeId);
@@ -380,5 +338,5 @@
NcProgramVO vo = new NcProgramVO();
BeanUtils.copyProperties(p,vo);
return vo;}).toList();
- }
+ }*/
}
--
Gitblit v1.9.3