修复dnc导出无header问题

yangys

2025-08-16 9c483e9be881783af14ad68906e78ee557005eb4

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

@@ -15,14 +15,13 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcNodeProgramVO;
import org.springblade.mdm.program.vo.NcNodeQueryVO;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;

import java.util.List;
@@ -42,6 +41,7 @@
   private final NcProgramService ncProgramService;
   private final NcNodeService ncNodeService;
   private final ProgramFlowStatusQueryService programFlowStatusQueryService;
   private final FlowProgramFileService flowProgramFileService;
   /**
    * 新增
    */
@@ -67,28 +67,23 @@
      return R.<Boolean>status(true);
   }

   @PostMapping("/lock")
   @Operation(summary = "锁定节点(程序包名)")
   public R<Boolean> lock(@Parameter(description="程序包名节点id)")Long id) {
      ncNodeService.lock(id);
      return R.<Boolean>status(true);
   }

   @GetMapping("/lazy-list")
   @Operation(summary = "懒加载列表", description = "程序目录树形结构")
   public R<List<NcNodeVO>> lazyList(Long parentId) {
      List<NcNodeVO> list = ncNodeService.lazyList(parentId);
      if(list != null && !list.isEmpty()) {
         for(NcNodeVO ncNodeVO : list) {
            if(!"70".equals(ncNodeVO.getNodeType())){
               break;
            }
            NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
            if(program != null) {
               ncNodeVO.setProcessEdition(program.getProcessEdition());
               ncNodeVO.setDrawingNo(program.getDrawingNo());
               ncNodeVO.setMachineCode(program.getMachineCode());
               ncNodeVO.setProcessName(program.getProcessName());
               ncNodeVO.setVersionNumber(program.getVersionNumber());

               //record中找不到时未启动0；找到了需要查询流程实例id，是否运行中
               ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(program.getId()));
            if(NcNode.TYPE_PROGRAM_PACKAGE.equals(ncNodeVO.getNodeType())){
               ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
            }
         }

      }
      return R.data(list);
   }
@@ -100,38 +95,30 @@
         return R.fail("请输入名称");
      }
      List<NcNodeVO> list = ncNodeService.searchList(queryVO);
      /*
      if(list != null && !list.isEmpty()) {
         for(NcNodeVO ncNodeVO : list) {
            if(!"70".equals(ncNodeVO.getNodeType())){
               break;
            }
            NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
            if(program != null) {
               ncNodeVO.setProcessEdition(program.getProcessEdition());
               ncNodeVO.setDrawingNo(program.getDrawingNo());
               ncNodeVO.setMachineCode(program.getMachineCode());
               ncNodeVO.setProcessName(program.getProcessName());
               ncNodeVO.setVersionNumber(program.getVersionNumber());

               //record中找不到时未启动0；找到了需要查询流程实例id，是否运行中
               ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(program.getId()));
            }
         }

      }

       */
      return R.data(list);
   }

   /*
   @Operation(summary = "程序分页查询", description = "用于在编制节点选择流程对应的程序")
   @GetMapping("/programpickpage")
   public R<IPage<NcNodeProgramVO>> page(NcNodeProgramQueryVO query) {
      IPage<NcNodeProgramVO> pages = ncNodeService.programPageQuery(query);
      return R.data(pages);
   @GetMapping("/history-by-nodeid")
   @Operation(summary = "根据绑定节点id获取历史列表", description = "程序历史列表，仅‘程序包’字典值70的数据。用于显示程序的‘历史版本’")
   public R<List<NcNodeVO>> historyByBindNodeId(@Parameter(description="节点ID(nodeType=70的节点id)")@RequestParam Long id) {
      return R.data(this.ncNodeService.historyByNodeId(id));
   }
*/


   @GetMapping("/compare-content")
   @Operation(summary = "对比内容数据", description = "查询对比内容的2个文本数据")
   public R<CompareDataVO> compareContent(@Parameter(description="节点1的ID(nodeType=70的节点id)")Long id1,@Parameter(description="节点2的ID(nodeType=70的节点id)")Long id2) {
      CompareDataVO vo = new CompareDataVO();
      NcNode node1 = ncNodeService.getById(id1);
      NcNode node2 = ncNodeService.getById(id2);
      if(node1.getFlowProgramFileId() != null) {
         vo.setContent1(flowProgramFileService.getFileContent(node1.getFlowProgramFileId()));
      }
      if(node2.getFlowProgramFileId() != null) {
         vo.setContent2(flowProgramFileService.getFileContent(node2.getFlowProgramFileId()));
      }

      return R.data(vo);
   }
}