refactor(all): @PreAuthorize 使用 @HasPermisson 注解替换

(cherry picked from commit 19b5ec57ad000e6a3ae767626ae8deaad28c901f)

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java

@@ -25,12 +25,12 @@ import com.pig4cloud.pigx.codegen.entity.GenCreateTable;
 import com.pig4cloud.pigx.codegen.service.GenCreateTableService;
 import com.pig4cloud.pigx.codegen.util.vo.GenCreateTableVO;
 import com.pig4cloud.pigx.common.core.util.R;
+import com.pig4cloud.pigx.common.security.annotation.HasPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -82,7 +82,7 @@ public class GenCreateTableController {
 	 */
 	@Operation(summary = "新增自动创建表管理", description = "新增自动创建表管理")
 	@PostMapping
-	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	@HasPermission("codegen_table_add")
 	public R save(@RequestBody GenCreateTableVO createTableVO) {
 		// 切换目标数据源
 		DynamicDataSourceContextHolder.push(createTableVO.getDsName());
@@ -100,7 +100,7 @@ public class GenCreateTableController {
 	 */
 	@Operation(summary = "修改自动创建表管理", description = "修改自动创建表管理")
 	@PutMapping
-	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	@HasPermission("codegen_table_add")
 	public R updateById(@RequestBody GenCreateTable createTable) {
 		return R.ok(createTableService.updateById(createTable));
 	}
@@ -112,7 +112,7 @@ public class GenCreateTableController {
 	 */
 	@Operation(summary = "通过id删除自动创建表管理", description = "通过id删除自动创建表管理")
 	@DeleteMapping("/{id}")
-	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	@HasPermission("codegen_table_add")
 	public R removeById(@PathVariable Long id) {
 		return R.ok(createTableService.removeById(id));
 	}
@@ -133,7 +133,7 @@ public class GenCreateTableController {
 	 */
 	@Operation(summary = "通过ids删除", description = "通过ids删除")
 	@DeleteMapping
-	@PreAuthorize("@pms.hasPermission('codegen_table_add')")
+	@HasPermission("codegen_table_add")
 	public R removeById(@RequestBody List<Long> ids) {
 		return R.ok(createTableService.removeByIds(ids));
 	}

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenGroupController.java

@@ -28,12 +28,12 @@ import com.pig4cloud.pigx.codegen.util.vo.TemplateGroupDTO;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
+import com.pig4cloud.pigx.common.security.annotation.HasPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -62,7 +62,7 @@ public class GenGroupController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
-    @PreAuthorize("@pms.hasPermission('codegen_group_view')")
+    @HasPermission("codegen_group_view")
     public R getgenGroupPage(Page page, GenGroupEntity genGroup) {
         LambdaQueryWrapper<GenGroupEntity> wrapper = Wrappers.<GenGroupEntity>lambdaQuery()
                 .like(genGroup.getId() != null, GenGroupEntity::getId, genGroup.getId())
@@ -78,7 +78,7 @@ public class GenGroupController {
      */
     @Operation(summary = "通过id查询", description = "通过id查询")
     @GetMapping("/{id}")
-    @PreAuthorize("@pms.hasPermission('codegen_group_view')")
+    @HasPermission("codegen_group_view")
     public R getById(@PathVariable("id") Long id) {
         return R.ok(genGroupService.getGroupVoById(id));
     }
@@ -92,7 +92,7 @@ public class GenGroupController {
     @Operation(summary = "新增模板分组", description = "新增模板分组")
     @SysLog("新增模板分组")
     @PostMapping
-    @PreAuthorize("@pms.hasPermission('codegen_group_add')")
+    @HasPermission("codegen_group_add")
     public R save(@RequestBody TemplateGroupDTO genTemplateGroup) {
         genGroupService.saveGenGroup(genTemplateGroup);
         return R.ok();
@@ -107,7 +107,7 @@ public class GenGroupController {
     @Operation(summary = "修改模板分组", description = "修改模板分组")
     @SysLog("修改模板分组")
     @PutMapping
-    @PreAuthorize("@pms.hasPermission('codegen_group_edit')")
+    @HasPermission("codegen_group_edit")
     public R updateById(@RequestBody GroupVO groupVo) {
         genGroupService.updateGroupAndTemplateById(groupVo);
         return R.ok();
@@ -122,7 +122,7 @@ public class GenGroupController {
     @Operation(summary = "通过id删除模板分组", description = "通过id删除模板分组")
     @SysLog("通过id删除模板分组")
     @DeleteMapping
-    @PreAuthorize("@pms.hasPermission('codegen_group_del')")
+    @HasPermission("codegen_group_del")
     public R removeById(@RequestBody Long[] ids) {
         genGroupService.delGroupAndTemplate(ids);
         return R.ok();
@@ -136,7 +136,7 @@ public class GenGroupController {
      */
     @ResponseExcel
     @GetMapping("/export")
-    @PreAuthorize("@pms.hasPermission('codegen_group_export')")
+    @HasPermission("codegen_group_export")
     public List<GenGroupEntity> export(GenGroupEntity genGroup) {
         return genGroupService.list(Wrappers.query(genGroup));
     }

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateController.java

@@ -27,13 +27,13 @@ import com.pig4cloud.pigx.codegen.service.GenTemplateService;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
+import com.pig4cloud.pigx.common.security.annotation.HasPermission;
 import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -62,7 +62,7 @@ public class GenTemplateController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
-    @PreAuthorize("@pms.hasPermission('codegen_template_view')")
+    @HasPermission("codegen_template_view")
     public R getGenTemplatePage(Page page, GenTemplateEntity genTemplate) {
         LambdaQueryWrapper<GenTemplateEntity> wrapper = Wrappers.<GenTemplateEntity>lambdaQuery()
                 .like(genTemplate.getId() != null, GenTemplateEntity::getId, genTemplate.getId())
@@ -78,7 +78,7 @@ public class GenTemplateController {
      */
     @Operation(summary = "查询全部", description = "查询全部")
     @GetMapping("/list")
-    @PreAuthorize("@pms.hasPermission('codegen_template_view')")
+    @HasPermission("codegen_template_view")
     public R list() {
         return R.ok(genTemplateService.list(Wrappers.<GenTemplateEntity>lambdaQuery()
                 .orderByDesc(GenTemplateEntity::getCreateTime)));
@@ -92,7 +92,7 @@ public class GenTemplateController {
      */
     @Operation(summary = "通过id查询", description = "通过id查询")
     @GetMapping("/{id}")
-    @PreAuthorize("@pms.hasPermission('codegen_template_view')")
+    @HasPermission("codegen_template_view")
     public R getById(@PathVariable("id") Long id) {
         return R.ok(genTemplateService.getById(id));
     }
@@ -107,7 +107,7 @@ public class GenTemplateController {
     @Operation(summary = "新增模板", description = "新增模板")
     @SysLog("新增模板")
     @PostMapping
-    @PreAuthorize("@pms.hasPermission('codegen_template_add')")
+    @HasPermission("codegen_template_add")
     public R save(@RequestBody GenTemplateEntity genTemplate) {
         return R.ok(genTemplateService.save(genTemplate));
     }
@@ -122,7 +122,7 @@ public class GenTemplateController {
     @Operation(summary = "修改模板", description = "修改模板")
     @SysLog("修改模板")
     @PutMapping
-    @PreAuthorize("@pms.hasPermission('codegen_template_edit')")
+    @HasPermission("codegen_template_edit")
     public R updateById(@RequestBody GenTemplateEntity genTemplate) {
         return R.ok(genTemplateService.updateById(genTemplate));
     }
@@ -136,7 +136,7 @@ public class GenTemplateController {
     @Operation(summary = "通过id删除模板", description = "通过id删除模板")
     @SysLog("通过id删除模板")
     @DeleteMapping
-    @PreAuthorize("@pms.hasPermission('codegen_template_del')")
+    @HasPermission("codegen_template_del")
     public R removeById(@RequestBody Long[] ids) {
         return R.ok(genTemplateService.removeBatchByIds(CollUtil.toList(ids)));
     }
@@ -149,7 +149,7 @@ public class GenTemplateController {
      */
     @ResponseExcel
     @GetMapping("/export")
-    @PreAuthorize("@pms.hasPermission('codegen_template_export')")
+    @HasPermission("codegen_template_export")
     public List<GenTemplateEntity> export(GenTemplateEntity genTemplate) {
         return genTemplateService.list(Wrappers.query(genTemplate));
     }
@@ -162,7 +162,7 @@ public class GenTemplateController {
      */
     @Operation(summary = "在线更新模板", description = "在线更新模板")
     @GetMapping("/online")
-    @PreAuthorize("@pms.hasPermission('codegen_template_view')")
+    @HasPermission("codegen_template_view")
     public R online() {
         return genTemplateService.onlineUpdate();
     }
@@ -173,7 +173,7 @@ public class GenTemplateController {
      */
     @Operation(summary = "在线检查模板", description = "在线检查模板")
     @GetMapping("/checkVersion")
-    @PreAuthorize("@pms.hasPermission('codegen_template_view')")
+    @HasPermission("codegen_template_view")
     public R checkVersion() {
         return genTemplateService.checkVersion();
     }

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateGroupController.java

@@ -26,12 +26,12 @@ import com.pig4cloud.pigx.codegen.service.GenTemplateGroupService;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
+import com.pig4cloud.pigx.common.security.annotation.HasPermission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -59,7 +59,7 @@ public class GenTemplateGroupController {
 	 */
 	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page")
-	@PreAuthorize("@pms.hasPermission('codegen_templateGroup_view')")
+	@HasPermission("codegen_templateGroup_view")
 	public R getgenTemplateGroupPage(Page page, GenTemplateGroupEntity genTemplateGroup) {
 		LambdaQueryWrapper<GenTemplateGroupEntity> wrapper = Wrappers.lambdaQuery();
 		return R.ok(genTemplateGroupService.page(page, wrapper));
@@ -72,7 +72,7 @@ public class GenTemplateGroupController {
 	 */
 	@Operation(summary = "通过id查询", description = "通过id查询")
 	@GetMapping("/{groupId}")
-	@PreAuthorize("@pms.hasPermission('codegen_templateGroup_view')")
+	@HasPermission("codegen_templateGroup_view")
 	public R getById(@PathVariable("groupId") Long groupId) {
 		return R.ok(genTemplateGroupService.getById(groupId));
 	}
@@ -85,7 +85,7 @@ public class GenTemplateGroupController {
 	@Operation(summary = "新增模板分组关联表", description = "新增模板分组关联表")
 	@SysLog("新增模板分组关联表")
 	@PostMapping
-	@PreAuthorize("@pms.hasPermission('codegen_templateGroup_add')")
+	@HasPermission("codegen_templateGroup_add")
 	public R save(@RequestBody GenTemplateGroupEntity genTemplateGroup) {
 		return R.ok(genTemplateGroupService.save(genTemplateGroup));
 	}
@@ -98,7 +98,7 @@ public class GenTemplateGroupController {
 	@Operation(summary = "修改模板分组关联表", description = "修改模板分组关联表")
 	@SysLog("修改模板分组关联表")
 	@PutMapping
-	@PreAuthorize("@pms.hasPermission('codegen_templateGroup_edit')")
+	@HasPermission("codegen_templateGroup_edit")
 	public R updateById(@RequestBody GenTemplateGroupEntity genTemplateGroup) {
 		return R.ok(genTemplateGroupService.updateById(genTemplateGroup));
 	}
@@ -111,7 +111,7 @@ public class GenTemplateGroupController {
 	@Operation(summary = "通过id删除模板分组关联表", description = "通过id删除模板分组关联表")
 	@SysLog("通过id删除模板分组关联表")
 	@DeleteMapping
-	@PreAuthorize("@pms.hasPermission('codegen_templateGroup_del')")
+	@HasPermission("codegen_templateGroup_del")
 	public R removeById(@RequestBody Long[] ids) {
 		return R.ok(genTemplateGroupService.removeBatchByIds(CollUtil.toList(ids)));
 	}
@@ -123,7 +123,7 @@ public class GenTemplateGroupController {
 	 */
 	@ResponseExcel
 	@GetMapping("/export")
-	@PreAuthorize("@pms.hasPermission('codegen_templateGroup_export')")
+	@HasPermission("codegen_templateGroup_export")
 	public List<GenTemplateGroupEntity> export(GenTemplateGroupEntity genTemplateGroup) {
 		return genTemplateGroupService.list(Wrappers.query(genTemplateGroup));
 	}