From 0ef4cc755bddd87799b8bfdd65c8123df6e149d0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 23:52:51 +0800
Subject: [PATCH] 锁定流程完成
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 79 ++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 46 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 3bdbf63..5200df1 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
@@ -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锛涙壘鍒颁簡闇�瑕佹煡璇㈡祦绋嬪疄渚媔d锛屾槸鍚﹁繍琛屼腑
- 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锛涙壘鍒颁簡闇�瑕佹煡璇㈡祦绋嬪疄渚媔d锛屾槸鍚﹁繍琛屼腑
- 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鐨勮妭鐐筰d)")@RequestParam Long id) {
+ return R.data(this.ncNodeService.historyByNodeId(id));
}
-*/
+
+ @GetMapping("/compare-content")
+ @Operation(summary = "瀵规瘮鍐呭鏁版嵁", description = "鏌ヨ瀵规瘮鍐呭鐨�2涓枃鏈暟鎹�")
+ public R<CompareDataVO> compareContent(@Parameter(description="鑺傜偣1鐨処D(nodeType=70鐨勮妭鐐筰d)")Long id1,@Parameter(description="鑺傜偣2鐨処D(nodeType=70鐨勮妭鐐筰d)")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);
+ }
}
--
Gitblit v1.9.3