From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/platform/src/main/java/com/doumee/api/business/BikesController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/BikesController.java b/server/platform/src/main/java/com/doumee/api/business/BikesController.java
index cbe067b..8fb4b3d 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BikesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BikesController.java
@@ -8,13 +8,14 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.service.business.BikesService;
-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 org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -73,11 +74,12 @@
public ApiResponse<PageData<Bikes>> findPage (@RequestBody PageWrap<Bikes> pageWrap) {
return ApiResponse.success(bikesService.findPage(pageWrap));
}
- @ApiOperation("瀹炴椂杞︿綅淇℃伅-鍒嗛〉鏌ヨ")
+ @ApiOperation("瀹炴椂杞︿綅淇℃伅-鍒嗛〉鏌ヨ-寮冪敤")
@PostMapping("/pageCurrent")
@RequiresPermissions("business:bikes:query")
public ApiResponse<PageData<Bikes>> pageCurrent (@RequestBody PageWrap<Bikes> pageWrap) {
- return ApiResponse.success(bikesService.findJoinPage(pageWrap));
+ PageData<Bikes> list = bikesService.findJoinPage(pageWrap);
+ return ApiResponse.success(list);
}
@ApiOperation("瀵煎嚭Excel")
@@ -86,7 +88,15 @@
public void exportExcel (@RequestBody PageWrap<Bikes> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Bikes.class).export(bikesService.findPage(pageWrap).getRecords(), "鑷杞︿俊鎭〃", response);
}
-
+ @ApiOperation(value = "鐢佃溅鎵归噺瀵煎叆" ,notes = "淇濆崟鐢宠")
+ @PostMapping("/importExcel")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+ })
+ @RequiresPermissions("business:member:create")
+ public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file) {
+ return ApiResponse.success(bikesService.importBatch(file));
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:bikes:query")
--
Gitblit v1.9.3