From 5173c99276023cac788875d5fa8d5cad84112777 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 00:36:00 +0800
Subject: [PATCH] dnc导入导出格式修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 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 8011b15..16c8d5f 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
@@ -8,7 +8,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.mdm.program.service.DncSendBackService;
+import org.springblade.mdm.program.service.DNCSendBackService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -22,47 +22,40 @@
*/
@NonDS
@RestController
-@RequestMapping("/program")
+@RequestMapping("/program/dncsendback/")
@AllArgsConstructor
-@Tag(name = "DNC鍥炰紶绋嬪簭鎺ュ彛", description = "DNC鍥炰紶绋嬪簭鎺ュ彛")
+@Tag(name = "DNC瀵煎叆", description = "DNC瀵煎叆鎺ュ彛")
@Slf4j
public class DncSendBackController {
- private final DncSendBackService dncSendBackService;
-
- /**
- * dnc鍥炰紶鏂囦欢瀵煎叆
- *
- * @param file 娴佺▼鏂囦欢
- */
- /*
- @PostMapping("dnc-sendback-upload")
- @ApiOperationSupport(order = 4)
- @Operation(summary = "dnc鍥炰紶鏂囦欢瀵煎叆", description = "dnc鍥炰紶鏂囦欢瀵煎叆")
- public R dncSendBackUpload(@RequestParam MultipartFile file) {
- boolean temp = Objects.requireNonNull(file.getOriginalFilename()).endsWith("pkg");
- temp = true;//涓存椂鏀捐
- return R.data(Kv.create().set("name", file.getOriginalFilename()).set("success", temp));
- }
- */
+ private final DNCSendBackService dncSendBackService;
/**
* 涓婁紶DNC鍥炰紶鏂囦欢
*
- * @param files 娴佺▼鏂囦欢
- * @param category 绫诲瀷
+ * @param file dnc绋嬪簭鎵撳寘鏂囦欢
*/
- @PostMapping("dnc-sendback-upload")
+ @PostMapping("upload")
@ApiOperationSupport(order = 1)
- @Operation(summary = "涓婁紶DNC鍥炰紶鏂囦欢", description = "浼犲叆鏂囦欢")
- public R<List<DncSendBackData>> dncSendBackUpload(@RequestParam MultipartFile file,
- @RequestParam String category,
- @RequestParam(required = false, defaultValue = "") String tenantIds) {
- return R.data(dncSendBackService.dncSendBackUpload(file));
+ @Operation(summary = "DNC鍥炰紶鏂囦欢瀵煎叆锛屼笂浼犳枃浠�", description = "涓婁紶DNC鍥炰紶鏂囦欢,骞惰繑鍥炶В鏋愮粨鏋�")
+ public R<List<DncSendBackData>> dncSendBackUpload(@RequestParam MultipartFile file) {
+ try {
+ return R.data(dncSendBackService.dncSendBackUpload(file));
+ }catch (Exception e){
+ log.error("瀵煎叆閿欒",e);
+ return R.fail(e.getMessage());
+ }
}
-
- @PostMapping("dnc-sendback-accept")
+ /*
+ @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鍥炰紶鏁版嵁鍏ュ簱")
+ @Operation(summary = "DNC鍥炰紶鏁版嵁鍏ュ簱", description = "鍏ュ簱锛屽悓鏃跺惎鍔ㄥ浐鍖栨祦绋�,鍏ュ弬涓轰笂浼犳槸瑙ｆ瀽鐨勬暟鎹垪琛�")
public R<Void> dncSendBackAccept(@RequestParam String ids) {
try {
dncSendBackService.dncFileAccept(ids);
--
Gitblit v1.9.3