From 48bf9371a65ad93faebfc95002f43d49d27faf84 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 26 十一月 2024 16:29:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java
index 480b024..6c0f5a8 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.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;
@@ -12,7 +13,6 @@
 import com.doumee.service.business.AreasService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +36,7 @@
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
-    @RequiresPermissions("business:areas:create")
+    @CloudRequiredPermission("business:areas:create")
     public ApiResponse create(@RequestBody Areas areas,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         areas.setLoginUserInfo(getLoginUser(token));
         return ApiResponse.success(areasService.create(areas));
@@ -44,7 +44,7 @@
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:areas:delete")
+    @CloudRequiredPermission("business:areas:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         areasService.deleteById(id);
         return ApiResponse.success(null);
@@ -52,7 +52,7 @@
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
-    @RequiresPermissions("business:areas:delete")
+    @CloudRequiredPermission("business:areas:delete")
     public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
@@ -65,7 +65,7 @@
 
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
-    @RequiresPermissions("business:areas:update")
+    @CloudRequiredPermission("business:areas:update")
     public ApiResponse updateById(@RequestBody Areas areas,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         areas.setLoginUserInfo(getLoginUser(token));
         areasService.updateById(areas);
@@ -74,14 +74,14 @@
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
-//    @RequiresPermissions("business:areas:query")
+//    @CloudRequiredPermission("business:areas:query")
     public ApiResponse<PageData<Areas>> findPage (@RequestBody PageWrap<Areas> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(areasService.findPage(pageWrap));
     }
 
     @ApiOperation("鍏ㄩ儴鏍戝舰鏌ヨ")
     @PostMapping("/treeList")
-//    @RequiresPermissions("business:areas:query")
+//    @CloudRequiredPermission("business:areas:query")
     public ApiResponse<List<Areas>> treeList (@RequestBody AreasDto pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         Areas a = new Areas();
         BeanUtils.copyProperties(pageWrap,a);
@@ -89,7 +89,7 @@
     }
     @ApiOperation("鏍规嵁鐖惰妭鐐规煡涓�")
     @PostMapping("/listByParentId")
-//    @RequiresPermissions("business:areas:query")
+//    @CloudRequiredPermission("business:areas:query")
     public ApiResponse<List<Areas>> listByParentId (@RequestBody AreasDto pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         Areas a = new Areas();
         BeanUtils.copyProperties(pageWrap,a);
@@ -101,14 +101,14 @@
     }
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
-    @RequiresPermissions("business:areas:exportExcel")
+    @CloudRequiredPermission("business:areas:exportExcel")
     public void exportExcel (@RequestBody PageWrap<Areas> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         ExcelExporter.build(Areas.class).export(areasService.findPage(pageWrap).getRecords(), "鐪佸競鍖轰俊鎭〃", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
-    @RequiresPermissions("business:areas:query")
+    @CloudRequiredPermission("business:areas:query")
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(areasService.findById(id));
     }

--
Gitblit v1.9.3