1.接口授权调整等

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumCategoryController.java

@@ -18,8 +18,6 @@ import com.yonge.cooleshow.biz.dal.service.TenantAlbumCategoryService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumCategoryWrapper;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,14 +56,14 @@ public class TenantAlbumCategoryController {
     private SysUserService sysUserService;
 
     @ApiOperation(value = "详情", notes = "机构专辑分类-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
     @GetMapping("/detail/{id}")
     public R<TenantAlbumCategoryWrapper.TenantAlbumCategory> detail(@PathVariable("id") Long id) {
         return R.from(tenantAlbumCategoryService.detail(id));
     }
 
     @ApiOperation(value = "查询分页", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategoryQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantAlbumCategoryVo.TenantAlbumCategory>> page(@RequestBody TenantAlbumCategoryWrapper.TenantAlbumCategoryQuery query) {
 
@@ -89,7 +87,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "新增", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
     @PostMapping("/save")
     public R<JSONObject> add(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -105,7 +103,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "修改", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
     @PostMapping("/update")
     public R<JSONObject> update(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -120,7 +118,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "删除", notes = "机构专辑分类- 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
     @PostMapping("/remove")
     public R<Boolean> remove(@RequestParam Long id) {
 
@@ -128,7 +126,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "获取专辑分类值列表")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
     @GetMapping("/queryCategoryValue")
     public R<List<TenantAlbumCategoryDetail>> queryCategoryValue(@RequestParam("id") Long id) {
         TenantAlbumCategory albumCategory = tenantAlbumCategoryService.getById(id);

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantGroupController.java

@@ -27,14 +27,14 @@ public class TenantGroupController {
     private TenantGroupService tenantGroupService;
 
     @ApiOperation(value = "查询分页", notes = "机构小组表- 传入 TenantGroupWrapper.TenantGroupQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantGroupWrapper.TenantGroup>> page(@RequestBody TenantGroupWrapper.TenantGroupQuery query) {
         return R.from(QueryInfo.pageInfo(tenantGroupService.selectPage(QueryInfo.getPage(query), query)));
     }
 
     @ApiOperation(value = "处理机构小组交接", notes = "处理机构小组交接")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
     @PostMapping("/adjustTenantGroup")
     public R<Boolean> adjustTenantGroup(@RequestBody TenantGroupWrapper.AdjustTenantGroup adjustTenantGroup) {
         return R.from(tenantGroupService.adjustTenantGroup(adjustTenantGroup));

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumCategoryController.java

@@ -58,14 +58,14 @@ public class TenantAlbumCategoryController {
     private SysUserService sysUserService;
 
     @ApiOperation(value = "详情", notes = "机构专辑分类-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
     @GetMapping("/detail/{id}")
     public R<TenantAlbumCategoryWrapper.TenantAlbumCategory> detail(@PathVariable("id") Long id) {
         return R.from(tenantAlbumCategoryService.detail(id));
     }
 
     @ApiOperation(value = "查询分页", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategoryQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantAlbumCategoryVo.TenantAlbumCategory>> page(@RequestBody TenantAlbumCategoryWrapper.TenantAlbumCategoryQuery query) {
 
@@ -89,7 +89,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "新增", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
     @PostMapping("/save")
     public R<JSONObject> add(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -105,7 +105,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "修改", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
     @PostMapping("/update")
     public R<JSONObject> update(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -120,7 +120,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "删除", notes = "机构专辑分类- 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
     @PostMapping("/remove")
     public R<Boolean> remove(@RequestParam Long id) {
 
@@ -128,7 +128,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "获取专辑分类值列表")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
     @GetMapping("/queryCategoryValue")
     public R<List<TenantAlbumCategoryDetail>> queryCategoryValue(@RequestParam("id") Long id) {
         TenantAlbumCategory albumCategory = tenantAlbumCategoryService.getById(id);

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantGroupController.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.common.response.template.R;
@@ -17,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Slf4j
 @Validated
 @RestController
@@ -30,14 +27,14 @@ public class TenantGroupController {
     private TenantGroupService tenantGroupService;
 
     @ApiOperation(value = "查询分页", notes = "机构小组表- 传入 TenantGroupWrapper.TenantGroupQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantGroupWrapper.TenantGroup>> page(@RequestBody TenantGroupWrapper.TenantGroupQuery query) {
         return R.from(QueryInfo.pageInfo(tenantGroupService.selectPage(QueryInfo.getPage(query), query)));
     }
 
     @ApiOperation(value = "处理机构小组交接", notes = "处理机构小组交接")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
     @PostMapping("/adjustTenantGroup")
     public R<Boolean> adjustTenantGroup(@RequestBody TenantGroupWrapper.AdjustTenantGroup adjustTenantGroup) {
         return R.from(tenantGroupService.adjustTenantGroup(adjustTenantGroup));