From b7af95d487f49490de16f9636147e5a40911e157 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 23:36:48 +0800
Subject: [PATCH] 确认表增加程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 84 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
index fc62cc6..0e8e925 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
@@ -4,17 +4,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
-import org.springblade.mdm.program.service.DncSendBackService;
-import org.springblade.mdm.program.service.NcProgramExchangeService;
-import org.springblade.mdm.program.vo.DncSendBackData;
-import org.springblade.mdm.program.vo.ProgramExchangeStatQueryVO;
+import org.springblade.mdm.program.service.DNCSendBackService;
+import org.springblade.mdm.program.service.DncBackFileService;
+import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -29,12 +27,12 @@
@RestController
@RequestMapping("/program/dncsendback/")
@AllArgsConstructor
-@Tag(name = "DNC鍥炰紶绋嬪簭鎺ュ彛", description = "DNC鍥炰紶绋嬪簭鎺ュ彛")
+@Tag(name = "DNC瀵煎叆", description = "DNC瀵煎叆鎺ュ彛")
@Slf4j
public class DncSendBackController {
- private final DncSendBackService dncSendBackService;
- private final NcProgramExchangeService ncProgramExchangeService;
+ private final DNCSendBackService dncSendBackService;
+ private final DncBackFileService dncBackFileService;
/**
* 涓婁紶DNC鍥炰紶鏂囦欢
*
@@ -42,27 +40,28 @@
*/
@PostMapping("upload")
@ApiOperationSupport(order = 1)
- @Operation(summary = "涓婁紶DNC鍥炰紶鏂囦欢", description = "鍥炰紶瀵煎叆")
- public R<Void> dncSendBackUpload(@RequestParam MultipartFile file) {
+ @Operation(summary = "DNC鍥炰紶鏂囦欢瀵煎叆锛屼笂浼犳枃浠�", description = "涓婁紶DNC鍥炰紶鏂囦欢,骞惰繑鍥炶В鏋愮粨鏋�")
+ public R<List<DncSendBackData>> dncSendBackUpload(@RequestParam MultipartFile file) {
try {
- ncProgramExchangeService.dncSendBackUpload(file);
+ return R.data(dncSendBackService.dncSendBackUpload(file));
}catch (Exception e){
log.error("瀵煎叆閿欒",e);
return R.fail(e.getMessage());
}
- return R.success();
}
-
- @Operation(summary = "dnc鍥炰紶鏁版嵁鍒嗛〉", description = "dnc鍥炰紶鏁版嵁鍒嗛〉")
- @GetMapping("/page")
- public R<IPage<DncSendBackData>> page(Query query) {
- IPage<DncSendBackData> pages = ncProgramExchangeService.dncSendBackPageQuery(query);
- return R.data(pages);
+ @GetMapping("/back-file-content")
+ @Operation(summary = "鑾峰彇鍥炰紶鏂囦欢鍐呭", description = "鏌ョ湅宸ユ帶缃戝洖浼犳枃浠跺唴瀹�")
+ public R<String> fileContent(@Parameter(description = "鏂囦欢鐨別ntryName") String entryName) {
+ try {
+ return R.data(dncSendBackService.getEntryFileContent(entryName));
+ }catch(Exception e) {
+ log.error("鍒犻櫎鏂囦欢澶辫触",e);
+ return R.fail(e.getMessage());
+ }
}
-
@PostMapping("accept")
@ApiOperationSupport(order = 2)
- @Operation(summary = "DNC鍥炰紶鏁版嵁鍏ュ簱", description = "鍏ュ簱锛屽悓鏃跺惎鍔ㄥ浐鍖栨祦绋�")
+ @Operation(summary = "DNC鍥炰紶鏁版嵁鍏ュ簱", description = "鍏ュ簱锛屽悓鏃跺惎鍔ㄥ浐鍖栨祦绋�,鍏ュ弬涓轰笂浼犳槸瑙ｆ瀽鐨勬暟鎹垪琛�")
public R<Void> dncSendBackAccept(@RequestParam String ids) {
try {
dncSendBackService.dncFileAccept(ids);
@@ -72,4 +71,47 @@
}
return R.success();
}
+
+ @Operation(summary = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�", description = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�,鏌ヨ鍥炰紶鍘嗗彶")
+ @GetMapping("/dnc-back-page")
+ public R<IPage<DncBackFileVO>> page(DncBackFileQueryVO query) {
+
+ return R.data(dncBackFileService.pageQuery(query));
+ }
+
+ @Operation(summary = "鍥炰紶鍙栨秷", description = "宸ユ帶缃戝洖浼犺褰曚腑鍙栨秷鏈紑濮嬫墽琛岀殑娴佺▼")
+ @PostMapping("/cancel-process")
+ public R<Void> cancelProcess(@Parameter(description = "鍥炰紶璁板綍id")long id) {
+ try{
+ dncBackFileService.cancelProcess(id);
+ return R.success();
+ }catch (Exception e){
+ log.error("娴佺▼鍙栨秷澶辫触",e);
+ return R.fail(e.getMessage());
+ }
+
+ }
+
+ @Operation(summary = "鑾峰彇鍥炰紶璁板綍鐨勬枃浠跺垪琛�", description = "鑾峰彇鍥炰紶璁板綍鐨勬枃浠跺垪琛�")
+ @GetMapping("/files-by-id")
+ public R<List<DncSendBackFile>> filesById(long id) {
+ try {
+ return R.data(dncBackFileService.filesById(id));
+ }catch (Exception e){
+ log.error("鑾峰彇鍘嗗彶鏂囦欢鍒楄〃澶辫触",e);
+ return R.fail(e.getMessage());
+ }
+ }
+
+ @GetMapping("/history-file-content")
+ @Operation(summary = "涓存椂璁板綍鍥炰紶鏂囦欢鍐呭", description = "涓存椂璁板綍鍥炰紶鏂囦欢鍐呭")
+ public R<String> historyContent(@Parameter(description = "鍘嗗彶璁板綍id")long id,@Parameter(description = "鏂囦欢鐨別ntryName") String entryName) {
+ try {
+
+ return R.data(dncBackFileService.getEntryFileContent(id,entryName));
+ }catch(Exception e) {
+ log.error("鑾峰彇鍘嗗彶鏂囦欢鍐呭澶辫触",e);
+ return R.fail(e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3