固化流程

yangys

2025-08-14 a049dda2f63d59f5092994b44387fe0aa889d375

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

@@ -58,9 +58,10 @@
   private final NcNodeService ncNodeService;
   private final OssTemplate ossTemplate;
   private final FlowProgramFileService flowProgramFileService;
   private final ProgramAnnotationService programAnnotationService;
   //public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
   public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
   public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";
   //public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
   //public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";

   public static final String ANNOTATION_DICT = "machine_annotation";

@@ -75,20 +76,24 @@

   /**
    * 导出dnc压缩包
    * @param approvedIdArr 待导出审批表id数组
    * @param approvedIdArray 待导出审批表id数组
    */
   public void exportDnc(Long[] approvedIdArr, OutputStream os) throws IOException {
   public void exportDnc(Long[] approvedIdArray, OutputStream os) throws IOException {
      //FileOutputStream fos = new FileOutputStream("d:/exportDnc.zip");
      try (ZipOutputStream zipOut = new ZipOutputStream(os);) {//os

         ArrayList<Long> programPackageNodeIdList = new ArrayList<Long>();
         //ArrayList<Long> programPackageNodeIdList = new ArrayList<Long>();

         for (Long approvedId : approvedIdArr) {
         for (Long approvedId : approvedIdArray) {
            NcProgramApproved approved = approvedService.getById(approvedId);
            programPackageNodeIdList.add(approved.getNcNodeId());
            //programPackageNodeIdList.add(approved.getNcNodeId());

            addProgramPackageToZip(zipOut,approved);
         }

         //状态修改为已导出
         approvedService.lambdaUpdate().in(NcProgramApproved::getId, approvedIdArray)
            .set(NcProgramApproved::getStatus,NcProgramApproved.STATUS_EXPORTED).update();
         //addDataJson(zipOut, programPackageNodeIdList);
      }

@@ -117,7 +122,7 @@
      }else if(programPackageNode.hasCured()){
         status = "GH";
      }
      List<Dict> annotationList = getAnnotionList();
      List<Dict> annotationList = programAnnotationService.getAnnotionList();
      for (NcNode node : programNodes) {
         String filePathInZip = packageFolder + node.getName();
         programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
@@ -153,7 +158,7 @@
    */
   InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
      //检测第二行是否是路径
      String annotationText = generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
      String annotationText = programAnnotationService.generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);

      //TODO 改判断行内容
      return FileContentUtil.insertLine(inputStream,1,annotationText);
@@ -169,9 +174,25 @@
    * @throws IOException
    */
   InputStream addProgramStatusAnnotation(InputStream inputStream,String status,Machine machine,List<Dict> annotationList) throws IOException {
      return FileContentUtil.insertLine(inputStream,2,generateAnnotation(status,machine.getMachineGroupCode(),annotationList));
      String annoText= programAnnotationService.generateAnnotation(status,machine.getMachineGroupCode(),annotationList);

      return FileContentUtil.insertLine(inputStream,2,annoText);
   }

   /**
    * 判断一行文本是否是注释
    * @param line
    * @param annotationList
    * @return
    */
   boolean isAnnotation(String line,List<Dict> annotationList){
      boolean isAnno = false;

      return isAnno;
   }



   String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
      R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
      String annotation = oriTest;