From 967e12a05e1a1cb0c595a379c55c5ecc71dd03a9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 九月 2023 09:08:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev

---
 server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java |   65 +++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 27 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..d11211e 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;
 
@@ -35,7 +37,7 @@
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
-//    @RequiresPermissions("business:basegoods:create")
+    @RequiresPermissions("business:basegoods:create")
     public ApiResponse create(@RequestBody BaseGoodsCreateOrUpdateRequest baseGoods) {
         return ApiResponse.success(baseGoodsService.create(baseGoods));
     }
@@ -85,37 +87,36 @@
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
-//    @RequiresPermissions("business:basegoods:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(baseGoodsService.findById(id));
+    @RequiresPermissions("business:basegoods:query")
+    public ApiResponse<BaseGoodsDTO> findById(@PathVariable Integer id) {
+        return ApiResponse.success(baseGoodsService.findByIdBaseGoods(id));
     }
 
     /**
      * 涓婚敭涓婁笅鏋�
      *
-     * @param idList 瀹炰綋瀵硅薄
      */
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @PostMapping("/{status}")
-    @RequiresPermissions("business:basegoods:query")
-    public ApiResponse updateStatusByIds(@RequestBody List<Integer> idList, @PathVariable Integer status){
-        baseGoodsService.updateStatusByIds(idList,status);
-        return ApiResponse.success(null);
+    @ApiOperation("鏍规嵁ID鏌ヨ鎵归噺涓婃灦涓嬫灦")
+    @PostMapping("/updateStatus")
+    @RequiresPermissions("business:basegoods:update")
+    public ApiResponse updateStatusByIds(@RequestBody   BaseGoods param ){
+        baseGoodsService.updateStatusByIds(param);
+        return ApiResponse.success("鎿嶄綔鎴愬姛锛�");
     }
 
 
-    /**
-     * 涓婚敭涓婁笅鏋�
-     *
-     * @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);
+//    }
 
     /**
      * 涓婚敭鏌ヨ
@@ -125,7 +126,7 @@
      */
     @ApiOperation("鏍规嵁ID鏌ヨ骞冲彴鍟嗗搧璇︾粏淇℃伅")
     @GetMapping("/findByIdBaseGoods")
-//    @RequiresPermissions("business:basegoods:query")
+    @RequiresPermissions("business:basegoods:query")
     public ApiResponse<BaseGoodsDTO> findByIdBaseGoods(@RequestParam Integer id){
         BaseGoodsDTO byIdBaseGoods = baseGoodsService.findByIdBaseGoods(id);
         return ApiResponse.success(byIdBaseGoods);
@@ -138,9 +139,19 @@
      */
     @ApiOperation("鏍规嵁ID淇敼-缂栬緫淇敼")
     @PostMapping("/update")
-//    @RequiresPermissions("business:basegoods:update")
+    @RequiresPermissions("business:basegoods:update")
     public ApiResponse update(@RequestBody BaseGoodsCreateOrUpdateRequest baseGoods){
         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