性能优化+bug调整

yangys

2025-09-15 7bc1d0f521c1d59246f29bcadcc4343f88ceef1c

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

@@ -1,7 +1,6 @@

package org.springblade.mdm.program.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,16 +10,15 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
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.*;
import org.springframework.web.bind.annotation.*;

import java.util.Comparator;
import java.util.List;

/**
@@ -35,7 +33,6 @@
@Tag(name = "程序节点", description = "程序节点")
@Slf4j
public class NcNodeController {
   private final NcProgramService ncProgramService;
   private final NcNodeService ncNodeService;
   private final ProgramFlowStatusQueryService programFlowStatusQueryService;
   private final FlowProgramFileService flowProgramFileService;
@@ -47,7 +44,7 @@
   @Operation(summary = "新增节点", description = "节点信息,id保持空")
   public R<Boolean> save(@RequestBody NcNodeVO vo) {
      ncNodeService.saveNcCode(vo);
      return R.<Boolean>status(true);
      return R.status(true);
   }


@@ -55,21 +52,21 @@
   @Operation(summary = "修改节点", description = "节点信息,必须传入ID")
   public R<Boolean> update(@RequestBody NcNodeVO vo) {
      ncNodeService.updateNcNode(vo);
      return R.<Boolean>status(true);
      return R.status(true);
   }

   @PostMapping("/remove")
   @Operation(summary = "删除节点")
   public R<Boolean> remove(Long id) {
      ncNodeService.removeById(id);
      return R.<Boolean>status(true);
      return R.status(true);
   }

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

   @GetMapping("/query-lock-remark")
@@ -93,6 +90,39 @@
            if(NcNode.TYPE_PROGRAM_PACKAGE.equals(ncNodeVO.getNodeType())){
               ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
            }
         }
         //文件，按照先程序，后其他排序
         if(list.get(0).getNodeType().equals(NcNode.TYPE_PROGRAM_FILE)){
            NcNode parentNode = ncNodeService.getById(parentId);
            //list.sort(Comparator.comparing().thenComparing(NcNodeVO::getName));
            Comparator<NcNodeVO> cp = new Comparator<NcNodeVO>() {
               @Override
               public int compare(NcNodeVO n1, NcNodeVO n2) {
                  if (n1.getName().startsWith(parentNode.getName()) && !n2.getName().startsWith(parentNode.getName())) {
                     return -1;
                  } else {
                     return 1;
                  }
               }
            };
            list.sort(cp.thenComparing(NcNodeVO::getName));
            /*
            list.sort((n1, n2) -> {

               if(n1.getName().startsWith(parentNode.getName())){
                  return 1;
               }else{
                  return n1.getName().compareTo(n2.getName());
               }

            });*/
            /*
            Collections.sort(userList, new Comparator<User>() {
               @Override
               public int compare(User u1, User u2) {
                  return u1.getName().compareTo(u2.getName());
               }
            });*/
         }
      }
      return R.data(list);
@@ -147,4 +177,20 @@

      return R.data(vo);
   }

   @GetMapping("/content-by-nodeid")
   @Operation(summary = "根据节点获取文件内容", description = "仅限文本格式的内容，二进制文件将返回空串")
   public R<String> fileContentByNodeId(@Parameter(description = "节点id") Long nodeId) {
      try {
         NcNode ncnode = ncNodeService.getById(nodeId);
         if(ncnode.getFlowProgramFileId() != null) {
            return R.data(flowProgramFileService.getFileContent(ncnode.getFlowProgramFileId()));
         }else{
            return R.data("找不到文件");
         }
      }catch(Exception e) {
         log.error("删除文件失败",e);
         return R.fail(e.getMessage());
      }
   }
}