增加审批界面任务车间的查询和显示

yangys

2025-08-10 8318e40770d53c87e2d5921d2d11f8de47c61e76

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

@@ -14,7 +14,10 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.ApproveRecordService;
@@ -25,12 +28,18 @@
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.system.feign.IDictClient;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dict;
import org.springframework.stereotype.Service;

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

@@ -44,37 +53,28 @@
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {

   private final NcProgramService progService;
   //private final NcProgramService progService;
   private final IDictClient dictClient;
   private final MachineService machineService;
   private final NcProgramApprovedService approvedService;
   private final ApproveRecordService approveRecordService;
   private final NcNodeService ncNodeService;
   private final OssTemplate ossTemplate;
   private final FlowProgramFileService flowProgramFileService;
   public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
   //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";

   /**
    * 是否压缩包内的数据文件
    * @param filename 文件名称
    * @return
    */
   public static boolean isDataFile(String filename){
      return StringUtils.equals(filename, PROGRAM_JSON_FILE) || StringUtils.equals(filename, NODE_JSON_FILE) || StringUtils.equals(filename, APPROVE_RECORD_JSON_FILE);
   }
   public static final String ANNOTATION_DICT = "machine_annotation";

   /**
    * 分页查询
    * @param query 查询参数
    * @return
    */
   public IPage<DncSendBackData> dncSendBackPageQuery(Query query) {

      IPage<DncSendBackData> page = this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);

      return page;

      return this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
   }


   /**
    * 导出dnc压缩包
@@ -88,14 +88,8 @@

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

            /*
            String filename = prog.getOssName();
            InputStream inputStream = ossTemplate.statFileStream(filename);

            addInputStreamToZip(zipOut, inputStream, prog.getName());
            */
            addProgramPackageToZip(zipOut,approved);
         }
         addDataJson(zipOut, programPackageNodeIdList);
@@ -116,33 +110,91 @@
      zipOut.putNextEntry(zipEntry);
      zipOut.closeEntry();

      List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId, approved.getNodeId()).list();
      List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId, approved.getNcNodeId()).list();

      FlowProgramFile programFile;
      NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
      String status = "未固化";
      if(programPackageNode.hasCured()){
         status = "已固化";
      }
      List<Dict> annotationList = getAnnotionList();
      for (NcNode node : programNodes) {
         String filePathInZip = packageFolder + node.getName();
         ZipEntry fileEntry = new ZipEntry(filePathInZip);

         zipOut.putNextEntry(fileEntry);
         programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());

         InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
         byte[] buffer = new byte[1024];
         int length;
         while ((length = inputStream.read(buffer)) >= 0) {
            zipOut.write(buffer, 0, length);
         }
         zipOut.closeEntry();
         Machine machine = machineService.getByCode(node.getMachineCode());
         InputStream addedIns1 = addSendDirAnnotation(inputStream,machine,annotationList);
         InputStream addedIns2 = addProgramStatusAnnotation(addedIns1,status,machine,annotationList);
         this.addInputStreamToZip(zipOut,addedIns2,filePathInZip);
      }

   }

   /**
    * 获取字典中配置的注释
    * @return 字典项列表
    */
   List<Dict> getAnnotionList(){
      List<Dict> annotationList;
      R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
      if(dictsResult.isSuccess()) {
         annotationList = dictsResult.getData();
      }else{
         annotationList = Collections.emptyList();
      }

      return annotationList;
   }
   /**
    * 加入机床下发路径和程序状态的注释
    * @param inputStream
    * @return
    */
   InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
      return FileContentUtil.insertLine(inputStream,1,generateAnnotation(machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList));
   }

   /**
    * 添加程序专改的注释
    * @param inputStream
    * @param status 程序状态
    * @param machine
    * @param annotationList 配置的注释字典列表
    * @return
    * @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 generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
      R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
      String annotation = oriTest;
      String begin = "(";
      String end = ")";

      Optional<Dict> dictOpt = dictsResult.getData().stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
      String annotationSetting = "(,)";
      if(dictOpt.isPresent()) {
         annotationSetting = dictOpt.get().getDictValue();
      }
      String[] arr = annotationSetting.split(",");
      if(arr.length == 2){
         begin = arr[0];
         end = arr[1];
      }

      annotation = begin + oriTest + end;
      return annotation;

   }
   /**
    * 导入数据文件
    * @param zipOut
    */
   void addDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
      //addProgramDataJson(zipOut, programPackageNodeIdList);
      addNodeDataJson(zipOut, programPackageNodeIdList);
      addApproveRecordDataJson(zipOut, programPackageNodeIdList);
   }
@@ -163,7 +215,7 @@
         allNodeIds.add(node.getId());
      }
      //加入程序包下级的程序节点
      List<NcNode> programNodes = ncNodeService.lambdaQuery().in(NcNode::getParentId, pkgNodes.stream().map(NcNode::getId)).list();
      List<NcNode> programNodes = ncNodeService.lambdaQuery().in(NcNode::getParentId, pkgNodes.stream().map(NcNode::getId).toList()).list();

      allNodeIds.addAll(programNodes.stream().map(NcNode::getId).toList());
      List<Long>  distinctIds = allNodeIds.stream().distinct().toList();
@@ -175,7 +227,7 @@
         addSuperProperties(recObj,node);
         jsonArray.add(recObj);
      }
      addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),PROGRAM_JSON_FILE);
      addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),NODE_JSON_FILE);

   }

@@ -209,10 +261,12 @@
    * @param programPackageNodeIdList 程序包名的id列表
    */
   void addApproveRecordDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
      List<String> instanceIds = this.ncNodeService.lambdaQuery().in(NcNode::getProcessInstanceId, programPackageNodeIdList)
      /*
      List<String> instanceIds = this.ncNodeService.lambdaQuery().in(NcNode::getId, programPackageNodeIdList)
         .list().stream().map(NcNode::getProcessInstanceId).toList();

      List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getProcessInstanceId, instanceIds).list();
*/
      //List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getProcessInstanceId, instanceIds).list();
      List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getNcNodeId, programPackageNodeIdList).list();

      JSONArray jsonArray = new JSONArray();
      for(ApproveRecord record : records){
@@ -244,7 +298,14 @@
      recObj.put("createDept",entity.getCreateDept());
   }

   public void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
   /**
    * 将 输入流 中的内容写入zip
    * @param zipOut zip输出流
    * @param inputStream 输入流
    * @param entryName 文件名
    * @throws IOException
    */
   void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
      throws IOException {
      // 创建新的 ZIP 条目
      ZipEntry zipEntry = new ZipEntry(entryName);