工控网涉密网联调

yangys

2025-09-29 4c7296d45efe849dc70a3b2e2240c905481a91c9

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramOnMachineImportController.java

@@ -8,18 +8,12 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.flow.vo.ProgramOnMachineExcel;
import org.springblade.mdm.flow.vo.ProgramOnMachineQueryVO;
import org.springblade.mdm.program.service.MdmProgramImportService;
import org.springblade.mdm.program.service.ProgramOnMachineService;
import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
 * mdm导入接口，工控网功能
@@ -35,14 +29,10 @@
public class ProgramOnMachineImportController {

   private final ProgramOnMachineService programOnMachineService;
   /**
    * 上传DNC回传文件
    *
    * @param file    dnc程序打包文件
    */

   @PostMapping("import-prog-on-machine")
   @ApiOperationSupport(order = 1)
   @Operation(summary = "MDM程序导入", description = "工控网mdm程序导入")
   @Operation(summary = "工控网导入现场编制数据", description = "工控网导入现场编制数据")
   public R<Integer> upload(@RequestParam MultipartFile file) {
      if(file == null || file.isEmpty() || file.getOriginalFilename() ==null){
         return R.fail("文件不能为空");
@@ -62,7 +52,6 @@
   @Operation(summary = "工控网下场编程记录分页查询", description = "工控网下场编程记录分页查询")
   @GetMapping("/program-on-machine-page")
   public R<IPage<ProgramOnMachineVO>> page(ProgramOnMachineRecordQueryVO queryVO) {

      return R.data(programOnMachineService.pageQuery(queryVO));
   }