From d0c09d34e35145f6b55dbd3a6bee1f148b4fdc5b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 05 八月 2025 11:29:48 +0800
Subject: [PATCH] 修改节点历史查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 95 insertions(+), 8 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 df7d3da..689e054 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
@@ -1,15 +1,30 @@
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.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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.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.vo.NcNodeVO;
+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.List;
/**
* 绋嬪簭鑺傜偣
@@ -23,26 +38,25 @@
@Tag(name = "绋嬪簭鑺傜偣", description = "绋嬪簭鑺傜偣")
@Slf4j
public class NcNodeController {
-
+ private final NcProgramService ncProgramService;
private final NcNodeService ncNodeService;
-
+ private final ProgramFlowStatusQueryService programFlowStatusQueryService;
+ private final FlowProgramFileService flowProgramFileService;
/**
* 鏂板
*/
@PostMapping("/save")
- @Operation(summary = "鏂板鑺傜偣", description = "鑺傜偣淇℃伅")
+ @Operation(summary = "鏂板鑺傜偣", description = "鑺傜偣淇℃伅,id淇濇寔绌�")
public R<Boolean> save(@RequestBody NcNodeVO vo) {
-
ncNodeService.saveNcCode(vo);
return R.<Boolean>status(true);
}
@PostMapping("/update")
- @Operation(summary = "淇敼鑺傜偣")
+ @Operation(summary = "淇敼鑺傜偣", description = "鑺傜偣淇℃伅,蹇呴』浼犲叆ID")
public R<Boolean> update(@RequestBody NcNodeVO vo) {
-
- ncNodeService.updateNcCode(vo);
+ ncNodeService.updateNcNode(vo);
return R.<Boolean>status(true);
}
@@ -52,4 +66,77 @@
ncNodeService.removeById(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(!"60".equals(ncNodeVO.getNodeType())){
+ break;
+ }
+ ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
+
+ }
+
+ }
+ return R.data(list);
+ }
+
+ @GetMapping("/search-list")
+ @Operation(summary = "鏌ヨ鏍戠姸鍒楄〃", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯锛堟煡璇笓鐢級")
+ public R<List<NcNodeVO>> searchList(NcNodeQueryVO queryVO) {
+ if(Func.isEmpty(queryVO.getName())){
+ 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);
+ }
+
+ @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