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/company/src/main/java/com/doumee/api/business/BaseGoodsController.java |   61 +++---------------------------
 1 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java b/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
index 61818e1..94eb4c0 100644
--- a/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
@@ -4,17 +4,19 @@
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.BaseGoods;
+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 org.apache.shiro.authz.annotation.RequiresPermissions;    
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,61 +32,12 @@
     @Autowired
     private BaseGoodsService baseGoodsService;
 
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:basegoods:create")
-    public ApiResponse create(@RequestBody BaseGoods baseGoods) {
-        return ApiResponse.success(baseGoodsService.create(baseGoods));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:basegoods:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        baseGoodsService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:basegoods:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        baseGoodsService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:basegoods:update")
-    public ApiResponse updateById(@RequestBody BaseGoods baseGoods) {
-        baseGoodsService.updateById(baseGoods);
-        return ApiResponse.success(null);
-    }
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
-    @RequiresPermissions("business:basegoods:query")
+//    @RequiresPermissions("business:basegoods:query")
     public ApiResponse<PageData<BaseGoods>> findPage (@RequestBody PageWrap<BaseGoods> pageWrap) {
-        return ApiResponse.success(baseGoodsService.findPage(pageWrap));
+        return ApiResponse.success(baseGoodsService.findCompanyPage(pageWrap));
     }
 
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:basegoods:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<BaseGoods> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(BaseGoods.class).export(baseGoodsService.findPage(pageWrap).getRecords(), "绱犳潗搴�-鍟嗗搧淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:basegoods:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(baseGoodsService.findById(id));
-    }
 }

--
Gitblit v1.9.3