From 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:29:38 +0800
Subject: [PATCH] 现场编制功能适配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 2c207eb..30494ee 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,25 @@
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;
@@ -34,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;
@@ -154,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涓枃鏈暟鎹�")
@@ -178,19 +185,19 @@
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());
+
+
+ @GetMapping("/download-by-nodeid")
+ @Operation(summary = "涓嬭浇鑺傜偣瀵瑰簲鐨勬枃浠�", description = "涓嬭浇鑺傜偣瀵瑰簲鐨勬枃浠�")
+ public void downloadByNodeId(@Parameter(description = "鑺傜偣id") Long nodeId, HttpServletResponse response) throws IOException {
+
+ NcNode ncnode = ncNodeService.getById(nodeId);
+ if(ncnode.getFlowProgramFileId() != null) {
+ flowProgramFileService.download(ncnode.getFlowProgramFileId(),response);
+ }else{
+ log.error("闈炴枃浠惰妭鐐�");
+ throw new ServiceException("鑺傜偣鏃犳枃浠秈d");
}
+
}
}
--
Gitblit v1.9.3