From e6e520abd96702db6b29459a66440801f58bc89d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 30 一月 2026 14:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
server/admin/src/main/java/com/doumee/api/business/ImportRecordController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/ImportRecordController.java b/server/admin/src/main/java/com/doumee/api/business/ImportRecordController.java
index 4f83adc..b506794 100644
--- a/server/admin/src/main/java/com/doumee/api/business/ImportRecordController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/ImportRecordController.java
@@ -9,20 +9,23 @@
import com.doumee.dao.business.model.ImportRecord;
import com.doumee.core.utils.Utils;
import com.doumee.service.business.ImportRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import com.doumee.api.BaseController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+
/**
* 鍒嗙被淇℃伅琛–ontroller瀹氫箟
* @author doumee
* @date 2026-01-27 16:02:37
*/
-@Api(tags = "tableName鎺ュ彛")
+@Api(tags = "鍒嗙被淇℃伅琛ㄦ帴鍙�")
@RestController
@RequestMapping("/business/importRecord")
public class ImportRecordController extends BaseController {
@@ -82,4 +85,16 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(importRecordService.findById(id));
}
+
+ @ApiOperation(value = "淇℃伅瀵煎叆" ,notes = "淇濆崟鐢宠")
+ @PostMapping("/importExcel")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+ @ApiImplicitParam(name = "瀵煎叆绫诲瀷 0浜哄憳 1妗堜緥", value = "type", required = true, paramType = "query", dataType = "Integer",example = "0",dataTypeClass = Integer.class),
+ })
+ public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, @ApiParam(value = "type") Integer type) {
+ ImportRecord importRecord = importRecordService.importBatch(file,type);
+ importRecordService.dealImporTask(importRecord);
+ return ApiResponse.success("鏂囦欢涓婁紶鎴愬姛");
+ }
}
--
Gitblit v1.9.3