dnc导出补充字段

yangys

2025-07-07 4301ffcfa7d715d7341cb77ba29dee24366fb2a3

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java

@@ -25,6 +25,8 @@
 */
package org.springblade.mdm.program.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
@@ -32,6 +34,7 @@
import org.apache.commons.io.IOUtils;
import org.flowable.engine.*;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.mdm.basesetting.machine.MachineService;
@@ -42,6 +45,7 @@
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.mapper.ProgramSeqMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
import org.springblade.mdm.utils.FileContentUtil;
@@ -90,7 +94,6 @@
    */
   public void uploadProgramFile(NcProgramUploadVO uploadVO) {


      MultipartFile file = uploadVO.getFile();
      BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
      String link = bfile.getLink();
@@ -116,6 +119,49 @@
      this.save(prog);
   }

   /**
    * 上传程序文件到指定节点
    * @param uploadVO 上传文件表单数据
    */
   public void uploadProgramFileNew(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.setPartNo(uploadVO.getPartNo());
      prog.setProcessEdition(uploadVO.getProcessEdition());
      prog.setIsLastEdition(1);
      prog.setMachineCode(uploadVO.getMachineCode());
      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());

      NcNode node = new NcNode();
      node.setNodeType("70");//文件节点
      node.setName(prog.getName());
      node.setMachineCode(uploadVO.getMachineCode());
      node.setParentId(uploadVO.getNodeId());
      node.setPartNo(uploadVO.getPartNo());
      node.setProcessName(uploadVO.getProcessName());

      nodeService.save(node);

      prog.setBindNcNodeId(node.getId());
      this.save(prog);
   }

   String generageCode(){
      ProgramSeq program = new ProgramSeq();
      seqMapper.insert(program);
@@ -125,17 +171,45 @@
   }
   /**
    * 删除一个程序
    * @param id
    * @param id 程序id
    */
   public String getFileContent(Long id) {
      String result  ="";

      NcProgram prog = this.getById(id);
      String fileName = prog.getOssName();
      try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
         result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
      } catch (IOException e) {
         throw new RuntimeException(e);
      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;
   }
@@ -183,4 +257,13 @@

      this.save(newVerProg);
   }

   /**
    * 分页查询，用于审批时选择程序
    * @param query
    * @return
    */
   public IPage<NcProgramVO> pageQuery(NcNodeProgramQueryVO query) {
      return this.getBaseMapper().pageQuery(Condition.getPage(query),query);
   }
}