分工表加入重复图号的校验

yangys

2025-08-04 95b1f7b2b35872444acf8e85cc236682d0c4e47e

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java

@@ -3,7 +3,6 @@

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.RuntimeService;
@@ -12,14 +11,10 @@
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.ResultCode;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.NumberUtil;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.mapper.FlowProgramFileMapper;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -28,7 +23,6 @@
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;

/**
 * 流程程序处理，包括上传，查询展示
@@ -45,57 +39,44 @@
   @Autowired
   private FlowCommonService flowCommonService;

   /**
    * 上传程序徐文件（编制节点调用）
    * @param uploadVO 上传对象
    */
   public void uploadFlowProgramFile(ProgramUploadVO uploadVO) {

      //Map<String, Object> vars = runtimeService.getVariables(uploadVO.getProcessInstanceId());

      FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
      checkFilenames(uploadVO.getFiles(),progProps);
      MultipartFile file = uploadVO.getFile();
      checkFilename(file.getOriginalFilename(),progProps);

      String programName = getProgramName(progProps);
      for(MultipartFile file : uploadVO.getFiles()) {
         BladeFile bfile = ossTemplate.putFile(file);

         FlowProgramFile progFile = new FlowProgramFile();
         progFile.setName(file.getOriginalFilename());
         progFile.setOssName(bfile.getName());
         progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
      BladeFile bfile = ossTemplate.putFile(file);

         progFile.setProgramName(programName);
      FlowProgramFile progFile = new FlowProgramFile();
      progFile.setName(file.getOriginalFilename());
      progFile.setOssName(bfile.getName());
      progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
      progFile.setIsCured(0);
      progFile.setProgramName(programName);

         save(progFile);
      }
      //
      //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);
      save(progFile);

       */
   }

   /**
    * 获取程序名称
    * @param progProps
    * @return
    */
   String getProgramName(FlowProgramProperties progProps){
      return progProps.getDrawingNo()+"-"+progProps.getProcessNo();
   }

   public void checkFilenames(MultipartFile[] files,FlowProgramProperties programProperties){
      for (MultipartFile file : files){
         checkFilename(file.getOriginalFilename(),programProperties);
      }
   }

   /**
    * 检查文件名合法性
    * @param filename
    * @param programProperties
    * @param filename 文件名
    * @param programProperties 程序属性，发起时填写的
    */
   void checkFilename(String filename,FlowProgramProperties programProperties){
      //程序名称：零件号加工序号，文件名应该以此开头
@@ -197,5 +178,43 @@
      return result;
   }

   /**
    * 验证程序文件的完整性，仅在编制节点使用
    * @param processInstanceId 流程实例id
    */
   public void checkProgramFiles(String processInstanceId,boolean isPass) {
      List<FlowProgramFile> flowPrograms = this.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list();
      if(isPass && flowPrograms.isEmpty()){
         throw new ServiceException("请上传程序文件");
      }
      int totalSeg = 0;
      if(!flowPrograms.isEmpty()){
         FlowProgramFile progFile = flowPrograms.get(0);
         totalSeg = getProgramSegCount(progFile.getName());
      }

      if(totalSeg != flowPrograms.size()){
         throw new ServiceException("应上传"+totalSeg+"段程序，实际上传"+flowPrograms.size()+"段");
      }


   }

   /**
    * 根据文件名获取程序总段树
    * @param filename 文件名
    * @return
    */
   int getProgramSegCount(String filename){
      int idx = filename.lastIndexOf(".");
      String tempstr = filename.substring(0,idx);//去掉扩展名
      //System.out.println(tempstr);
      idx = tempstr.lastIndexOf("-");
      tempstr = tempstr.substring(0,idx);
      //System.out.println(tempstr);
      idx = tempstr.lastIndexOf("-");
      tempstr = tempstr.substring(idx+1);
      //System.out.println(tempstr);
      return Func.toInt(tempstr);
   }
}