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/program/service/NcProgramService.java | 61 +++++++++---------------------
1 files changed, 18 insertions(+), 43 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 4c76756..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
@@ -364,4 +321,22 @@
return this.count(wrapper)>0;
}
+
+ /**
+ * 鏄剧ず绋嬪簭鐨勫巻鍙茶褰曞垪琛�
+ * @param bindNodeId
+ * @return
+ */
+ /*
+ public List<NcProgramVO> historyByBindNode(Long bindNodeId) {
+
+ NcProgram program = this.getByBindNodeId(bindNodeId);
+ List<NcProgram> list = this.lambdaQuery().eq(NcProgram::getName,program.getName())
+ .eq(NcProgram::getNcNodeId,program.getNcNodeId()).orderByDesc(NcProgram::getCreateTime).list();
+
+ return list.stream().map(p -> {
+ NcProgramVO vo = new NcProgramVO();
+ BeanUtils.copyProperties(p,vo);
+ return vo;}).toList();
+ }*/
}
--
Gitblit v1.9.3