上传接口调整

yangys

3 天以前 d9919b8e236113a1451082943ce889a6eb1f9495

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

@@ -159,6 +159,10 @@
      node.setDrawingNo(uploadVO.getDrawingNo());
      node.setProcessName(uploadVO.getProcessName());

      NcNode parentNode = nodeService.getById(uploadVO.getNodeId());
      node.setParentIds(parentNode.getParentIds()+","+uploadVO.getNodeId());
      //uploadVO.getre
      //node.setDescription(uploadVO.getDrawingNo());
      nodeService.save(node);

      prog.setBindNcNodeId(node.getId());
@@ -282,7 +286,8 @@
      wrapper.eq(NcProgram::getBindNcNodeId, bindNcNodeId);
      wrapper.eq(NcProgram::getIsLastEdition,1);
      NcProgram prog = this.getOne(wrapper);
      String filePath = prog.getName();

      String filePath = getFilePath(prog);
      try(InputStream ins = ossTemplate.statFileStream(prog.getOssName());){
         File targetFile = new File(filePath);
         FileUtils.copyInputStreamToFile(ins, targetFile);
@@ -317,4 +322,63 @@

      return progOpt.orElse(null);
   }

   /**
    * 根据程序名称获取最新的程序数据
    * @param name 程序名称
    * @return
    */
   public NcProgram getByName(String name) {
      LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
      wrapper.eq(NcProgram::getName, name);
      wrapper.eq(NcProgram::getIsLastEdition,1);
      Optional<NcProgram> progOpt = this.getOneOpt(wrapper);

      return progOpt.orElse(null);
   }

   /**
    *
    * @param nodeId 上级节点id
    * @param name 程序名称
    */
   public boolean programExistsUnderNode(Long nodeId, String name) {
      LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
      wrapper.eq(nodeId!=null,NcProgram::getNcNodeId, nodeId);
      wrapper.eq(NcProgram::getName, name);
      wrapper.eq(NcProgram::getIsLastEdition,1);

      return this.count(wrapper)>0;
   }

   /**
    *
    * @param nodeId 上级节点id
    * @param name 程序名称
    */
   public boolean programExistsUnderOtherNode(Long nodeId, String name) {
      LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
      wrapper.ne(NcProgram::getNcNodeId, nodeId);
      wrapper.eq(NcProgram::getName, name);
      wrapper.eq(NcProgram::getIsLastEdition,1);

      return this.count(wrapper)>0;
   }

   /**
    * 显示程序的历史记录列表
    * @param bindNodeId
    * @return
    */
   public List<NcProgramVO> historyByBindNode(Long bindNodeId) {

      NcProgram program = this.getByBindNodeId(bindNodeId);
      List<NcProgram> list = this.lambdaQuery().eq(NcProgram::getName,program.getName())
         .eq(NcProgram::getNcNodeId,program.getNcNodeId()).orderByDesc(NcProgram::getCreateTime).list();

      return list.stream().map(p -> {
         NcProgramVO vo = new NcProgramVO();
         BeanUtils.copyProperties(p,vo);
         return vo;}).toList();
   }
}