增加程序文件列表

yangys

2025-06-29 4272f2232fd97d9862bc53e583612c8a4bf82ee4

 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;
   }
}