From 7de835dea145fe8229f5f0100e2a90094e6d5b22 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 18:49:38 +0800
Subject: [PATCH] 改bug

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java |   57 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java
index 8f7b90a..885cfb3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java
@@ -36,57 +36,76 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("business:ywwarehouse:create")
-    public ApiResponse create(@RequestBody YwWarehouse ywWarehouse) {
+    public ApiResponse create(@RequestBody YwWarehouse ywWarehouse,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywWarehouse.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywWarehouseService.create(ywWarehouse));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:ywwarehouse:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        ywWarehouseService.deleteById(id);
+    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywWarehouseService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @CloudRequiredPermission("business:ywwarehouse: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));
-        }
-        ywWarehouseService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
+//    @ApiOperation("鎵归噺鍒犻櫎")
+//    @GetMapping("/delete/batch")
+//    @CloudRequiredPermission("business:ywwarehouse:delete")
+//    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+//        String [] idArray = ids.split(",");
+//        List<Integer> idList = new ArrayList<>();
+//        for (String id : idArray) {
+//            idList.add(Integer.valueOf(id));
+//        }
+//        ywWarehouseService.deleteByIdInBatch(idList);
+//        return ApiResponse.success(null);
+//    }
 
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:ywwarehouse:update")
-    public ApiResponse updateById(@RequestBody YwWarehouse ywWarehouse) {
+    public ApiResponse updateById(@RequestBody YwWarehouse ywWarehouse,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywWarehouse.setLoginUserInfo(getLoginUser(token));
         ywWarehouseService.updateById(ywWarehouse);
         return ApiResponse.success(null);
     }
 
+    @ApiOperation("鏍规嵁ID淇敼鐘舵��")
+    @PostMapping("/updateStatusById")
+    @CloudRequiredPermission("business:ywwarehouse:update")
+    public ApiResponse updateStatusById(@RequestBody YwWarehouse ywWarehouse,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywWarehouse.setLoginUserInfo(getLoginUser(token));
+        ywWarehouseService.updateStatusById(ywWarehouse);
+        return ApiResponse.success(null);
+    }
+
+
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywwarehouse:query")
-    public ApiResponse<PageData<YwWarehouse>> findPage (@RequestBody PageWrap<YwWarehouse> pageWrap) {
+    public ApiResponse<PageData<YwWarehouse>> findPage (@RequestBody PageWrap<YwWarehouse> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(ywWarehouseService.findPage(pageWrap));
+    }
+
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:ywwarehouse:query")
+    public ApiResponse<List<YwWarehouse>> findList (@RequestBody YwWarehouse model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywWarehouseService.findList(model));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywwarehouse:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<YwWarehouse> pageWrap, HttpServletResponse response) {
+    public void exportExcel (@RequestBody PageWrap<YwWarehouse> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         ExcelExporter.build(YwWarehouse.class).export(ywWarehouseService.findPage(pageWrap).getRecords(), "杩愮淮浠撳簱淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:ywwarehouse:query")
-    public ApiResponse findById(@PathVariable Integer id) {
+    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(ywWarehouseService.findById(id));
     }
 }

--
Gitblit v1.9.3