From d9919b8e236113a1451082943ce889a6eb1f9495 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 20 七月 2025 10:54:41 +0800
Subject: [PATCH] 上传接口调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
index 5c65bf6..0757e57 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
@@ -49,10 +49,30 @@
@PostMapping("/upload")
@Operation(summary = "涓婁紶鏂囦欢", description = "涓婁紶绋嬪簭/闄勪欢鏂囦欢")
public R<Boolean> upload(NcProgramUploadVO uploadVO) {
- //@Parameter(description="鏂囦欢") @RequestPart("file") MultipartFile file, @Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long nodeId,
- // @Parameter(description="鏂囦欢鍒嗙被锛屼娇鐢ㄥ瓧鍏�(node_file_type)") @RequestParam String category
- ncProgramService.uploadProgramFileNew(uploadVO);
- return R.<Boolean>status(true);
+ try {
+ boolean existOther = ncProgramService.programExistsUnderOtherNode(uploadVO.getNodeId(), uploadVO.getFile().getOriginalFilename());
+ if (existOther) {
+ //绋嬪簭瀛樺湪锛屽垯杩斿洖鎻愮ず淇℃伅
+ return R.fail("绋嬪簭鍏朵粬鑺傜偣宸插瓨鍦�");
+ }
+ if (uploadVO.getConfirm() == null || uploadVO.getConfirm() != 1) {
+ //榛樿鎯呭喌锛岄渶瑕佹鏌ョ▼搴忔槸鍚﹀瓨鍦�
+ boolean exists = ncProgramService.programExistsUnderNode(uploadVO.getNodeId(), uploadVO.getFile().getOriginalFilename());
+ if (exists) {
+ //绋嬪簭瀛樺湪锛屽垯杩斿洖鎻愮ず淇℃伅
+ return R.fail(2, "瀛樺湪閲嶅绋嬪簭鍚�");
+ } else {
+ ncProgramService.uploadProgramFileNew(uploadVO);
+ }
+ } else {
+ //鍚屽悕鏂囦欢鐢ㄦ埛纭涓婁紶浜嗭紙锛�
+ ncProgramService.uploadProgramFileNew(uploadVO);
+ }
+ }catch(Exception e) {
+ log.error("绋嬪簭涓婁紶鎵ц閿欒",e);
+ return R.fail("涓婁紶澶辫触:" + e.getMessage());
+ }
+ return R.success();
}
@PostMapping("/remove")
@@ -96,8 +116,8 @@
@PostMapping("/upgrade-process-edition")
@Operation(summary = "鍗囩増", description = "鍗囩骇宸ュ簭鐗堟")
- public R<Boolean> upgradeProcessEdition(Long id,String newProcessEdition ) {
- ncProgramService.upgradeProcessEdition(id,newProcessEdition);
+ public R<Boolean> upgradeProcessEdition(Long bindNcNodeId,String newProcessEdition ) {
+ ncProgramService.upgradeProcessEdition(bindNcNodeId,newProcessEdition);
return R.<Boolean>status(true);
}
@@ -122,14 +142,20 @@
return R.data(approveRecordService.listByNcProgramId(ncProgramId));
}
+ @GetMapping("/history-by-bindnodeid")
+ @Operation(summary = "鏍规嵁缁戝畾鑺傜偣id鑾峰彇鍘嗗彶鍒楄〃", description = "绋嬪簭鍘嗗彶鍒楄〃锛屼粎鈥樼▼搴忓寘鈥欏瓧鍏稿��70鐨勬暟鎹�傜敤浜庢樉绀虹▼搴忕殑鈥樺巻鍙茬増鏈��")
+ public R<List<NcProgramVO>> historyByBindNodeId(@Parameter(description="鑺傜偣ID(nodeType=70鐨勮妭鐐筰d)")@RequestParam Long bindNodeId) {
+ return R.data(ncProgramService.historyByBindNode(bindNodeId));
+ }
+ /*
@PostMapping("/send")
- @Operation(summary = "绋嬪簭涓嬪彂", description = "宸ユ帶缃戞暟鎺х▼搴忎笅鍙戯紙鍙戦�佸埌鏈哄簥閰嶇疆鐨勪笅鍙戠洰褰曪級")
+ @Operation(summary = "绋嬪簭涓嬪彂", description = "宸ユ帶缃戞暟鎺х▼搴忎笅鍙戯紙鍙戦�佸埌鏈哄簥閰嶇疆鐨勪笅鍙戠洰褰曪級,鏍规嵁id")
public R<List<NcProgramVO>> send(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long id) {
return null;//R.data(ncProcessProgRefService.listByProcess(processInstanceId));
- }
+ }*/
- @GetMapping("/send-to-machine-by-nodeid")
- @Operation(summary = "涓嬪彂", description = "涓嬪彂缁欐満搴婅瀹氱殑鐩綍")
+ @PostMapping("/send-to-machine-by-nodeid")
+ @Operation(summary = "绋嬪簭涓嬪彂", description = "涓嬪彂缁欐満搴婅瀹氱殑鐩綍")
public R<Void> sendToMachineByNodeId(@Parameter(description = "鑺傜偣id") Long nodeId) {
try {
ncProgramService.sendByBindNodeId(nodeId);
--
Gitblit v1.9.3