From f1864f6d2d85b49fc901b22e9f6759a5d0fb360b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 26 十一月 2024 09:33:03 +0800
Subject: [PATCH] 开发更新

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwBuildingCloudController.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwBuildingCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwBuildingCloudController.java
index 1a2b580..430e030 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwBuildingCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwBuildingCloudController.java
@@ -1,6 +1,7 @@
 package com.doumee.cloud.admin;
 
 import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
@@ -11,7 +12,6 @@
 import com.doumee.service.business.YwBuildingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,57 +34,68 @@
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
-    @RequiresPermissions("business:ywbuilding:create")
+    @CloudRequiredPermission("business:ywbuilding:create")
     public ApiResponse create(@RequestBody YwBuilding ywBuilding,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywBuilding.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywBuildingService.create(ywBuilding));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:ywbuilding:delete")
+    @CloudRequiredPermission("business:ywbuilding:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        ywBuildingService.deleteById(id);
+        ywBuildingService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
-    @RequiresPermissions("business:ywbuilding:delete")
+    @CloudRequiredPermission("business:ywbuilding: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));
         }
-        ywBuildingService.deleteByIdInBatch(idList);
+        ywBuildingService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
-    @RequiresPermissions("business:ywbuilding:update")
+    @CloudRequiredPermission("business:ywbuilding:update")
     public ApiResponse updateById(@RequestBody YwBuilding ywBuilding,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywBuilding.setLoginUserInfo(this.getLoginUser(token));
         ywBuildingService.updateById(ywBuilding);
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
-    @RequiresPermissions("business:ywbuilding:query")
+    @CloudRequiredPermission("business:ywbuilding:query")
     public ApiResponse<PageData<YwBuilding>> findPage (@RequestBody PageWrap<YwBuilding> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywBuildingService.findPage(pageWrap));
+    }
+    @ApiOperation("鏌ヨ鍒楄〃")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:ywbuilding:query")
+    public ApiResponse<List<YwBuilding>> findList (@RequestBody  YwBuilding pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.setLoginUserInfo(this.getLoginUser(token));
+        return ApiResponse.success(ywBuildingService.findList(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
-    @RequiresPermissions("business:ywbuilding:exportExcel")
+    @CloudRequiredPermission("business:ywbuilding:exportExcel")
     public void exportExcel (@RequestBody PageWrap<YwBuilding> pageWrap, HttpServletResponse response ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(YwBuilding.class).export(ywBuildingService.findPage(pageWrap).getRecords(), "杩愮淮妤煎畤淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
-    @RequiresPermissions("business:ywbuilding:query")
+    @CloudRequiredPermission("business:ywbuilding:query")
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(ywBuildingService.findById(id));
     }

--
Gitblit v1.9.3