From 8d322f025a9483030a47d4671c5fa7502bbcb930 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 18 九月 2023 15:56:32 +0800 Subject: [PATCH] 休bug --- server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java b/server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java index f2c716c..fcda94f 100644 --- a/server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java +++ b/server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java @@ -10,13 +10,15 @@ import com.doumee.dao.business.model.dto.BaseGoodsCreateOrUpdateRequest; import com.doumee.dao.business.model.dto.BaseGoodsDTO; import com.doumee.service.business.BaseGoodsService; -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; @@ -94,12 +96,12 @@ * 涓婚敭涓婁笅鏋� * */ - @ApiOperation("鏍规嵁ID鏌ヨ") + @ApiOperation("鏍规嵁ID鏌ヨ鎵归噺涓婃灦涓嬫灦") @PostMapping("/updateStatus") - @RequiresPermissions("business:basegoods:query") + @RequiresPermissions("business:basegoods:update") public ApiResponse updateStatusByIds(@RequestBody BaseGoods param ){ baseGoodsService.updateStatusByIds(param); - return ApiResponse.success(null); + return ApiResponse.success("鎿嶄綔鎴愬姛锛�"); } @@ -142,4 +144,14 @@ baseGoodsService.update(baseGoods); return ApiResponse.success(null); } + + @ApiOperation("瀵煎叆妯℃澘") + @PostMapping("/importExcel") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class), + }) + @RequiresPermissions("business:basegoods:create") + public ApiResponse<Integer> importExcel (@ApiParam(value = "file") MultipartFile file) { + return ApiResponse.success(baseGoodsService.importBaseGoodsBatch(file)); + } } -- Gitblit v1.9.3