庆安mdm
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yangys
2025-06-30 813f0f6d391b7f24682204c22c059ef69b124fa6 
 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.metadata.IPage;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.fasterxml.jackson.databind.ObjectMapper;


import lombok.AllArgsConstructor;


@@ -32,14 +33,18 @@


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;


import org.springblade.mdm.basesetting.machine.entity.Machine;


import org.springblade.mdm.program.entity.NcNode;


import org.springblade.mdm.program.entity.ProgramSeq;


import org.springblade.mdm.program.mapper.NcProgramMapper;


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;


@@ -50,6 +55,7 @@


import java.io.IOException;


import java.io.InputStream;


import java.nio.charset.StandardCharsets;


import java.text.DecimalFormat;


import java.util.ArrayList;


import java.util.List;




@@ -67,6 +73,8 @@




   private final OssTemplate ossTemplate;


   private final NcNodeService nodeService;




   private final ProgramSeqMapper seqMapper;


   /**


    * 查询现有固化的程序，暂定条件：零组件号相同，且是同一机床组


    * @param partNo


@@ -84,16 +92,20 @@


    * @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.setPartNo(uploadVO.getPartNo());


      prog.setProcessEdition(uploadVO.getProcessEdition());


      prog.setIsLastEdition(1);


      boolean isTextFile = false;


      try {


         isTextFile = FileContentUtil.isTextFile(file.getInputStream());


@@ -107,6 +119,13 @@


      this.save(prog);


   }




   String generageCode(){


      ProgramSeq program = new ProgramSeq();


      seqMapper.insert(program);




      DecimalFormat df = new DecimalFormat("0000000000");


      return df.format(program.getId());


   }


   /**


    * 删除一个程序


    * @param id


@@ -167,4 +186,13 @@




      this.save(newVerProg);


   }




   /**


    * 分页查询，用于审批时选择程序


    * @param query


    * @return


    */


   public IPage<NcProgramVO> pageQuery(NcNodeProgramQueryVO query) {


      return this.getBaseMapper().pageQuery(Condition.getPage(query),query);


   }


}