From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramOnMachineImportController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramOnMachineImportController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramOnMachineImportController.java
index d6eae27..36fa13f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramOnMachineImportController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramOnMachineImportController.java
@@ -1,25 +1,19 @@
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.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.program.service.MdmProgramImportService;
import org.springblade.mdm.program.service.ProgramOnMachineService;
-import org.springblade.mdm.program.vo.MdmProgramImportVO;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+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 = "宸ユ帶缃憁dm绋嬪簭瀵煎叆")
+ @Operation(summary = "宸ユ帶缃戝鍏ョ幇鍦虹紪鍒舵暟鎹�", description = "宸ユ帶缃戝鍏ョ幇鍦虹紪鍒舵暟鎹�")
public R<Integer> upload(@RequestParam MultipartFile file) {
if(file == null || file.isEmpty() || file.getOriginalFilename() ==null){
return R.fail("鏂囦欢涓嶈兘涓虹┖");
@@ -59,4 +49,10 @@
}
}
+ @Operation(summary = "宸ユ帶缃戜笅鍦虹紪绋嬭褰曞垎椤垫煡璇�", description = "宸ユ帶缃戜笅鍦虹紪绋嬭褰曞垎椤垫煡璇�")
+ @GetMapping("/program-on-machine-page")
+ public R<IPage<ProgramOnMachineVO>> page(ProgramOnMachineRecordQueryVO queryVO) {
+ return R.data(programOnMachineService.pageQuery(queryVO));
+ }
+
}
--
Gitblit v1.9.3