上传接口调整

yangys

5 天以前 44fda5fa3787c78e74d62f9713dd36abdeadcac8

 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;

@@ -29,11 +24,11 @@
@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 DncSendBackService dncSendBackService;
   private final NcProgramExchangeService ncProgramExchangeService;
   /**
    * 上传DNC回传文件
@@ -42,30 +37,29 @@
    */
   @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(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());