From 81182562d3328ff9b722e807d07277478c7690bb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 九月 2023 15:08:02 +0800
Subject: [PATCH] 休bug
---
server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 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 cc6b9c8..ddf51c0 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;
@@ -93,29 +95,28 @@
/**
* 涓婚敭涓婁笅鏋�
*
- * @param idList 瀹炰綋瀵硅薄
*/
@ApiOperation("鏍规嵁ID鏌ヨ")
- @PostMapping("/{status}")
+ @PostMapping("/updateStatus")
@RequiresPermissions("business:basegoods:query")
- public ApiResponse updateStatusByIds(@RequestBody List<Integer> idList, @PathVariable Integer status){
- baseGoodsService.updateStatusByIds(idList,status);
+ public ApiResponse updateStatusByIds(@RequestBody BaseGoods param ){
+ baseGoodsService.updateStatusByIds(param);
return ApiResponse.success(null);
}
- /**
- * 涓婚敭涓婁笅鏋�
- *
- * @param id 瀹炰綋瀵硅薄
- */
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/updateStatusById")
- @RequiresPermissions("business:basegoods:query")
- public ApiResponse updateStatusById(@RequestParam Integer id,@RequestParam Integer status){
- baseGoodsService.updateStatusById(id,status);
- return ApiResponse.success(null);
- }
+// /**
+// * 涓婚敭涓婁笅鏋�
+// *
+// * @param id 瀹炰綋瀵硅薄
+// */
+// @ApiOperation("涓婃灦 銆佷笅鏋�")
+// @GetMapping("/updateStatusById")
+// @RequiresPermissions("business:basegoods:update")
+// public ApiResponse updateStatusById(@RequestParam Integer id,@RequestParam Integer status){
+// baseGoodsService.updateStatusById(id,status);
+// return ApiResponse.success(null);
+// }
/**
* 涓婚敭鏌ヨ
@@ -143,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