From 44fda5fa3787c78e74d62f9713dd36abdeadcac8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 18 七月 2025 21:27:38 +0800
Subject: [PATCH] 上传接口调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 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 a5bb5b7..b288a78 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
@@ -1,20 +1,15 @@
package org.springblade.mdm.program.controller;
-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.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.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -33,7 +28,7 @@
@Slf4j
public class DncSendBackController {
- private final DncSendBackService dncSendBackService;
+ //private final DncSendBackService dncSendBackService;
private final NcProgramExchangeService ncProgramExchangeService;
/**
* 涓婁紶DNC鍥炰紶鏂囦欢
@@ -42,30 +37,29 @@
*/
@PostMapping("upload")
@ApiOperationSupport(order = 1)
- @Operation(summary = "DNC鍥炰紶鏂囦欢瀵煎叆锛屼笂浼犳枃浠�", description = "涓婁紶DNC鍥炰紶鏂囦欢")
- 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(ncProgramExchangeService.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);
}
-
+ */
@PostMapping("accept")
@ApiOperationSupport(order = 2)
- @Operation(summary = "DNC鍥炰紶鏁版嵁鍏ュ簱", description = "鍏ュ簱锛屽悓鏃跺惎鍔ㄥ浐鍖栨祦绋�")
+ @Operation(summary = "DNC鍥炰紶鏁版嵁鍏ュ簱", description = "鍏ュ簱锛屽悓鏃跺惎鍔ㄥ浐鍖栨祦绋�,鍏ュ弬涓轰笂浼犳槸瑙ｆ瀽鐨勬暟鎹垪琛�")
public R<Void> dncSendBackAccept(@RequestParam String ids) {
try {
- dncSendBackService.dncFileAccept(ids);
+ ncProgramExchangeService.dncFileAccept(ids);
}catch (Exception e){
log.error("鍏ュ簱閿欒",e);
return R.fail(e.getMessage());
--
Gitblit v1.9.3