程序包名增加版次

yangys

2025-09-10 dc01577b31204fd3c80645b45d81ff693f79a985

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

   /**