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 | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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 6aa1ec1..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
@@ -15,6 +15,8 @@
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;
@@ -39,6 +41,7 @@
private final NcProgramService ncProgramService;
private final NcNodeService ncNodeService;
private final ProgramFlowStatusQueryService programFlowStatusQueryService;
+ private final FlowProgramFileService flowProgramFileService;
/**
* 鏂板
*/
@@ -74,18 +77,7 @@
break;
}
ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
- /*
- 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()));
- }*/
}
}
@@ -130,4 +122,21 @@
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