From 9810791a41d381a10451f3e9770cfcfedf98e886 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 00:39:34 +0800
Subject: [PATCH] 增加首页搜索接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 139 +++++++++++++++++++++-------------------------
1 files changed, 64 insertions(+), 75 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 fa5f0de..c105bf8 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
@@ -89,38 +89,6 @@
return this.getBaseMapper().getCuredNcProgram(drwaingNo,machine.getMachineGroupCode());
}
-
- /**
- * 涓婁紶绋嬪簭鏂囦欢鍒版寚瀹氳妭鐐�
- * @param uploadVO 涓婁紶鏂囦欢琛ㄥ崟鏁版嵁
- */
- public void uploadProgramFile(NcProgramUploadVO uploadVO) {
-
- MultipartFile file = uploadVO.getFile();
- BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
- String link = bfile.getLink();
- //淇濆瓨profame
- NcProgram prog = new NcProgram();
- prog.setCode(generageCode());
- prog.setName(file.getOriginalFilename());
- prog.setNcNodeId(uploadVO.getNodeId());
- prog.setOssName(bfile.getName());
- prog.setDrawingNo(uploadVO.getDrawingNo());
- prog.setProcessEdition(uploadVO.getProcessEdition());
- prog.setIsLastEdition(1);
- boolean isTextFile = false;
- try {
- isTextFile = FileContentUtil.isTextFile(file.getInputStream());
- } catch (IOException e) {
- log.warn("鍒ゆ柇鏄惁鏂囨湰鏂囦欢寮傚父",e);
- }
- prog.setIsTextFile(isTextFile);
- prog.setUrl(link);
- prog.setCategory(uploadVO.getCategory());
-
- this.save(prog);
- }
-
/**
* 涓婁紶绋嬪簭鏂囦欢鍒版寚瀹氳妭鐐�
* @param uploadVO 涓婁紶鏂囦欢琛ㄥ崟鏁版嵁
@@ -159,6 +127,10 @@
node.setDrawingNo(uploadVO.getDrawingNo());
node.setProcessName(uploadVO.getProcessName());
+ NcNode parentNode = nodeService.getById(uploadVO.getNodeId());
+ node.setParentIds(parentNode.getParentIds()+","+uploadVO.getNodeId());
+ //uploadVO.getre
+ //node.setDescription(uploadVO.getDrawingNo());
nodeService.save(node);
prog.setBindNcNodeId(node.getId());
@@ -172,50 +144,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
@@ -318,4 +247,64 @@
return progOpt.orElse(null);
}
+
+ /**
+ * 鏍规嵁绋嬪簭鍚嶇О鑾峰彇鏈�鏂扮殑绋嬪簭鏁版嵁
+ * @param name 绋嬪簭鍚嶇О
+ * @return
+ */
+ public NcProgram getByName(String name) {
+ LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(NcProgram::getName, name);
+ wrapper.eq(NcProgram::getIsLastEdition,1);
+ Optional<NcProgram> progOpt = this.getOneOpt(wrapper);
+
+ return progOpt.orElse(null);
+ }
+
+ /**
+ *
+ * @param nodeId 涓婄骇鑺傜偣id
+ * @param name 绋嬪簭鍚嶇О
+ */
+ public boolean programExistsUnderNode(Long nodeId, String name) {
+ LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(nodeId!=null,NcProgram::getNcNodeId, nodeId);
+ wrapper.eq(NcProgram::getName, name);
+ wrapper.eq(NcProgram::getIsLastEdition,1);
+
+ return this.count(wrapper)>0;
+ }
+
+ /**
+ *
+ * @param nodeId 涓婄骇鑺傜偣id
+ * @param name 绋嬪簭鍚嶇О
+ */
+ public boolean programExistsUnderOtherNode(Long nodeId, String name) {
+ LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
+ wrapper.ne(NcProgram::getNcNodeId, nodeId);
+ wrapper.eq(NcProgram::getName, name);
+ wrapper.eq(NcProgram::getIsLastEdition,1);
+
+ 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