mes接口调整

yangys

2025-09-10 143e74027f8b68fb7fa4dcd0026ccfa1e0e16788

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

@@ -28,25 +28,21 @@
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;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
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.service.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;
@@ -58,7 +54,6 @@
import java.io.File;
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;
@@ -87,38 +82,6 @@
   public List<NcProgram> getCuredNcProgram(String drwaingNo,String machineCode) {
      Machine machine = machineService.getByCode(machineCode);
      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);
   }

   /**
@@ -176,50 +139,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
@@ -328,11 +248,58 @@
    * @param name 程序名称
    * @return
    */
   public NcProgram getByName(String name) {LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
   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();
   }*/
}