From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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..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,21 +87,21 @@
 
     @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));
     }
 
     /**
      * 涓婚敭涓婁笅鏋�
      *
      */
-    @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("鎿嶄綔鎴愬姛锛�");
     }
 
 
@@ -124,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);
@@ -137,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