From 4272f2232fd97d9862bc53e583612c8a4bf82ee4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 29 六月 2025 22:56:33 +0800
Subject: [PATCH] 增加程序文件列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 b8a8a03..3429974 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
@@ -25,6 +25,7 @@
*/
package org.springblade.mdm.program.service;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -35,10 +36,14 @@
import org.springblade.core.oss.model.BladeFile;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.mapper.NcProgramMapper;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.vo.DncSendBackData;
+import org.springblade.mdm.program.vo.NcProgramUploadVO;
+import org.springblade.mdm.program.vo.NcProgramVO;
import org.springblade.mdm.utils.FileContentUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -61,6 +66,7 @@
private final MachineService machineService;
private final OssTemplate ossTemplate;
+ private final NcNodeService nodeService;
/**
* 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
* @param partNo
@@ -79,14 +85,16 @@
* @param nodeId
* @param category 鏂囦欢鍒嗙被锛堢▼搴忔枃浠�/鍏朵粬鏂囦欢锛�
*/
- public void uploadProgramFile(MultipartFile file, Long nodeId, String category) {
- BladeFile bfile = ossTemplate.putFile(file);
+ 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.setName(file.getOriginalFilename());
- prog.setNcNodeId(nodeId);
+ prog.setNcNodeId(uploadVO.getNodeId());
prog.setOssName(bfile.getName());
+ prog.setDrawingNo(uploadVO.getDrawingNo());
boolean isTextFile = false;
try {
isTextFile = FileContentUtil.isTextFile(file.getInputStream());
@@ -95,7 +103,7 @@
}
prog.setIsTextFile(isTextFile);
prog.setUrl(link);
- prog.setCategory(category);
+ prog.setCategory(uploadVO.getCategory());
this.save(prog);
}
@@ -125,4 +133,20 @@
ossTemplate.removeFile(prog.getOssName());
this.getBaseMapper().deleteById(id);
}
+
+ public List<NcProgramVO> listByNode(Long nodeId) {
+ NcNode node = nodeService.getById(nodeId);
+ List<NcProgram> pList = this.list(Wrappers.lambdaQuery(NcProgram.class).eq(NcProgram::getNcNodeId, nodeId).orderByDesc(NcProgram::getCreateTime));
+
+ List<NcProgramVO> result = new ArrayList<>();
+
+ pList.forEach(prog -> {
+ NcProgramVO vo = new NcProgramVO();
+ BeanUtils.copyProperties(prog, vo);
+ vo.setMachineCode(node.getMachineCode());
+ result.add(vo);
+ });
+
+ return result;
+ }
}
--
Gitblit v1.9.3