From fcee672452c02cc29e0e17ebc27a8c51698c6d0d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 17:28:44 +0800
Subject: [PATCH] 优化程序注释
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 67 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 2a2c008..c252cb1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -4,20 +4,26 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
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.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.rmi.ServerError;
+import java.util.Comparator;
import java.util.List;
/**
@@ -33,6 +39,7 @@
@Slf4j
public class NcNodeController {
private final NcNodeService ncNodeService;
+ private final NcNodeHisService nodeHisService;
private final ProgramFlowStatusQueryService programFlowStatusQueryService;
private final FlowProgramFileService flowProgramFileService;
private final TaskDispatchService taskDispatchService;
@@ -90,6 +97,39 @@
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);
}
@@ -120,13 +160,14 @@
public R<List<String>> drawingNoPick(String drawingNo) {
return R.data(taskDispatchService.drawingNoSeletDropList(drawingNo));
}
+/*
@GetMapping("/history-by-nodeid")
- @Operation(summary = "鏍规嵁缁戝畾鑺傜偣id鑾峰彇鍘嗗彶鍒楄〃", description = "绋嬪簭鍘嗗彶鍒楄〃锛屼粎鈥樼▼搴忓寘鈥欏瓧鍏稿��70鐨勬暟鎹�傜敤浜庢樉绀虹▼搴忕殑鈥樺巻鍙茬増鏈��")
- public R<List<NcNodeVO>> historyByBindNodeId(@Parameter(description="鑺傜偣ID(nodeType=70鐨勮妭鐐筰d)")@RequestParam Long id) {
- return R.data(this.ncNodeService.historyByNodeId(id));
+ @Operation(summary = "鏍规嵁缁戝畾鑺傜偣id鑾峰彇鍘嗗彶鍒楄〃", description = "绋嬪簭鍘嗗彶鍒楄〃锛屼粎鈥樼▼搴忓寘鈥欏瓧鍏稿��60鐨勬暟鎹�傜敤浜庢樉绀虹▼搴忕殑鈥樺巻鍙茬増鏈��")
+ public R<List<NcNodeVO>> historyByBindNodeId(@Parameter(description="鑺傜偣ID(nodeType=60鐨勮妭鐐筰d)")@RequestParam Long id) {
+ return R.data(this.nodeHisService.historyByNodeId(id));
}
-
+*/
@GetMapping("/compare-content")
@Operation(summary = "瀵规瘮鍐呭鏁版嵁", description = "鏌ヨ瀵规瘮鍐呭鐨�2涓枃鏈暟鎹�")
@@ -144,19 +185,7 @@
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());
- }
- }
+
+
+
}
--
Gitblit v1.9.3