diff --git a/backend/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/backend/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java index 23fa2cfe..d8b0621a 100644 --- a/backend/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java +++ b/backend/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java @@ -26,10 +26,10 @@ public class MimeTypeUtils { public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"}; public static final String[] DEFAULT_ALLOWED_EXTENSION = { - // 图片 + // 图片（不含 svg，避免脚本型 XSS） "bmp", "gif", "jpg", "jpeg", "png", - // word excel powerpoint - "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", + // word excel powerpoint（不含 html/htm） + "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", // 压缩文件 "rar", "zip", "gz", "bz2", // 视频格式 diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java index 15c1e414..f057fc35 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java @@ -42,7 +42,7 @@ public class AssessmentApprovalController extends BaseController { /** * 查询班主任考核审核列表 */ - // @SaCheckPermission("bzrkh:assessmentApproval:list") + @SaCheckPermission("bzrkh:assessmentApproval:list") @GetMapping("/list") public TableDataInfo list(AssessmentApprovalQueryBo bo, PageQuery pageQuery) { return assessmentApprovalService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class AssessmentApprovalController extends BaseController { /** * 获取考核审核详情 */ - // @SaCheckPermission("bzrkh:assessmentApproval:query") + @SaCheckPermission("bzrkh:assessmentApproval:query") @GetMapping("/detail") public R getApprovalDetail( @RequestParam("planId") @NotNull(message = "计划ID不能为空") Long planId, @@ -65,7 +65,7 @@ public class AssessmentApprovalController extends BaseController { /** * 提交考核审核 */ - // @SaCheckPermission("bzrkh:assessmentApproval:approve") + @SaCheckPermission("bzrkh:assessmentApproval:approve") @Log(title = "班主任考核审核", businessType = BusinessType.UPDATE) @PostMapping("/submit") public R submitApproval(@RequestBody @Validated AssessmentApprovalSubmitBo bo) { @@ -77,7 +77,7 @@ public class AssessmentApprovalController extends BaseController { /** * 批量审核通过 */ - // @SaCheckPermission("bzrkh:assessmentApproval:approve") + @SaCheckPermission("bzrkh:assessmentApproval:approve") @Log(title = "班主任考核审核", businessType = BusinessType.UPDATE) @PostMapping("/batchApprove") public R batchApprove(@RequestBody BatchApprovalBo bo) { @@ -89,7 +89,7 @@ public class AssessmentApprovalController extends BaseController { /** * 批量审核拒绝 */ - // @SaCheckPermission("bzrkh:assessmentApproval:approve") + @SaCheckPermission("bzrkh:assessmentApproval:approve") @Log(title = "班主任考核审核", businessType = BusinessType.UPDATE) @PostMapping("/batchReject") public R batchReject(@Validated @RequestBody BatchApprovalBo bo) { @@ -102,7 +102,7 @@ public class AssessmentApprovalController extends BaseController { * 删除异常的审批记录（管理员专用） * 用于清理审批列表中显示但实际已被删除的异常数据 */ - // @SaCheckPermission("bzrkh:assessmentApproval:delete") + @SaCheckPermission("bzrkh:assessmentApproval:delete") @Log(title = "班主任考核审核", businessType = BusinessType.DELETE) @DeleteMapping("/deleteAbnormalRecord") public R deleteAbnormalRecord(@RequestParam("planId") Long planId, @RequestParam("evaluatedUserId") Long evaluatedUserId) { @@ -113,7 +113,7 @@ public class AssessmentApprovalController extends BaseController { /** * 获取考核方案下拉选项 */ - // @SaCheckPermission("bzrkh:assessmentApproval:list") + @SaCheckPermission("bzrkh:assessmentApproval:list") @GetMapping("/schemeOptions") public R> getSchemeOptions() { List options = assessmentApprovalService.getSchemeOptions(); @@ -123,7 +123,7 @@ public class AssessmentApprovalController extends BaseController { /** * 导出班主任考核审核数据 */ - // @SaCheckPermission("bzrkh:assessmentApproval:export") + @SaCheckPermission("bzrkh:assessmentApproval:export") @Log(title = "班主任考核审核", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(AssessmentApprovalQueryBo bo, HttpServletResponse response) { @@ -134,7 +134,7 @@ public class AssessmentApprovalController extends BaseController { /** * 获取评价等级统计数据 */ - // @SaCheckPermission("bzrkh:assessmentApproval:query") + @SaCheckPermission("bzrkh:assessmentApproval:query") @GetMapping("/evaluationStats") public R getEvaluationLevelStats(@RequestParam("planId") @NotNull(message = "计划ID不能为空") Long planId) { EvaluationLevelStatsVo stats = assessmentApprovalService.getEvaluationLevelStats(planId); diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java index b09ff7bf..8f751222 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java @@ -39,7 +39,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { /** * 查询班主任考核指标体系列表 */ - // @SaCheckPermission("bzrkh:assessmentIndicator:list") + @SaCheckPermission("bzrkh:assessmentIndicator:list") @GetMapping("/list") public TableDataInfo list(BmzrAssessmentIndicatorBo bo, PageQuery pageQuery) { return bmzrAssessmentIndicatorService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { /** * 查询班主任考核指标体系树形结构（用于父级选择） */ - // @SaCheckPermission("bzrkh:assessmentIndicator:list") + @SaCheckPermission("bzrkh:assessmentIndicator:list") @GetMapping("/treeselect") public R> treeselect(BmzrAssessmentIndicatorBo bo) { List list = bmzrAssessmentIndicatorService.queryTreeList(bo); @@ -58,7 +58,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { /** * 导出班主任考核指标体系列表 */ - // @SaCheckPermission("bzrkh:assessmentIndicator:export") + @SaCheckPermission("bzrkh:assessmentIndicator:export") @Log(title = "班主任考核指标体系", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(BmzrAssessmentIndicatorBo bo, HttpServletResponse response) { @@ -71,7 +71,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("bzrkh:assessmentIndicator:query") + @SaCheckPermission("bzrkh:assessmentIndicator:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentIndicatorService.queryById(id)); @@ -80,7 +80,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { /** * 新增班主任考核指标体系 */ - // @SaCheckPermission("bzrkh:assessmentIndicator:add") + @SaCheckPermission("bzrkh:assessmentIndicator:add") @Log(title = "班主任考核指标体系", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -91,7 +91,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { /** * 修改班主任考核指标体系 */ - // @SaCheckPermission("bzrkh:assessmentIndicator:edit") + @SaCheckPermission("bzrkh:assessmentIndicator:edit") @Log(title = "班主任考核指标体系", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -104,7 +104,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("bzrkh:assessmentIndicator:remove") + @SaCheckPermission("bzrkh:assessmentIndicator:remove") @Log(title = "班主任考核指标体系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java index e2d0f0e1..2f0a10bf 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java @@ -39,7 +39,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { /** * 查询班主任考核指标类型列表 */ - // @SaCheckPermission("bzrkh:assessmentIndicatorType:list") + @SaCheckPermission("bzrkh:assessmentIndicatorType:list") @GetMapping("/list") public TableDataInfo list(BmzrAssessmentIndicatorTypeBo bo, PageQuery pageQuery) { return bmzrAssessmentIndicatorTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { /** * 查询所有班主任考核指标类型列表(包括已逻辑删除的) */ - // @SaCheckPermission("bzrkh:assessmentIndicatorType:list") + @SaCheckPermission("bzrkh:assessmentIndicatorType:list") @GetMapping("/listAllIncludeDeleted") public R> listAllIncludeDeleted(BmzrAssessmentIndicatorTypeBo bo) { List list = bmzrAssessmentIndicatorTypeService.queryListWithDeleted(bo); @@ -58,7 +58,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { /** * 导出班主任考核指标类型列表 */ - // @SaCheckPermission("bzrkh:assessmentIndicatorType:export") + @SaCheckPermission("bzrkh:assessmentIndicatorType:export") @Log(title = "班主任考核指标类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(BmzrAssessmentIndicatorTypeBo bo, HttpServletResponse response) { @@ -71,7 +71,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("bzrkh:assessmentIndicatorType:query") + @SaCheckPermission("bzrkh:assessmentIndicatorType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentIndicatorTypeService.queryById(id)); @@ -80,7 +80,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { /** * 新增班主任考核指标类型 */ - // @SaCheckPermission("bzrkh:assessmentIndicatorType:add") + @SaCheckPermission("bzrkh:assessmentIndicatorType:add") @Log(title = "班主任考核指标类型", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -91,7 +91,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { /** * 修改班主任考核指标类型 */ - // @SaCheckPermission("bzrkh:assessmentIndicatorType:edit") + @SaCheckPermission("bzrkh:assessmentIndicatorType:edit") @Log(title = "班主任考核指标类型", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -104,7 +104,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("bzrkh:assessmentIndicatorType:remove") + @SaCheckPermission("bzrkh:assessmentIndicatorType:remove") @Log(title = "班主任考核指标类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java index e65bed74..7e190745 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java @@ -39,7 +39,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 查询班主任考核计划列表 */ - // @SaCheckPermission("bzrkh:assessmentPlan:list") + @SaCheckPermission("bzrkh:assessmentPlan:list") @GetMapping("/list") public TableDataInfo list(BmzrAssessmentPlanBo bo, PageQuery pageQuery) { return bmzrAssessmentPlanService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 导出班主任考核计划列表 */ - // @SaCheckPermission("bzrkh:assessmentPlan:export") + @SaCheckPermission("bzrkh:assessmentPlan:export") @Log(title = "班主任考核计划", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(BmzrAssessmentPlanBo bo, HttpServletResponse response) { @@ -59,7 +59,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 获取班主任考核计划详细信息 */ - // @SaCheckPermission("bzrkh:assessmentPlan:query") + @SaCheckPermission("bzrkh:assessmentPlan:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentPlanService.queryById(id)); @@ -68,7 +68,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 新增班主任考核计划 */ - // @SaCheckPermission("bzrkh:assessmentPlan:add") + @SaCheckPermission("bzrkh:assessmentPlan:add") @Log(title = "班主任考核计划", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -79,7 +79,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 修改班主任考核计划 */ - // @SaCheckPermission("bzrkh:assessmentPlan:edit") + @SaCheckPermission("bzrkh:assessmentPlan:edit") @Log(title = "班主任考核计划", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -90,7 +90,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 删除班主任考核计划 */ - // @SaCheckPermission("bzrkh:assessmentPlan:remove") + @SaCheckPermission("bzrkh:assessmentPlan:remove") @Log(title = "班主任考核计划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -100,7 +100,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 修改考核计划状态 */ - // @SaCheckPermission("bzrkh:assessmentPlan:edit") + @SaCheckPermission("bzrkh:assessmentPlan:edit") @Log(title = "班主任考核计划", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody BmzrAssessmentPlanBo bo) { @@ -110,7 +110,7 @@ public class BmzrAssessmentPlanController extends BaseController { /** * 获取可用的考核方案选项 */ - // @SaCheckPermission("bzrkh:assessmentPlan:list") + @SaCheckPermission("bzrkh:assessmentPlan:list") @GetMapping("/schemes/options") public R> getAvailableSchemes() { return R.ok(bmzrAssessmentPlanService.getAvailableSchemes()); diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java index 98bb6d1f..014e3ee0 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java @@ -41,7 +41,7 @@ public class BmzrAssessmentSchemeController extends BaseController { /** * 查询班主任考核方案列表 */ - // @SaCheckPermission("bzrkh:assessmentScheme:list") + @SaCheckPermission("bzrkh:assessmentScheme:list") @GetMapping("/list") public TableDataInfo list(BmzrAssessmentSchemeBo bo, PageQuery pageQuery) { return bmzrAssessmentSchemeService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class BmzrAssessmentSchemeController extends BaseController { /** * 导出班主任考核方案列表 */ - // @SaCheckPermission("bzrkh:assessmentScheme:export") + @SaCheckPermission("bzrkh:assessmentScheme:export") @Log(title = "班主任考核方案", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(BmzrAssessmentSchemeBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class BmzrAssessmentSchemeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("bzrkh:assessmentScheme:query") + @SaCheckPermission("bzrkh:assessmentScheme:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentSchemeService.queryById(id)); @@ -72,7 +72,7 @@ public class BmzrAssessmentSchemeController extends BaseController { /** * 新增班主任考核方案 */ - // @SaCheckPermission("bzrkh:assessmentScheme:add") + @SaCheckPermission("bzrkh:assessmentScheme:add") @Log(title = "班主任考核方案", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -83,7 +83,7 @@ public class BmzrAssessmentSchemeController extends BaseController { /** * 修改班主任考核方案 */ - // @SaCheckPermission("bzrkh:assessmentScheme:edit") + @SaCheckPermission("bzrkh:assessmentScheme:edit") @Log(title = "班主任考核方案", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -94,7 +94,7 @@ public class BmzrAssessmentSchemeController extends BaseController { /** * 删除班主任考核方案 */ - // @SaCheckPermission("bzrkh:assessmentScheme:remove") + @SaCheckPermission("bzrkh:assessmentScheme:remove") @Log(title = "班主任考核方案", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java index 650748a4..754b1908 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java @@ -39,7 +39,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { /** * 查询班主任考核方案指标关联列表 */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list") @GetMapping("/list") public TableDataInfo list(BmzrAssessmentSchemeIndicatorBo bo, PageQuery pageQuery) { @@ -49,7 +49,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { /** * 根据方案ID查询指标关联列表（无分页） */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list") @GetMapping("/listBySchemeId/{schemeId}") public R> listBySchemeId(@PathVariable("schemeId") Long schemeId) { List list = bmzrAssessmentSchemeIndicatorService.queryBySchemeId(schemeId); @@ -59,7 +59,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { /** * 导出班主任考核方案指标关联列表 */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:export") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:export") @Log(title = "班主任考核方案指标关联", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(BmzrAssessmentSchemeIndicatorBo bo, HttpServletResponse response) { @@ -72,7 +72,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:query") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentSchemeIndicatorService.queryById(id)); @@ -81,7 +81,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { /** * 新增班主任考核方案指标关联 */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:add") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:add") @Log(title = "班主任考核方案指标关联", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -92,7 +92,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { /** * 修改班主任考核方案指标关联 */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit") @Log(title = "班主任考核方案指标关联", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -105,7 +105,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:remove") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:remove") @Log(title = "班主任考核方案指标关联", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -118,7 +118,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { * @param schemeId 方案ID * @param indicatorList 指标列表 */ - // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit") + @SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit") @Log(title = "批量保存方案指标关联", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batchSave/{schemeId}") diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java index 864b2c44..c8b90aeb 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java @@ -42,7 +42,7 @@ public class TeacherAssessmentController extends BaseController { /** * 查询班主任管理的班级列表 */ - // @SaCheckPermission("bzrkh:teacherAssessment:list") + @SaCheckPermission("bzrkh:teacherAssessment:list") @GetMapping("/classes") public R> getTeacherClasses(@RequestParam(value = "teacherId", required = false) Long teacherId) { // 如果没有传入teacherId，则使用当前登录用户ID @@ -54,7 +54,7 @@ public class TeacherAssessmentController extends BaseController { /** * 查询班主任考核计划列表 */ - // @SaCheckPermission("bzrkh:teacherAssessment:list") + @SaCheckPermission("bzrkh:teacherAssessment:list") @GetMapping("/plans") public TableDataInfo getTeacherAssessmentPlans(TeacherAssessmentQueryBo bo, PageQuery pageQuery) { @@ -68,7 +68,7 @@ public class TeacherAssessmentController extends BaseController { /** * 提交考核 */ - // @SaCheckPermission("bzrkh:teacherAssessment:submit") + @SaCheckPermission("bzrkh:teacherAssessment:submit") @Log(title = "班主任考核管理", businessType = BusinessType.UPDATE) @PostMapping("/submit") public R submitAssessment(@RequestBody TeacherAssessmentSubmitRequest request) { @@ -90,7 +90,7 @@ public class TeacherAssessmentController extends BaseController { /** * 撤销考核提交 */ - // @SaCheckPermission("bzrkh:teacherAssessment:withdraw") + @SaCheckPermission("bzrkh:teacherAssessment:withdraw") @Log(title = "班主任考核管理", businessType = BusinessType.UPDATE) @PostMapping("/withdraw") public R withdrawAssessment(@RequestBody TeacherAssessmentSubmitRequest request) { @@ -103,7 +103,7 @@ public class TeacherAssessmentController extends BaseController { /** * 查看考核详情 */ - // @SaCheckPermission("bzrkh:teacherAssessment:detail") + @SaCheckPermission("bzrkh:teacherAssessment:detail") @GetMapping("/detail") public R getAssessmentDetail(@RequestParam("planId") Long planId, @RequestParam("classId") Long classId) { Long teacherId = LoginHelper.getUserId(); @@ -114,7 +114,7 @@ public class TeacherAssessmentController extends BaseController { /** * 获取考核提交详情数据 */ - // @SaCheckPermission("bzrkh:teacherAssessment:detail") + @SaCheckPermission("bzrkh:teacherAssessment:detail") @GetMapping("/submitDetail") public R getAssessmentSubmitDetail(@RequestParam("planId") Long planId, @RequestParam("classId") Long classId) { Long teacherId = LoginHelper.getUserId(); @@ -125,7 +125,7 @@ public class TeacherAssessmentController extends BaseController { /** * 提交考核评分数据 */ - // @SaCheckPermission("bzrkh:teacherAssessment:submit") + @SaCheckPermission("bzrkh:teacherAssessment:submit") @Log(title = "班主任考核管理", businessType = BusinessType.INSERT) @PostMapping("/submitScore") public R submitAssessmentScore(@RequestBody AssessmentSubmitBo bo) { @@ -156,7 +156,7 @@ public class TeacherAssessmentController extends BaseController { /** * 查询班级学生违纪记录和奖励记录 */ - // @SaCheckPermission("bzrkh:teacherAssessment:detail") + @SaCheckPermission("bzrkh:teacherAssessment:detail") @GetMapping("/classStudentRecords") public R getClassStudentRecords(@RequestParam("classId") Long classId, @RequestParam("planId") Long planId) { ClassStudentRecordsVo records = teacherAssessmentService.queryClassStudentRecords(classId, planId); diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java index bd6e4e29..fd9da7a9 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java @@ -44,7 +44,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询审批记录列表 */ - // @SaCheckPermission("cw:approval:list") + @SaCheckPermission("cw:approval:list") @GetMapping("/list") public TableDataInfo list(CwApprovalRecordBo bo, PageQuery pageQuery) { return approvalRecordService.queryPageList(bo, pageQuery); @@ -53,7 +53,7 @@ public class CwApprovalRecordController extends BaseController { /** * 导出审批记录列表 */ - // @SaCheckPermission("cw:approval:export") + @SaCheckPermission("cw:approval:export") @Log(title = "审批记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CwApprovalRecordBo bo, HttpServletResponse response) { @@ -64,7 +64,7 @@ public class CwApprovalRecordController extends BaseController { /** * 获取审批记录详细信息 */ - // @SaCheckPermission("cw:approval:query") + @SaCheckPermission("cw:approval:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(approvalRecordService.queryById(id)); @@ -73,7 +73,7 @@ public class CwApprovalRecordController extends BaseController { /** * 根据申报ID查询审批记录列表 */ - // @SaCheckPermission("cw:approval:query") + @SaCheckPermission("cw:approval:query") @GetMapping("/byApplication/{applicationId}") public R> getByApplicationId(@PathVariable("applicationId") Long applicationId) { List list = approvalRecordService.queryByApplicationId(applicationId); @@ -83,7 +83,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询当前用户待审批记录列表 */ - // @SaCheckPermission("cw:approval:list") + @SaCheckPermission("cw:approval:list") @GetMapping("/pending") public R> getPendingList() { List list = approvalRecordService.queryPendingByCurrentUser(); @@ -93,7 +93,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询当前用户已审批记录列表 */ - // @SaCheckPermission("cw:approval:list") + @SaCheckPermission("cw:approval:list") @GetMapping("/my") public R> getMyApprovedList() { List list = approvalRecordService.queryApprovedByCurrentUser(); @@ -103,7 +103,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询部门待审批申报列表 */ - // @SaCheckPermission("cw:approval:dept") + @SaCheckPermission("cw:approval:dept") @GetMapping("/dept/pending") public R> getDeptPendingList() { List list = approvalRecordService.queryDeptPendingApprovals(); @@ -113,7 +113,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询财务待审批申报列表 */ - // @SaCheckPermission("cw:approval:finance") + @SaCheckPermission("cw:approval:finance") @GetMapping("/finance/pending") public R> getFinancePendingList() { List list = approvalRecordService.queryFinancePendingApprovals(); @@ -123,7 +123,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询财务已审批申报列表 */ - // @SaCheckPermission("cw:approval:finance") + @SaCheckPermission("cw:approval:finance") @GetMapping("/finance/approved") public R> getFinanceApprovedList() { List list = approvalRecordService.queryFinanceApprovedRecords(); @@ -133,7 +133,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询学院领导待审批申报列表 */ - // @SaCheckPermission("cw:approval:leader") + @SaCheckPermission("cw:approval:leader") @GetMapping("/leader/pending") public R> getLeaderPendingList() { List list = approvalRecordService.queryLeaderPendingApprovals(); @@ -143,7 +143,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询学院领导已审批申报列表 */ - // @SaCheckPermission("cw:approval:leader") + @SaCheckPermission("cw:approval:leader") @GetMapping("/leader/approved") public R> getLeaderApprovedList() { List list = approvalRecordService.queryLeaderApprovedApprovals(); @@ -153,7 +153,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询所有待审批申报列表（超级管理员专用） */ - // @SaCheckPermission("cw:approval:list") + @SaCheckPermission("cw:approval:list") @GetMapping("/all/pending") public R> getAllPendingList() { List list = approvalRecordService.queryAllPendingApprovals(); @@ -163,7 +163,7 @@ public class CwApprovalRecordController extends BaseController { /** * 新增审批记录 */ - // @SaCheckPermission("cw:approval:add") + @SaCheckPermission("cw:approval:add") @Log(title = "审批记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -174,7 +174,7 @@ public class CwApprovalRecordController extends BaseController { /** * 修改审批记录 */ - // @SaCheckPermission("cw:approval:edit") + @SaCheckPermission("cw:approval:edit") @Log(title = "审批记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -185,7 +185,7 @@ public class CwApprovalRecordController extends BaseController { /** * 删除审批记录 */ - // @SaCheckPermission("cw:approval:remove") + @SaCheckPermission("cw:approval:remove") @Log(title = "审批记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -195,7 +195,7 @@ public class CwApprovalRecordController extends BaseController { /** * 创建审批流程 */ - // @SaCheckPermission("cw:approval:create") + @SaCheckPermission("cw:approval:create") @Log(title = "创建审批流程", businessType = BusinessType.INSERT) @PostMapping("/create/{applicationId}") public R createProcess(@PathVariable("applicationId") Long applicationId, @RequestParam("applicationNo") String applicationNo) { @@ -213,7 +213,7 @@ public class CwApprovalRecordController extends BaseController { /** * 审批操作 */ - // @SaCheckPermission("cw:approval:process") + @SaCheckPermission("cw:approval:process") @Log(title = "审批操作", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/process") @@ -227,7 +227,7 @@ public class CwApprovalRecordController extends BaseController { /** * 部门审批 */ - // @SaCheckPermission("cw:approval:dept") + @SaCheckPermission("cw:approval:dept") @Log(title = "部门审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/dept") @@ -240,7 +240,7 @@ public class CwApprovalRecordController extends BaseController { /** * 查询当前审批节点 */ - // @SaCheckPermission("cw:approval:query") + @SaCheckPermission("cw:approval:query") @GetMapping("/current/{applicationId}") public R getCurrentNode(@PathVariable("applicationId") Long applicationId) { CwApprovalRecordVo record = approvalRecordService.queryCurrentApprovalNode(applicationId); @@ -250,7 +250,7 @@ public class CwApprovalRecordController extends BaseController { /** * 检查审批权限 */ - // @SaCheckPermission("cw:approval:check") + @SaCheckPermission("cw:approval:check") @GetMapping("/check/{applicationId}") public R checkPermission(@PathVariable("applicationId") Long applicationId, @RequestParam("nodeCode") String nodeCode) { Boolean hasPermission = approvalRecordService.checkApprovalPermission(applicationId, nodeCode); @@ -260,7 +260,7 @@ public class CwApprovalRecordController extends BaseController { /** * 检查部门审批权限 */ - // @SaCheckPermission("cw:approval:dept") + @SaCheckPermission("cw:approval:dept") @GetMapping("/check/dept/{applicationId}") public R checkDeptPermission(@PathVariable("applicationId") Long applicationId) { Boolean hasPermission = approvalRecordService.checkDeptApprovalPermission(applicationId); @@ -270,7 +270,7 @@ public class CwApprovalRecordController extends BaseController { /** * 获取可选审批人列表（院领导） */ - // @SaCheckPermission("cw:approval:finance") + @SaCheckPermission("cw:approval:finance") @GetMapping("/approvers/{applicationId}") public R>> getAvailableApprovers(@PathVariable("applicationId") Long applicationId) { List> approvers = approvalRecordService.getAvailableApprovers(applicationId); @@ -280,7 +280,7 @@ public class CwApprovalRecordController extends BaseController { /** * 分管领导审批 */ - // @SaCheckPermission("cw:approval:leader") + @SaCheckPermission("cw:approval:leader") @PostMapping("/leader") public R leaderApproval(@RequestParam("applicationId") Long applicationId, @RequestParam("approveAction") String approveAction, @@ -305,7 +305,7 @@ public class CwApprovalRecordController extends BaseController { /** * 财务审批 */ - // @SaCheckPermission("cw:approval:finance") + @SaCheckPermission("cw:approval:finance") @PostMapping("/finance") public R financeApproval(@RequestParam("applicationId") Long applicationId, @RequestParam("approveAction") String approveAction, diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwBudgetExecutionImportController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwBudgetExecutionImportController.java index 634431e4..8a1e61ae 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwBudgetExecutionImportController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwBudgetExecutionImportController.java @@ -30,7 +30,7 @@ public class CwBudgetExecutionImportController extends BaseController { * @param file 导入文件 */ @Log(title = "预算执行导入", businessType = BusinessType.IMPORT) - //@SaCheckPermission("cw:budgetExecutionImport:import") + @SaCheckPermission("cw:budgetExecutionImport:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file) throws Exception { try (InputStream is = file.getInputStream()) { @@ -45,7 +45,7 @@ public class CwBudgetExecutionImportController extends BaseController { /** * 获取导入模板（导出空模板） */ - //@SaCheckPermission("cw:budgetExecutionImport:import") + @SaCheckPermission("cw:budgetExecutionImport:import") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { ExcelUtil.exportExcel(java.util.List.of(), "预算执行导入模板", CwBudgetExecutionImportVo.class, response); @@ -54,7 +54,7 @@ public class CwBudgetExecutionImportController extends BaseController { /** * 查询导入批次分页列表 */ - //@SaCheckPermission("cw:budgetExecutionImport:list") + @SaCheckPermission("cw:budgetExecutionImport:list") @GetMapping("/batch/list") public org.dromara.common.mybatis.core.page.TableDataInfo batchList(org.dromara.common.mybatis.core.page.PageQuery pageQuery) { var service = org.dromara.common.core.utils.SpringUtils.getBean(org.dromara.cw.service.ICwBudgetExecutionImportService.class); @@ -64,7 +64,7 @@ public class CwBudgetExecutionImportController extends BaseController { /** * 查询导入明细分页列表 */ - //@SaCheckPermission("cw:budgetExecutionImport:list") + @SaCheckPermission("cw:budgetExecutionImport:list") @GetMapping("/item/list") public org.dromara.common.mybatis.core.page.TableDataInfo itemList(@RequestParam("batchId") Long batchId, org.dromara.common.mybatis.core.page.PageQuery pageQuery) { var service = org.dromara.common.core.utils.SpringUtils.getBean(org.dromara.cw.service.ICwBudgetExecutionImportService.class); diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java index b36910cf..57818b9e 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java @@ -40,7 +40,7 @@ public class CwMonitoringManagementController extends BaseController { * 查询绩效自评列表（运行监控管理） * 财务管理员和学校领导可以看到所有人的数据 */ - //@SaCheckPermission("cw:monitoringManagement:list") + @SaCheckPermission("cw:monitoringManagement:list") @GetMapping("/list") public TableDataInfo list(CwProjectPerformanceSelfEvaluationBo bo, PageQuery pageQuery) { return monitoringManagementService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CwMonitoringManagementController extends BaseController { /** * 获取绩效自评详细信息（运行监控管理） */ - //@SaCheckPermission("cw:monitoringManagement:query") + @SaCheckPermission("cw:monitoringManagement:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(monitoringManagementService.queryById(id)); @@ -58,7 +58,7 @@ public class CwMonitoringManagementController extends BaseController { /** * 锁定绩效自评（单个） */ - //@SaCheckPermission("cw:monitoringManagement:lock") + @SaCheckPermission("cw:monitoringManagement:lock") @Log(title = "运行监控管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/lock/{id}") @@ -69,7 +69,7 @@ public class CwMonitoringManagementController extends BaseController { /** * 解锁绩效自评（单个） */ - //@SaCheckPermission("cw:monitoringManagement:unlock") + @SaCheckPermission("cw:monitoringManagement:unlock") @Log(title = "运行监控管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/unlock/{id}") @@ -80,7 +80,7 @@ public class CwMonitoringManagementController extends BaseController { /** * 批量锁定绩效自评 */ - //@SaCheckPermission("cw:monitoringManagement:lock") + @SaCheckPermission("cw:monitoringManagement:lock") @Log(title = "运行监控管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/lock/batch") @@ -91,7 +91,7 @@ public class CwMonitoringManagementController extends BaseController { /** * 批量解锁绩效自评 */ - //@SaCheckPermission("cw:monitoringManagement:unlock") + @SaCheckPermission("cw:monitoringManagement:unlock") @Log(title = "运行监控管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/unlock/batch") diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java index 2ecfdfb9..516a71f8 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java @@ -35,7 +35,7 @@ public class CwPerformanceMonitoringController extends BaseController { /** * 根据自评ID查询运行监控列表 */ - //@SaCheckPermission("cw:performanceMonitoring:query") + @SaCheckPermission("cw:performanceMonitoring:query") @GetMapping("/list/{evaluationId}") public R> listByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(performanceMonitoringService.queryByEvaluationId(evaluationId)); @@ -44,7 +44,7 @@ public class CwPerformanceMonitoringController extends BaseController { /** * 获取绩效运行监控详细信息 */ - //@SaCheckPermission("cw:performanceMonitoring:query") + @SaCheckPermission("cw:performanceMonitoring:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(performanceMonitoringService.queryById(id)); @@ -53,7 +53,7 @@ public class CwPerformanceMonitoringController extends BaseController { /** * 新增绩效运行监控 */ - //@SaCheckPermission("cw:performanceMonitoring:add") + @SaCheckPermission("cw:performanceMonitoring:add") @Log(title = "绩效运行监控", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -64,7 +64,7 @@ public class CwPerformanceMonitoringController extends BaseController { /** * 修改绩效运行监控 */ - //@SaCheckPermission("cw:performanceMonitoring:edit") + @SaCheckPermission("cw:performanceMonitoring:edit") @Log(title = "绩效运行监控", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -75,7 +75,7 @@ public class CwPerformanceMonitoringController extends BaseController { /** * 删除绩效运行监控 */ - //@SaCheckPermission("cw:performanceMonitoring:remove") + @SaCheckPermission("cw:performanceMonitoring:remove") @Log(title = "绩效运行监控", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") public R remove(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java index 99c08089..156cadb1 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java @@ -43,7 +43,7 @@ public class CwProjectApplicationController extends BaseController { /** * 查询项目预算申报列表 */ - //@SaCheckPermission("cw:application:list") + @SaCheckPermission("cw:application:list") @GetMapping("/list") public TableDataInfo list(CwProjectApplicationBo bo, PageQuery pageQuery) { return projectApplicationService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class CwProjectApplicationController extends BaseController { /** * 查询我的申报列表 */ - //@SaCheckPermission("cw:application:list") + @SaCheckPermission("cw:application:list") @GetMapping("/myList") public R> myList(@RequestParam(value = "year", required = false) Integer year) { Long applicantId = LoginHelper.getUserId(); @@ -63,7 +63,7 @@ public class CwProjectApplicationController extends BaseController { /** * 查询部门申报列表 */ - //@SaCheckPermission("cw:application:list") + @SaCheckPermission("cw:application:list") @GetMapping("/deptList") public R> deptList(@RequestParam("departmentId") Long departmentId, @RequestParam(value = "year", required = false) Integer year) { List list = projectApplicationService.queryDeptApplications(departmentId, year); @@ -73,7 +73,7 @@ public class CwProjectApplicationController extends BaseController { /** * 查询待我审批的申报列表 */ - //@SaCheckPermission("cw:approvalRecord:list") + @SaCheckPermission("cw:approvalRecord:list") @GetMapping("/pendingList") public R> pendingList() { Long approverId = LoginHelper.getUserId(); @@ -84,7 +84,7 @@ public class CwProjectApplicationController extends BaseController { /** * 导出项目申报信息 */ - //@SaCheckPermission("cw:application:export") + @SaCheckPermission("cw:application:export") @Log(title = "项目申报", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CwProjectApplicationBo bo, HttpServletResponse response) { @@ -95,7 +95,7 @@ public class CwProjectApplicationController extends BaseController { /** * 项目预算统计 - 获取项目清单 */ - //@SaCheckPermission("cw:statistics:list") + @SaCheckPermission("cw:statistics:list") @GetMapping("/statistics/list") public TableDataInfo getStatisticsList(CwProjectApplicationBo bo, PageQuery pageQuery) { log.info("🚀 [统计页面-项目清单] Controller接收到统计查询请求"); @@ -113,7 +113,7 @@ public class CwProjectApplicationController extends BaseController { /** * 项目预算统计 - 状态统计 */ - //@SaCheckPermission("cw:statistics:list") + @SaCheckPermission("cw:statistics:list") @GetMapping("/statistics/status") public R> getStatusStatistics(@RequestParam(value = "budgetYear", required = false) String budgetYear) { Map statistics = projectApplicationService.getStatusStatistics(budgetYear); @@ -123,7 +123,7 @@ public class CwProjectApplicationController extends BaseController { /** * 项目预算统计 - 部门预算汇总 */ - //@SaCheckPermission("cw:statistics:list") + @SaCheckPermission("cw:statistics:list") @GetMapping("/statistics/department") public R>> getDepartmentStatistics(@RequestParam(value = "budgetYear", required = false) String budgetYear) { List> statistics = projectApplicationService.getDepartmentStatistics(budgetYear); @@ -133,7 +133,7 @@ public class CwProjectApplicationController extends BaseController { /** * 项目预算统计 - 年度汇总 */ - //@SaCheckPermission("cw:statistics:list") + @SaCheckPermission("cw:statistics:list") @GetMapping("/statistics/yearly") public R>> getYearlyStatistics() { List> statistics = projectApplicationService.getYearlyStatistics(); @@ -143,7 +143,7 @@ public class CwProjectApplicationController extends BaseController { /** * 获取项目预算申报详细信息 */ - //@SaCheckPermission("cw:application:query") + @SaCheckPermission("cw:application:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -153,7 +153,7 @@ public class CwProjectApplicationController extends BaseController { /** * 根据申报编号获取详细信息 */ - //@SaCheckPermission("cw:application:query") + @SaCheckPermission("cw:application:query") @GetMapping("/byNo/{applicationNo}") public R getInfoByNo(@PathVariable("applicationNo") String applicationNo) { return R.ok(projectApplicationService.queryByApplicationNo(applicationNo)); @@ -162,7 +162,7 @@ public class CwProjectApplicationController extends BaseController { /** * 新增项目预算申报 */ - //@SaCheckPermission("cw:application:add") + @SaCheckPermission("cw:application:add") @Log(title = "项目预算申报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -180,7 +180,7 @@ public class CwProjectApplicationController extends BaseController { /** * 修改项目预算申报 */ - //@SaCheckPermission("cw:application:edit") + @SaCheckPermission("cw:application:edit") @Log(title = "项目预算申报", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -191,7 +191,7 @@ public class CwProjectApplicationController extends BaseController { /** * 保存草稿 */ - //@SaCheckPermission("cw:application:add") + @SaCheckPermission("cw:application:add") @Log(title = "保存申报草稿", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/saveDraft") @@ -213,7 +213,7 @@ public class CwProjectApplicationController extends BaseController { /** * 提交申报 */ - //@SaCheckPermission("cw:application:submit") + @SaCheckPermission("cw:application:submit") @Log(title = "提交项目预算申报", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/submit/{id}") @@ -224,7 +224,7 @@ public class CwProjectApplicationController extends BaseController { /** * 撤回申报 */ - //@SaCheckPermission("cw:application:edit") + @SaCheckPermission("cw:application:edit") @Log(title = "撤回项目预算申报", businessType = BusinessType.UPDATE) @PostMapping("/withdraw/{id}") public R withdraw(@PathVariable("id") Long id) { @@ -234,7 +234,7 @@ public class CwProjectApplicationController extends BaseController { /** * 取消申报 */ - //@SaCheckPermission("cw:application:remove") + @SaCheckPermission("cw:application:remove") @Log(title = "取消项目预算申报", businessType = BusinessType.UPDATE) @PostMapping("/cancel/{id}") public R cancel(@PathVariable("id") Long id) { @@ -244,7 +244,7 @@ public class CwProjectApplicationController extends BaseController { /** * 删除项目预算申报 */ - //@SaCheckPermission("cw:application:remove") + @SaCheckPermission("cw:application:remove") @Log(title = "项目预算申报", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -255,7 +255,7 @@ public class CwProjectApplicationController extends BaseController { /** * 生成申报编号 */ - //@SaCheckPermission("cw:application:add") + @SaCheckPermission("cw:application:add") @GetMapping("/generateNo") public R generateApplicationNo() { return R.ok(projectApplicationService.generateApplicationNo()); @@ -264,7 +264,7 @@ public class CwProjectApplicationController extends BaseController { /** * 统计数据 */ - //@SaCheckPermission("cw:application:list") + @SaCheckPermission("cw:application:list") @GetMapping("/statistics") public R> statistics(@RequestParam(value = "year", required = false) Integer year) { java.util.Map result = new java.util.HashMap<>(); diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java index eb0525d1..ab0aa9a7 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java @@ -38,7 +38,7 @@ public class CwProjectApprovalController extends BaseController { /** * 启动自定义审批流程 */ - //@SaCheckPermission("cw:projectApproval:start") + @SaCheckPermission("cw:projectApproval:start") @Log(title = "启动审批流程", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/start") @@ -52,7 +52,7 @@ public class CwProjectApprovalController extends BaseController { /** * 执行审批操作 */ - //@SaCheckPermission("cw:projectApproval:approve") + @SaCheckPermission("cw:projectApproval:approve") @Log(title = "执行审批操作", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/approve") @@ -63,7 +63,7 @@ public class CwProjectApprovalController extends BaseController { /** * 获取我的待审批列表 */ - //@SaCheckPermission("cw:projectApproval:query") + @SaCheckPermission("cw:projectApproval:query") @GetMapping("/pending") public TableDataInfo getMyPendingApprovals(PageQuery pageQuery) { return projectApprovalService.getMyPendingApprovals(pageQuery); @@ -72,7 +72,7 @@ public class CwProjectApprovalController extends BaseController { /** * 获取我的已审批列表 */ - //@SaCheckPermission("cw:projectApproval:query") + @SaCheckPermission("cw:projectApproval:query") @GetMapping("/processed") public TableDataInfo getMyProcessedApprovals(PageQuery pageQuery) { return projectApprovalService.getMyProcessedApprovals(pageQuery); @@ -81,7 +81,7 @@ public class CwProjectApprovalController extends BaseController { /** * 查询审批流程列表 */ - //@SaCheckPermission("cw:projectApproval:query") + @SaCheckPermission("cw:projectApproval:query") @GetMapping("/list") public TableDataInfo list(PageQuery pageQuery) { return projectApprovalService.queryProcessList(pageQuery); @@ -90,7 +90,7 @@ public class CwProjectApprovalController extends BaseController { /** * 获取审批流程详情 */ - //@SaCheckPermission("cw:projectApproval:query") + @SaCheckPermission("cw:projectApproval:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -100,7 +100,7 @@ public class CwProjectApprovalController extends BaseController { /** * 获取审批记录列表 */ - //@SaCheckPermission("cw:projectApproval:query") + @SaCheckPermission("cw:projectApproval:query") @GetMapping("/records/{applicationId}") public R> getApprovalRecords(@PathVariable("applicationId") Long applicationId) { return R.ok(projectApprovalService.getApprovalRecords(applicationId)); @@ -109,7 +109,7 @@ public class CwProjectApprovalController extends BaseController { /** * 终止审批流程 */ - //@SaCheckPermission("cw:projectApproval:terminate") + @SaCheckPermission("cw:projectApproval:terminate") @Log(title = "终止审批流程", businessType = BusinessType.UPDATE) @DeleteMapping("/{ids}") public R terminate(@NotEmpty(message = "主键不能为空") @@ -120,7 +120,7 @@ public class CwProjectApprovalController extends BaseController { /** * 审批流程验证 */ - //@SaCheckPermission("cw:projectApproval:query") + @SaCheckPermission("cw:projectApproval:query") @PostMapping("/validate") public R validateApprovalProcess(@RequestBody CwCustomApprovalBo bo) { // 简单验证逻辑 @@ -136,7 +136,7 @@ public class CwProjectApprovalController extends BaseController { /** * 审批选项查询（用于下拉选择） */ - //@SaCheckPermission("cw:projectApproval:query") + @SaCheckPermission("cw:projectApproval:query") @GetMapping("/options") public R getApprovalOptions() { // 返回一些选项数据，比如审批动作选项等 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java index 0625d010..6f25a893 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java @@ -40,7 +40,7 @@ public class CwProjectAuditorController extends BaseController { /** * 查询项目审核人配置列表 */ - //@SaCheckPermission("cw:projectAuditor:list") + @SaCheckPermission("cw:projectAuditor:list") @GetMapping("/list") public TableDataInfo list(CwProjectAuditorBo bo, PageQuery pageQuery) { return cwProjectAuditorService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CwProjectAuditorController extends BaseController { /** * 导出项目审核人配置列表 */ - //@SaCheckPermission("cw:projectAuditor:export") + @SaCheckPermission("cw:projectAuditor:export") @Log(title = "项目审核人配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CwProjectAuditorBo bo, HttpServletResponse response) { @@ -60,7 +60,7 @@ public class CwProjectAuditorController extends BaseController { /** * 获取项目审核人配置详细信息 */ - //@SaCheckPermission("cw:projectAuditor:query") + @SaCheckPermission("cw:projectAuditor:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -70,7 +70,7 @@ public class CwProjectAuditorController extends BaseController { /** * 新增项目审核人配置 */ - //@SaCheckPermission("cw:projectAuditor:add") + @SaCheckPermission("cw:projectAuditor:add") @Log(title = "项目审核人配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class CwProjectAuditorController extends BaseController { /** * 修改项目审核人配置 */ - //@SaCheckPermission("cw:projectAuditor:edit") + @SaCheckPermission("cw:projectAuditor:edit") @Log(title = "项目审核人配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class CwProjectAuditorController extends BaseController { /** * 删除项目审核人配置 */ - //@SaCheckPermission("cw:projectAuditor:remove") + @SaCheckPermission("cw:projectAuditor:remove") @Log(title = "项目审核人配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -106,7 +106,7 @@ public class CwProjectAuditorController extends BaseController { /** * 批量添加审核人 */ - //@SaCheckPermission("cw:projectAuditor:add") + @SaCheckPermission("cw:projectAuditor:add") @Log(title = "批量添加审核人", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batchAdd") @@ -122,7 +122,7 @@ public class CwProjectAuditorController extends BaseController { /** * 获取可用审核人列表 */ - //@SaCheckPermission("cw:projectAuditor:list") + @SaCheckPermission("cw:projectAuditor:list") @GetMapping("/available") public R> getAvailableAuditors() { return R.ok(cwProjectAuditorService.getAvailableAuditors()); @@ -131,7 +131,7 @@ public class CwProjectAuditorController extends BaseController { /** * 根据部门ID获取用户列表 */ - //@SaCheckPermission("cw:projectAuditor:list") + @SaCheckPermission("cw:projectAuditor:list") @GetMapping("/deptUsers/{deptId}") public R> getDeptUsers(@PathVariable("deptId") Long deptId) { // 参数验证 @@ -144,7 +144,7 @@ public class CwProjectAuditorController extends BaseController { /** * 批量更新状态 */ - //@SaCheckPermission("cw:projectAuditor:edit") + @SaCheckPermission("cw:projectAuditor:edit") @Log(title = "批量更新审核人状态", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/status") @@ -155,7 +155,7 @@ public class CwProjectAuditorController extends BaseController { /** * 我配置的审核人 */ - //@SaCheckPermission("cw:projectAuditor:list") + @SaCheckPermission("cw:projectAuditor:list") @GetMapping("/myConfig") public TableDataInfo getMyConfig(CwProjectAuditorBo bo, PageQuery pageQuery) { bo.setConfigBy(LoginHelper.getUserId()); @@ -165,7 +165,7 @@ public class CwProjectAuditorController extends BaseController { /** * 获取审核人选项（用于下拉选择） */ - //@SaCheckPermission("cw:projectAuditor:list") + @SaCheckPermission("cw:projectAuditor:list") @GetMapping("/options") public R> getAuditorOptions() { return R.ok(cwProjectAuditorService.getAvailableAuditors()); @@ -174,7 +174,7 @@ public class CwProjectAuditorController extends BaseController { /** * 批量启用 */ - //@SaCheckPermission("cw:projectAuditor:edit") + @SaCheckPermission("cw:projectAuditor:edit") @Log(title = "批量启用审核人", businessType = BusinessType.UPDATE) @PutMapping("/enable/{ids}") public R enable(@PathVariable("ids") Long[] ids) { @@ -184,7 +184,7 @@ public class CwProjectAuditorController extends BaseController { /** * 批量停用 */ - //@SaCheckPermission("cw:projectAuditor:edit") + @SaCheckPermission("cw:projectAuditor:edit") @Log(title = "批量停用审核人", businessType = BusinessType.UPDATE) @PutMapping("/disable/{ids}") public R disable(@PathVariable("ids") Long[] ids) { @@ -194,7 +194,7 @@ public class CwProjectAuditorController extends BaseController { /** * 获取审核人统计数据 */ - //@SaCheckPermission("cw:projectAuditor:list") + @SaCheckPermission("cw:projectAuditor:list") @GetMapping("/statistics") public R getStatistics() { return R.ok(cwProjectAuditorService.getStatistics()); diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java index 1aad4bd5..b8b3f1e8 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java @@ -40,7 +40,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 查询项目绩效自评指标明细列表 */ - //@SaCheckPermission("cw:indicator:list") + @SaCheckPermission("cw:indicator:list") @GetMapping("/list") public TableDataInfo list(CwProjectEvaluationIndicatorBo bo, PageQuery pageQuery) { return indicatorService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 获取项目绩效自评指标明细详细信息 */ - //@SaCheckPermission("cw:indicator:query") + @SaCheckPermission("cw:indicator:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(indicatorService.queryById(id)); @@ -58,7 +58,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 根据自评ID查询指标明细列表 */ - //@SaCheckPermission("cw:indicator:query") + @SaCheckPermission("cw:indicator:query") @GetMapping("/evaluation/{evaluationId}") public R> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(indicatorService.queryByEvaluationId(evaluationId)); @@ -67,7 +67,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 根据自评ID和指标类型查询指标明细列表 */ - //@SaCheckPermission("cw:indicator:query") + @SaCheckPermission("cw:indicator:query") @GetMapping("/evaluation/{evaluationId}/type/{indicatorType}") public R> getByEvaluationIdAndType( @NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId, @@ -78,7 +78,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 新增项目绩效自评指标明细 */ - //@SaCheckPermission("cw:indicator:add") + @SaCheckPermission("cw:indicator:add") @Log(title = "项目绩效自评指标明细", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -89,7 +89,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 修改项目绩效自评指标明细 */ - //@SaCheckPermission("cw:indicator:edit") + @SaCheckPermission("cw:indicator:edit") @Log(title = "项目绩效自评指标明细", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -100,7 +100,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 批量保存指标明细 */ - //@SaCheckPermission("cw:indicator:edit") + @SaCheckPermission("cw:indicator:edit") @Log(title = "批量保存指标明细", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batch") @@ -111,7 +111,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 删除项目绩效自评指标明细 */ - //@SaCheckPermission("cw:indicator:remove") + @SaCheckPermission("cw:indicator:remove") @Log(title = "项目绩效自评指标明细", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -121,7 +121,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { /** * 导出项目绩效自评指标明细列表 */ - //@SaCheckPermission("cw:indicator:export") + @SaCheckPermission("cw:indicator:export") @Log(title = "项目绩效自评指标明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CwProjectEvaluationIndicatorBo bo, HttpServletResponse response) { diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java index 33ec728c..7cf7dd02 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java @@ -41,7 +41,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 查询项目月度运行监控列表 */ - //@SaCheckPermission("cw:monitoring:list") + @SaCheckPermission("cw:monitoring:list") @GetMapping("/list") public TableDataInfo list(CwProjectMonthlyMonitoringBo bo, PageQuery pageQuery) { return monitoringService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 获取项目月度运行监控详细信息 */ - //@SaCheckPermission("cw:monitoring:query") + @SaCheckPermission("cw:monitoring:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(monitoringService.queryById(id)); @@ -59,7 +59,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 根据自评ID查询月度监控列表 */ - //@SaCheckPermission("cw:monitoring:query") + @SaCheckPermission("cw:monitoring:query") @GetMapping("/evaluation/{evaluationId}") public R> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(monitoringService.queryByEvaluationId(evaluationId)); @@ -68,7 +68,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 查询某个自评的全年监控数据 */ - //@SaCheckPermission("cw:monitoring:query") + @SaCheckPermission("cw:monitoring:query") @GetMapping("/year/{evaluationId}/{year}") public R> getYearlyMonitoring( @NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId, @@ -79,7 +79,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 新增项目月度运行监控 */ - //@SaCheckPermission("cw:monitoring:add") + @SaCheckPermission("cw:monitoring:add") @Log(title = "项目月度运行监控", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -90,7 +90,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 修改项目月度运行监控 */ - //@SaCheckPermission("cw:monitoring:edit") + @SaCheckPermission("cw:monitoring:edit") @Log(title = "项目月度运行监控", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -101,7 +101,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 填报月度数据 */ - //@SaCheckPermission("cw:monitoring:fill") + @SaCheckPermission("cw:monitoring:fill") @Log(title = "填报月度数据", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/fill") @@ -112,7 +112,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 批量保存月度监控数据 */ - //@SaCheckPermission("cw:monitoring:edit") + @SaCheckPermission("cw:monitoring:edit") @Log(title = "批量保存月度监控数据", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batch") @@ -123,7 +123,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 删除项目月度运行监控 */ - //@SaCheckPermission("cw:monitoring:remove") + @SaCheckPermission("cw:monitoring:remove") @Log(title = "项目月度运行监控", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -133,7 +133,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { /** * 导出项目月度运行监控列表 */ - //@SaCheckPermission("cw:monitoring:export") + @SaCheckPermission("cw:monitoring:export") @Log(title = "项目月度运行监控", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CwProjectMonthlyMonitoringBo bo, HttpServletResponse response) { diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java index 17596fd5..97ad1155 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java @@ -43,7 +43,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 查询项目绩效自评列表 */ - //@SaCheckPermission("cw:evaluation:list") + @SaCheckPermission("cw:evaluation:list") @GetMapping("/list") public TableDataInfo list(CwProjectPerformanceSelfEvaluationBo bo, PageQuery pageQuery) { return evaluationService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 获取项目绩效自评详细信息 */ - //@SaCheckPermission("cw:evaluation:query") + @SaCheckPermission("cw:evaluation:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(evaluationService.queryById(id)); @@ -61,7 +61,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 新增项目绩效自评 */ - //@SaCheckPermission("cw:evaluation:add") + @SaCheckPermission("cw:evaluation:add") @Log(title = "项目绩效自评", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -76,7 +76,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 修改项目绩效自评 */ - //@SaCheckPermission("cw:evaluation:edit") + @SaCheckPermission("cw:evaluation:edit") @Log(title = "项目绩效自评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -87,7 +87,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 保存草稿 */ - //@SaCheckPermission("cw:evaluation:add") + @SaCheckPermission("cw:evaluation:add") @Log(title = "保存自评草稿", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/saveDraft") @@ -98,7 +98,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 提交自评 */ - //@SaCheckPermission("cw:evaluation:submit") + @SaCheckPermission("cw:evaluation:submit") @Log(title = "提交自评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/submit/{id}") @@ -109,7 +109,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 审核自评 */ - //@SaCheckPermission("cw:evaluation:approve") + @SaCheckPermission("cw:evaluation:approve") @Log(title = "审核自评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/approve/{id}") @@ -122,7 +122,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 删除项目绩效自评 */ - //@SaCheckPermission("cw:evaluation:remove") + @SaCheckPermission("cw:evaluation:remove") @Log(title = "项目绩效自评", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -132,7 +132,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 查询我的自评列表 */ - //@SaCheckPermission("cw:evaluation:list") + @SaCheckPermission("cw:evaluation:list") @GetMapping("/my") public R> myEvaluations() { return R.ok(evaluationService.queryMyEvaluations(LoginHelper.getUserId())); @@ -141,7 +141,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 查询待审核自评列表 */ - //@SaCheckPermission("cw:evaluation:approve") + @SaCheckPermission("cw:evaluation:approve") @GetMapping("/pending") public R> pendingApprovals() { return R.ok(evaluationService.queryPendingApprovals()); @@ -150,7 +150,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController /** * 导出项目绩效自评列表 */ - //@SaCheckPermission("cw:evaluation:export") + @SaCheckPermission("cw:evaluation:export") @Log(title = "项目绩效自评", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CwProjectPerformanceSelfEvaluationBo bo, HttpServletResponse response) { diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java index fa002351..3a2ed9a6 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java @@ -41,7 +41,7 @@ public class HqHallInfoController extends BaseController { * 查询报告厅信息列表 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallInfo:list") + @SaCheckPermission("hq:hallInfo:list") @GetMapping("/list") public TableDataInfo list(HqHallInfoBo bo, PageQuery pageQuery) { return hqHallInfoService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class HqHallInfoController extends BaseController { * 导出报告厅信息列表 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallInfo:export") + @SaCheckPermission("hq:hallInfo:export") @Log(title = "报告厅信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqHallInfoBo bo, HttpServletResponse response) { @@ -65,7 +65,7 @@ public class HqHallInfoController extends BaseController { * @param id 主键 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallInfo:query") + @SaCheckPermission("hq:hallInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqHallInfoService.queryById(id)); @@ -75,7 +75,7 @@ public class HqHallInfoController extends BaseController { * 新增报告厅信息 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallInfo:add") + @SaCheckPermission("hq:hallInfo:add") @Log(title = "报告厅信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -87,7 +87,7 @@ public class HqHallInfoController extends BaseController { * 修改报告厅信息 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallInfo:edit") + @SaCheckPermission("hq:hallInfo:edit") @Log(title = "报告厅信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -101,7 +101,7 @@ public class HqHallInfoController extends BaseController { * @param ids 主键串 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallInfo:remove") + @SaCheckPermission("hq:hallInfo:remove") @Log(title = "报告厅信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java index 64e9594b..15b65c7b 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java @@ -44,7 +44,7 @@ public class HqHallReservationController extends BaseController { * 查询报告厅预约列表 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:list") + @SaCheckPermission("hq:hallReservation:list") @GetMapping("/list") public TableDataInfo list(HqHallReservationBo bo, PageQuery pageQuery) { return hqHallReservationService.queryPageList(bo, pageQuery); @@ -54,7 +54,7 @@ public class HqHallReservationController extends BaseController { * 导出报告厅预约列表 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:export") + @SaCheckPermission("hq:hallReservation:export") @Log(title = "报告厅预约", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqHallReservationBo bo, HttpServletResponse response) { @@ -68,7 +68,7 @@ public class HqHallReservationController extends BaseController { * @param id 主键 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:query") + @SaCheckPermission("hq:hallReservation:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqHallReservationService.queryById(id)); @@ -78,7 +78,7 @@ public class HqHallReservationController extends BaseController { * 新增报告厅预约 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:add") + @SaCheckPermission("hq:hallReservation:add") @Log(title = "报告厅预约", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -90,7 +90,7 @@ public class HqHallReservationController extends BaseController { * 修改报告厅预约 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:edit") + @SaCheckPermission("hq:hallReservation:edit") @Log(title = "报告厅预约", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -104,7 +104,7 @@ public class HqHallReservationController extends BaseController { * @param ids 主键串 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:remove") + @SaCheckPermission("hq:hallReservation:remove") @Log(title = "报告厅预约", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -115,7 +115,7 @@ public class HqHallReservationController extends BaseController { * 审核报告厅预约（批准/拒绝） */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:audit") + @SaCheckPermission("hq:hallReservation:audit") @Log(title = "报告厅预约审核", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/audit") @@ -127,7 +127,7 @@ public class HqHallReservationController extends BaseController { * 检查报告厅时间冲突 */ @ApiEncrypt(response = true) - //@SaCheckPermission("hq:hallReservation:query") + @SaCheckPermission("hq:hallReservation:query") @PostMapping("/checkTimeConflict") public R checkTimeConflict(@Validated @RequestBody HqHallTimeCheckBo timeCheckBo) { HqHallTimeCheckVo result = hqHallReservationService.checkTimeConflict(timeCheckBo); diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java index 1d05cc01..f7a155b4 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java @@ -42,7 +42,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 查询报修附件列表 */ - //@SaCheckPermission("pm:attachment:list") + @SaCheckPermission("pm:attachment:list") @GetMapping("/list") public TableDataInfo list(HqPmRepairAttachmentBo bo, PageQuery pageQuery) { return attachmentService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 根据工单ID获取附件列表 */ - //@SaCheckPermission("pm:attachment:list") + @SaCheckPermission("pm:attachment:list") @GetMapping("/order/{orderId}") public R> getByOrderId(@PathVariable("orderId") Long orderId) { List list = attachmentService.queryByOrderId(orderId); @@ -61,7 +61,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 获取报修附件详细信息 */ - //@SaCheckPermission("pm:attachment:query") + @SaCheckPermission("pm:attachment:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(attachmentService.queryById(id)); @@ -70,7 +70,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 新增报修附件 */ - //@SaCheckPermission("pm:attachment:add") + @SaCheckPermission("pm:attachment:add") @Log(title = "报修附件", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -81,7 +81,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 修改报修附件 */ - //@SaCheckPermission("pm:attachment:edit") + @SaCheckPermission("pm:attachment:edit") @Log(title = "报修附件", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -93,7 +93,7 @@ public class HqPmRepairAttachmentController extends BaseController { * 删除报修附件 * // */ - //@SaCheckPermission("pm:attachment:remove") + @SaCheckPermission("pm:attachment:remove") @Log(title = "报修附件", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -103,7 +103,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 上传单个附件文件 */ - //@SaCheckPermission("pm:attachment:upload") + @SaCheckPermission("pm:attachment:upload") @Log(title = "上传报修附件", businessType = BusinessType.INSERT) @PostMapping("/upload") public R uploadFile( @@ -127,7 +127,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 批量上传附件文件 */ - //@SaCheckPermission("pm:attachment:upload") + @SaCheckPermission("pm:attachment:upload") @Log(title = "批量上传报修附件", businessType = BusinessType.INSERT) @PostMapping("/upload/batch") public R> uploadFiles( @@ -152,7 +152,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 删除附件文件（包括OSS文件和数据库记录） */ - //@SaCheckPermission("pm:attachment:remove") + @SaCheckPermission("pm:attachment:remove") @Log(title = "删除报修附件文件", businessType = BusinessType.DELETE) @DeleteMapping("/file/{id}") public R deleteAttachment(@PathVariable("id") Long id) { @@ -162,7 +162,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 下载附件文件 */ - //@SaCheckPermission("pm:attachment:download") + @SaCheckPermission("pm:attachment:download") @GetMapping("/download/{id}") public void downloadFile(@PathVariable("id") Long id, HttpServletResponse response) { HqPmRepairAttachmentVo attachment = attachmentService.queryById(id); @@ -186,7 +186,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 更新附件的工单ID（用于新增工单时关联已上传的附件） */ - //@SaCheckPermission("pm:attachment:edit") + @SaCheckPermission("pm:attachment:edit") @Log(title = "更新附件工单ID", businessType = BusinessType.UPDATE) @PutMapping("/{attachmentId}/order/{orderId}") public R updateAttachmentOrderId(@PathVariable("attachmentId") Long attachmentId, @@ -197,7 +197,7 @@ public class HqPmRepairAttachmentController extends BaseController { /** * 批量更新附件的工单ID（用于新增工单时关联已上传的附件） */ - //@SaCheckPermission("pm:attachment:edit") + @SaCheckPermission("pm:attachment:edit") @Log(title = "批量更新附件工单ID", businessType = BusinessType.UPDATE) @PutMapping("/batch-update-order") public R batchUpdateAttachmentOrderId(@RequestBody BatchUpdateOrderIdRequest request) { diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java index 69795519..cca561e5 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java @@ -39,7 +39,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 查询维修类型列表 */ - //@SaCheckPermission("pm:category:list") + @SaCheckPermission("pm:category:list") @GetMapping("/list") public TableDataInfo list(HqPmRepairCategoryBo bo, PageQuery pageQuery) { return repairCategoryService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 导出维修类型列表 */ - //@SaCheckPermission("pm:category:export") + @SaCheckPermission("pm:category:export") @Log(title = "维修类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqPmRepairCategoryBo bo, HttpServletResponse response) { @@ -59,7 +59,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 获取维修类型详细信息 */ - //@SaCheckPermission("pm:category:query") + @SaCheckPermission("pm:category:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(repairCategoryService.queryById(id)); @@ -68,7 +68,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 新增维修类型 */ - //@SaCheckPermission("pm:category:add") + @SaCheckPermission("pm:category:add") @Log(title = "维修类型", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -79,7 +79,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 修改维修类型 */ - //@SaCheckPermission("pm:category:edit") + @SaCheckPermission("pm:category:edit") @Log(title = "维修类型", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -90,7 +90,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 删除维修类型 */ - //@SaCheckPermission("pm:category:remove") + @SaCheckPermission("pm:category:remove") @Log(title = "维修类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -100,7 +100,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 获取维修类型树形结构 */ - //@SaCheckPermission("pm:category:tree") + @SaCheckPermission("pm:category:tree") @GetMapping("/tree") public R> tree() { return R.ok(repairCategoryService.queryTree()); @@ -109,7 +109,7 @@ public class HqPmRepairCategoryController extends BaseController { /** * 获取维修类型下拉选项 */ - //@SaCheckPermission("pm:category:options") + @SaCheckPermission("pm:category:options") @GetMapping("/options") public R>> options() { List list = repairCategoryService.queryTree(); diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java index b3d6cc48..610e78e3 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java @@ -42,7 +42,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 查询报修工单列表 */ - //@SaCheckPermission("pm:repairOrder:list") + @SaCheckPermission("pm:repairOrder:list") @GetMapping("/list") public TableDataInfo list(HqPmRepairOrderBo bo, PageQuery pageQuery) { TableDataInfo result = repairOrderService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 导出报修工单列表 */ - //@SaCheckPermission("pm:repairOrder:export") + @SaCheckPermission("pm:repairOrder:export") @Log(title = "报修工单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqPmRepairOrderBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 获取报修工单详细信息 */ - //@SaCheckPermission("pm:repairOrder:query") + @SaCheckPermission("pm:repairOrder:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(repairOrderService.queryById(id)); @@ -72,7 +72,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 新增报修工单 */ - //@SaCheckPermission("pm:repairOrder:add") + @SaCheckPermission("pm:repairOrder:add") @Log(title = "报修工单", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -89,7 +89,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 修改报修工单 */ - //@SaCheckPermission("pm:repairOrder:edit") + @SaCheckPermission("pm:repairOrder:edit") @Log(title = "报修工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -100,7 +100,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 删除报修工单 */ - //@SaCheckPermission("pm:repairOrder:remove") + @SaCheckPermission("pm:repairOrder:remove") @Log(title = "报修工单", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -110,7 +110,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 分派工单 */ - //@SaCheckPermission("pm:repairOrder:assign") + @SaCheckPermission("pm:repairOrder:assign") @Log(title = "分派工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{orderId}/assign") @@ -124,7 +124,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 开始维修 */ - //@SaCheckPermission("pm:repairOrder:start") + @SaCheckPermission("pm:repairOrder:start") @Log(title = "开始维修", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{orderId}/start") @@ -135,7 +135,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 完成维修 */ - //@SaCheckPermission("pm:repairOrder:finish") + @SaCheckPermission("pm:repairOrder:finish") @Log(title = "完成维修", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{orderId}/finish") @@ -149,7 +149,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 取消工单 */ - //@SaCheckPermission("pm:repairOrder:cancel") + @SaCheckPermission("pm:repairOrder:cancel") @Log(title = "取消工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{orderId}/cancel") @@ -162,7 +162,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 生成工单编号 */ - //@SaCheckPermission("pm:repairOrder:generateOrderNo") + @SaCheckPermission("pm:repairOrder:generateOrderNo") @GetMapping("/generateOrderNo") public R generateOrderNo() { return R.ok(repairOrderService.generateOrderNo()); @@ -171,7 +171,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 获取报修统计数据 */ - //@SaCheckPermission("pm:repairOrder:statistics") + @SaCheckPermission("pm:repairOrder:statistics") @GetMapping("/statistics") public R> statistics() { // 模拟统计数据，实际项目中应该从service获取真实统计 @@ -247,7 +247,7 @@ public class HqPmRepairOrderController extends BaseController { * 获取维修人员选项 * 返回拥有"维修人员"角色的用户列表 */ - //@SaCheckPermission("pm:repairOrder:assign") + @SaCheckPermission("pm:repairOrder:assign") @GetMapping("/maintenance-workers") public R>> getMaintenanceWorkers() { return R.ok(repairOrderService.getMaintenanceWorkers()); @@ -256,7 +256,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 获取工单进度列表 */ - //@SaCheckPermission("pm:repairOrder:progress") + @SaCheckPermission("pm:repairOrder:progress") @GetMapping("/{orderId}/progress") public R>> getRepairProgress( @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) { @@ -267,7 +267,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 更新维修进度 */ - //@SaCheckPermission("pm:repairOrder:updateProgress") + @SaCheckPermission("pm:repairOrder:updateProgress") @Log(title = "更新进度", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/progress") @@ -279,7 +279,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 完成工单（新的完成接口，支持详细信息） */ - //@SaCheckPermission("pm:repairOrder:complete") + @SaCheckPermission("pm:repairOrder:complete") @Log(title = "完成工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{orderId}/complete") @@ -296,7 +296,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 创建服务评价 */ - //@SaCheckPermission("pm:repairOrder:evaluate") + @SaCheckPermission("pm:repairOrder:evaluate") @Log(title = "服务评价", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/evaluation") @@ -309,7 +309,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 获取工单的服务评价 */ - //@SaCheckPermission("pm:repairOrder:query") + @SaCheckPermission("pm:repairOrder:query") @GetMapping("/{orderId}/evaluation") public R> getServiceEvaluation( @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) { @@ -321,7 +321,7 @@ public class HqPmRepairOrderController extends BaseController { /** * 获取工单附件列表 */ - //@SaCheckPermission("pm:repairOrder:query") + @SaCheckPermission("pm:repairOrder:query") @GetMapping("/{orderId}/attachments") public R> getRepairAttachments( @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) { diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java index b5ab9e6a..c8a1a131 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java @@ -39,7 +39,7 @@ public class HqSatCategoryController extends BaseController { /** * 查询题目分类列表 */ - //@SaCheckPermission("hq:satCategory:list") + @SaCheckPermission("hq:satCategory:list") @GetMapping("/list") public TableDataInfo list(HqSatCategoryBo bo, PageQuery pageQuery) { return hqSatCategoryService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class HqSatCategoryController extends BaseController { /** * 查询所有题目分类列表(包括已逻辑删除的) */ - //@SaCheckPermission("hq:satCategory:list") + @SaCheckPermission("hq:satCategory:list") @GetMapping("/listAllIncludeDeleted") public R> listAllIncludeDeleted(HqSatCategoryBo bo) { List list = hqSatCategoryService.queryListWithDeleted(bo); @@ -58,7 +58,7 @@ public class HqSatCategoryController extends BaseController { /** * 导出题目分类列表 */ - //@SaCheckPermission("hq:satCategory:export") + @SaCheckPermission("hq:satCategory:export") @Log(title = "题目分类", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqSatCategoryBo bo, HttpServletResponse response) { @@ -71,7 +71,7 @@ public class HqSatCategoryController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("hq:satCategory:query") + @SaCheckPermission("hq:satCategory:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -81,7 +81,7 @@ public class HqSatCategoryController extends BaseController { /** * 新增题目分类 */ - //@SaCheckPermission("hq:satCategory:add") + @SaCheckPermission("hq:satCategory:add") @Log(title = "题目分类", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -92,7 +92,7 @@ public class HqSatCategoryController extends BaseController { /** * 修改题目分类 */ - //@SaCheckPermission("hq:satCategory:edit") + @SaCheckPermission("hq:satCategory:edit") @Log(title = "题目分类", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -105,7 +105,7 @@ public class HqSatCategoryController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("hq:satCategory:remove") + @SaCheckPermission("hq:satCategory:remove") @Log(title = "题目分类", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java index 512f301d..8b1af3d8 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java @@ -39,7 +39,7 @@ public class HqSatDetailController extends BaseController { /** * 查询答题详情列表 */ - //@SaCheckPermission("hq:satDetail:list") + @SaCheckPermission("hq:satDetail:list") @GetMapping("/list") public TableDataInfo list(HqSatDetailBo bo, PageQuery pageQuery) { return hqSatDetailService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class HqSatDetailController extends BaseController { /** * 导出答题详情列表 */ - //@SaCheckPermission("hq:satDetail:export") + @SaCheckPermission("hq:satDetail:export") @Log(title = "答题详情", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqSatDetailBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class HqSatDetailController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("hq:satDetail:query") + @SaCheckPermission("hq:satDetail:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class HqSatDetailController extends BaseController { /** * 新增答题详情 */ - //@SaCheckPermission("hq:satDetail:add") + @SaCheckPermission("hq:satDetail:add") @Log(title = "答题详情", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class HqSatDetailController extends BaseController { /** * 修改答题详情 */ - //@SaCheckPermission("hq:satDetail:edit") + @SaCheckPermission("hq:satDetail:edit") @Log(title = "答题详情", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class HqSatDetailController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("hq:satDetail:remove") + @SaCheckPermission("hq:satDetail:remove") @Log(title = "答题详情", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java index e0aba9c2..15d4d778 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java @@ -39,7 +39,7 @@ public class HqSatOptionController extends BaseController { /** * 查询评分选项列表 */ - //@SaCheckPermission("hq:satOption:list") + @SaCheckPermission("hq:satOption:list") @GetMapping("/list") public TableDataInfo list(HqSatOptionBo bo, PageQuery pageQuery) { return hqSatOptionService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class HqSatOptionController extends BaseController { /** * 导出评分选项列表 */ - //@SaCheckPermission("hq:satOption:export") + @SaCheckPermission("hq:satOption:export") @Log(title = "评分选项", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqSatOptionBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class HqSatOptionController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("hq:satOption:query") + @SaCheckPermission("hq:satOption:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class HqSatOptionController extends BaseController { /** * 新增评分选项 */ - //@SaCheckPermission("hq:satOption:add") + @SaCheckPermission("hq:satOption:add") @Log(title = "评分选项", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class HqSatOptionController extends BaseController { /** * 修改评分选项 */ - //@SaCheckPermission("hq:satOption:edit") + @SaCheckPermission("hq:satOption:edit") @Log(title = "评分选项", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class HqSatOptionController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("hq:satOption:remove") + @SaCheckPermission("hq:satOption:remove") @Log(title = "评分选项", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java index 0203a5da..95de47b8 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java @@ -43,7 +43,7 @@ public class HqSatQuestionController extends BaseController { /** * 查询题库列表 */ - //@SaCheckPermission("hq:satQuestion:list") + @SaCheckPermission("hq:satQuestion:list") @GetMapping("/list") public TableDataInfo list(HqSatQuestionBo bo, PageQuery pageQuery) { return hqSatQuestionService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class HqSatQuestionController extends BaseController { /** * 导出题库列表 */ - //@SaCheckPermission("hq:satQuestion:export") + @SaCheckPermission("hq:satQuestion:export") @Log(title = "题库", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqSatQuestionBo bo, HttpServletResponse response) { @@ -65,7 +65,7 @@ public class HqSatQuestionController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("hq:satQuestion:query") + @SaCheckPermission("hq:satQuestion:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqSatQuestionService.queryById(id)); @@ -74,7 +74,7 @@ public class HqSatQuestionController extends BaseController { /** * 新增题库 */ - //@SaCheckPermission("hq:satQuestion:add") + @SaCheckPermission("hq:satQuestion:add") @Log(title = "题库", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -85,7 +85,7 @@ public class HqSatQuestionController extends BaseController { /** * 修改题库 */ - //@SaCheckPermission("hq:satQuestion:edit") + @SaCheckPermission("hq:satQuestion:edit") @Log(title = "题库", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -98,7 +98,7 @@ public class HqSatQuestionController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("hq:satQuestion:remove") + @SaCheckPermission("hq:satQuestion:remove") @Log(title = "题库", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -110,7 +110,7 @@ public class HqSatQuestionController extends BaseController { * * @param questionId 题目ID */ - //@SaCheckPermission("hq:satQuestion:query") + @SaCheckPermission("hq:satQuestion:query") @GetMapping("/{questionId}/options") public R> getQuestionOptions(@PathVariable("questionId") Long questionId) { // 根据题目ID获取该题目的选项 diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java index 13747089..f97f5bae 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java @@ -39,7 +39,7 @@ public class HqSatRecordController extends BaseController { /** * 查询答题记录列表 */ - //@SaCheckPermission("hq:satRecord:list") + @SaCheckPermission("hq:satRecord:list") @GetMapping("/list") public TableDataInfo list(HqSatRecordBo bo, PageQuery pageQuery) { return hqSatRecordService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class HqSatRecordController extends BaseController { /** * 导出答题记录列表 */ - //@SaCheckPermission("hq:satRecord:export") + @SaCheckPermission("hq:satRecord:export") @Log(title = "答题记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqSatRecordBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class HqSatRecordController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("hq:satRecord:query") + @SaCheckPermission("hq:satRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class HqSatRecordController extends BaseController { /** * 新增答题记录 */ - //@SaCheckPermission("hq:satRecord:add") + @SaCheckPermission("hq:satRecord:add") @Log(title = "答题记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class HqSatRecordController extends BaseController { /** * 修改答题记录 */ - //@SaCheckPermission("hq:satRecord:edit") + @SaCheckPermission("hq:satRecord:edit") @Log(title = "答题记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class HqSatRecordController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("hq:satRecord:remove") + @SaCheckPermission("hq:satRecord:remove") @Log(title = "答题记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java index c06e6ce2..1f556cf2 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java @@ -45,7 +45,7 @@ public class HqSatSurveyController extends BaseController { /** * 查询问卷列表 */ - //@SaCheckPermission("hq:satSurvey:list") + @SaCheckPermission("hq:satSurvey:list") @GetMapping("/list") public TableDataInfo list(HqSatSurveyBo bo, PageQuery pageQuery) { // 从params中获取权限过滤参数 @@ -77,7 +77,7 @@ public class HqSatSurveyController extends BaseController { /** * 导出问卷列表 */ - //@SaCheckPermission("hq:satSurvey:export") + @SaCheckPermission("hq:satSurvey:export") @Log(title = "问卷", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqSatSurveyBo bo, HttpServletResponse response) { @@ -90,7 +90,7 @@ public class HqSatSurveyController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("hq:satSurvey:query") + @SaCheckPermission("hq:satSurvey:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqSatSurveyService.queryById(id)); @@ -99,7 +99,7 @@ public class HqSatSurveyController extends BaseController { /** * 新增问卷 */ - //@SaCheckPermission("hq:satSurvey:add") + @SaCheckPermission("hq:satSurvey:add") @Log(title = "问卷", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -110,7 +110,7 @@ public class HqSatSurveyController extends BaseController { /** * 修改问卷 */ - //@SaCheckPermission("hq:satSurvey:edit") + @SaCheckPermission("hq:satSurvey:edit") @Log(title = "问卷", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -123,7 +123,7 @@ public class HqSatSurveyController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("hq:satSurvey:remove") + @SaCheckPermission("hq:satSurvey:remove") @Log(title = "问卷", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -135,7 +135,7 @@ public class HqSatSurveyController extends BaseController { * * @param surveyId 问卷ID */ - //@SaCheckPermission("hq:satSurvey:question") + @SaCheckPermission("hq:satSurvey:question") @GetMapping("/{surveyId}/questions") public R> getSurveyQuestions( @NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId) { @@ -148,7 +148,7 @@ public class HqSatSurveyController extends BaseController { * @param surveyId 问卷ID * @param questions 题目列表 */ - //@SaCheckPermission("hq:satSurvey:question") + @SaCheckPermission("hq:satSurvey:question") @Log(title = "问卷题目管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{surveyId}/questions") @@ -162,7 +162,7 @@ public class HqSatSurveyController extends BaseController { * * @param id 问卷ID */ - //@SaCheckPermission("hq:satSurvey:publish") + @SaCheckPermission("hq:satSurvey:publish") @Log(title = "发布问卷", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/publish") @@ -175,7 +175,7 @@ public class HqSatSurveyController extends BaseController { * * @param id 问卷ID */ - //@SaCheckPermission("hq:satSurvey:unpublish") + @SaCheckPermission("hq:satSurvey:unpublish") @Log(title = "撤销发布问卷", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/unpublish") @@ -398,7 +398,7 @@ public class HqSatSurveyController extends BaseController { * * @param surveyId 问卷ID */ - //@SaCheckPermission("hq:satSurvey:result") + @SaCheckPermission("hq:satSurvey:result") @GetMapping("/{surveyId}/statistics") public R> getSurveyStatistics(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId) { return R.ok(hqSatSurveyService.getSurveyStatistics(surveyId)); @@ -414,7 +414,7 @@ public class HqSatSurveyController extends BaseController { * @param pageNum 页码 * @param pageSize 每页大小 */ - //@SaCheckPermission("hq:satSurvey:result") + @SaCheckPermission("hq:satSurvey:result") @GetMapping("/{surveyId}/records") public R> getSurveyAnswerRecords( @NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId, @@ -439,7 +439,7 @@ public class HqSatSurveyController extends BaseController { * * @param recordId 答题记录ID */ - //@SaCheckPermission("hq:satSurvey:result") + @SaCheckPermission("hq:satSurvey:result") @GetMapping("/record/{recordId}") public R> getAnswerRecordDetail(@NotNull(message = "记录ID不能为空") @PathVariable("recordId") Long recordId) { return R.ok(hqSatSurveyService.getAnswerRecordDetail(recordId)); @@ -450,7 +450,7 @@ public class HqSatSurveyController extends BaseController { * * @param surveyId 问卷ID */ - //@SaCheckPermission("hq:satSurvey:export") + @SaCheckPermission("hq:satSurvey:export") @Log(title = "导出调查报告", businessType = BusinessType.EXPORT) @PostMapping("/{surveyId}/exportReport") public void exportSurveyReport(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId, HttpServletResponse response) { @@ -462,7 +462,7 @@ public class HqSatSurveyController extends BaseController { * * @param surveyId 问卷ID */ - //@SaCheckPermission("hq:satSurvey:export") + @SaCheckPermission("hq:satSurvey:export") @Log(title = "导出原始数据", businessType = BusinessType.EXPORT) @PostMapping("/{surveyId}/exportRawData") public void exportSurveyRawData(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId, HttpServletResponse response) { diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java index c9575dd7..f5c0db35 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java @@ -39,7 +39,7 @@ public class HqSatSurveyQuestionController extends BaseController { /** * 查询问卷题目关联列表 */ - //@SaCheckPermission("hq:satSurveyQuestion:list") + @SaCheckPermission("hq:satSurveyQuestion:list") @GetMapping("/list") public TableDataInfo list(HqSatSurveyQuestionBo bo, PageQuery pageQuery) { return hqSatSurveyQuestionService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class HqSatSurveyQuestionController extends BaseController { /** * 导出问卷题目关联列表 */ - //@SaCheckPermission("hq:satSurveyQuestion:export") + @SaCheckPermission("hq:satSurveyQuestion:export") @Log(title = "问卷题目关联", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqSatSurveyQuestionBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class HqSatSurveyQuestionController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("hq:satSurveyQuestion:query") + @SaCheckPermission("hq:satSurveyQuestion:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class HqSatSurveyQuestionController extends BaseController { /** * 新增问卷题目关联 */ - //@SaCheckPermission("hq:satSurveyQuestion:add") + @SaCheckPermission("hq:satSurveyQuestion:add") @Log(title = "问卷题目关联", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class HqSatSurveyQuestionController extends BaseController { /** * 修改问卷题目关联 */ - //@SaCheckPermission("hq:satSurveyQuestion:edit") + @SaCheckPermission("hq:satSurveyQuestion:edit") @Log(title = "问卷题目关联", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class HqSatSurveyQuestionController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("hq:satSurveyQuestion:remove") + @SaCheckPermission("hq:satSurveyQuestion:remove") @Log(title = "问卷题目关联", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java index 30f5730b..c64d39e7 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java @@ -39,7 +39,7 @@ public class HqVenueInfoController extends BaseController { /** * 查询场地信息列表 */ - //@SaCheckPermission("hq:venue:list") + @SaCheckPermission("hq:venue:list") @GetMapping("/list") public TableDataInfo list(HqVenueInfoBo bo, PageQuery pageQuery) { return venueInfoService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class HqVenueInfoController extends BaseController { /** * 导出场地信息列表 */ - //@SaCheckPermission("hq:venue:export") + @SaCheckPermission("hq:venue:export") @Log(title = "场地信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqVenueInfoBo bo, HttpServletResponse response) { @@ -59,7 +59,7 @@ public class HqVenueInfoController extends BaseController { /** * 获取场地信息详细信息 */ - //@SaCheckPermission("hq:venue:query") + @SaCheckPermission("hq:venue:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(venueInfoService.queryById(id)); @@ -68,7 +68,7 @@ public class HqVenueInfoController extends BaseController { /** * 新增场地信息 */ - //@SaCheckPermission("hq:venue:add") + @SaCheckPermission("hq:venue:add") @Log(title = "场地信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -79,7 +79,7 @@ public class HqVenueInfoController extends BaseController { /** * 修改场地信息 */ - //@SaCheckPermission("hq:venue:edit") + @SaCheckPermission("hq:venue:edit") @Log(title = "场地信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -90,7 +90,7 @@ public class HqVenueInfoController extends BaseController { /** * 删除场地信息 */ - //@SaCheckPermission("hq:venue:remove") + @SaCheckPermission("hq:venue:remove") @Log(title = "场地信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -100,7 +100,7 @@ public class HqVenueInfoController extends BaseController { /** * 根据场地编码查询场地信息 */ - //@SaCheckPermission("hq:venue:query") + @SaCheckPermission("hq:venue:query") @GetMapping("/code/{venueCode}") public R getByCode(@PathVariable("venueCode") String venueCode) { return R.ok(venueInfoService.queryByVenueCode(venueCode)); @@ -109,7 +109,7 @@ public class HqVenueInfoController extends BaseController { /** * 获取可用场地列表 */ - //@SaCheckPermission("hq:venue:query") + @SaCheckPermission("hq:venue:query") @GetMapping("/available") public R> getAvailableVenues() { return R.ok(venueInfoService.getAvailableVenues()); diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java index bd119d40..7a7b2a07 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java @@ -41,7 +41,7 @@ public class HqVenueReservationController extends BaseController { /** * 查询场地预约列表 */ - //@SaCheckPermission("hq:reservation:list") + @SaCheckPermission("hq:reservation:list") @GetMapping("/list") public TableDataInfo list(HqVenueReservationBo bo, PageQuery pageQuery) { return reservationService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class HqVenueReservationController extends BaseController { /** * 查询我的预约列表 */ - //@SaCheckPermission("hq:reservation:my") + @SaCheckPermission("hq:reservation:my") @GetMapping("/my") public TableDataInfo myList(HqVenueReservationBo bo, PageQuery pageQuery) { return reservationService.queryMyPageList(bo, pageQuery); @@ -59,7 +59,7 @@ public class HqVenueReservationController extends BaseController { /** * 查询待审批预约列表 */ - //@SaCheckPermission("hq:reservation:approve") + @SaCheckPermission("hq:reservation:approve") @GetMapping("/pending") public TableDataInfo pendingList(HqVenueReservationBo bo, PageQuery pageQuery) { return reservationService.queryPendingPageList(bo, pageQuery); @@ -68,7 +68,7 @@ public class HqVenueReservationController extends BaseController { /** * 导出场地预约列表 */ - //@SaCheckPermission("hq:reservation:export") + @SaCheckPermission("hq:reservation:export") @Log(title = "场地预约", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HqVenueReservationBo bo, HttpServletResponse response) { @@ -79,7 +79,7 @@ public class HqVenueReservationController extends BaseController { /** * 获取场地预约详细信息 */ - //@SaCheckPermission("hq:reservation:query") + @SaCheckPermission("hq:reservation:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(reservationService.queryById(id)); @@ -88,7 +88,7 @@ public class HqVenueReservationController extends BaseController { /** * 新增场地预约 */ - //@SaCheckPermission("hq:reservation:add") + @SaCheckPermission("hq:reservation:add") @Log(title = "场地预约", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -99,7 +99,7 @@ public class HqVenueReservationController extends BaseController { /** * 修改场地预约 */ - //@SaCheckPermission("hq:reservation:edit") + @SaCheckPermission("hq:reservation:edit") @Log(title = "场地预约", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -110,7 +110,7 @@ public class HqVenueReservationController extends BaseController { /** * 删除场地预约 */ - //@SaCheckPermission("hq:reservation:remove") + @SaCheckPermission("hq:reservation:remove") @Log(title = "场地预约", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -120,7 +120,7 @@ public class HqVenueReservationController extends BaseController { /** * 检查时间冲突 */ - //@SaCheckPermission("hq:reservation:query") + @SaCheckPermission("hq:reservation:query") @GetMapping("/conflict") public R> checkTimeConflict( @RequestParam("venueId") Long venueId, @@ -134,7 +134,7 @@ public class HqVenueReservationController extends BaseController { /** * 审批场地预约 */ - //@SaCheckPermission("hq:reservation:approve") + @SaCheckPermission("hq:reservation:approve") @Log(title = "场地预约审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/approve") diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java index 31f70c3f..c8ea4381 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java @@ -52,7 +52,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 查询贫困生认定申请列表 */ - //@SaCheckPermission("jcbt:povertyApplication:list") + @SaCheckPermission("jcbt:povertyApplication:list") @GetMapping("/list") @Operation(summary = "查询贫困生认定申请列表") public TableDataInfo list(JcbtPovertyApplicationBo bo, PageQuery pageQuery) { @@ -62,7 +62,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 获取贫困生认定申请详细信息 */ - //@SaCheckPermission("jcbt:povertyApplication:query") + @SaCheckPermission("jcbt:povertyApplication:query") @GetMapping("/{id}") @Operation(summary = "获取贫困生认定申请详细信息") public R getInfo(@Parameter(description = "主键") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 新增贫困生认定申请 */ - //@SaCheckPermission("jcbt:povertyApplication:add") + @SaCheckPermission("jcbt:povertyApplication:add") @Log(title = "贫困生认定申请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -89,7 +89,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 修改贫困生认定申请 */ - //@SaCheckPermission("jcbt:povertyApplication:edit") + @SaCheckPermission("jcbt:povertyApplication:edit") @Log(title = "贫困生认定申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -101,7 +101,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 删除贫困生认定申请 */ - //@SaCheckPermission("jcbt:povertyApplication:remove") + @SaCheckPermission("jcbt:povertyApplication:remove") @Log(title = "删除贫困生认定申请", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") @Operation(summary = "删除贫困生认定申请") @@ -112,7 +112,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 导出贫困生认定申请列表 */ - //@SaCheckPermission("jcbt:povertyApplication:export") + @SaCheckPermission("jcbt:povertyApplication:export") @Log(title = "导出贫困生认定申请", businessType = BusinessType.EXPORT) @PostMapping("/export") @Operation(summary = "导出贫困生认定申请列表") @@ -124,7 +124,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 导出我的申请列表（班主任导出自己提交的申请） */ - //@SaCheckPermission("jcbt:povertyApplication:myList") + @SaCheckPermission("jcbt:povertyApplication:myList") @Log(title = "导出我的贫困生认定申请", businessType = BusinessType.EXPORT) @PostMapping("/myExport") @Operation(summary = "导出我的申请列表") @@ -139,7 +139,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 查询我的申请列表（班主任查看自己提交的申请） */ - //@SaCheckPermission("jcbt:povertyApplication:myList") + @SaCheckPermission("jcbt:povertyApplication:myList") @GetMapping("/myList") @Operation(summary = "查询我的申请列表") public TableDataInfo myList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) { @@ -150,7 +150,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 查询待审核申请列表（审核人员使用） */ - //@SaCheckPermission("jcbt:povertyApplication:pendingList") + @SaCheckPermission("jcbt:povertyApplication:pendingList") @GetMapping("/pendingList") @Operation(summary = "查询待审核申请列表") public TableDataInfo pendingList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) { @@ -160,7 +160,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 提交申请 */ - //@SaCheckPermission("jcbt:povertyApplication:submit") + @SaCheckPermission("jcbt:povertyApplication:submit") @Log(title = "提交贫困生认定申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/submit/{id}") @@ -172,7 +172,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 撤销申请 */ - //@SaCheckPermission("jcbt:povertyApplication:cancel") + @SaCheckPermission("jcbt:povertyApplication:cancel") @Log(title = "撤销贫困生认定申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/cancel/{id}") @@ -186,7 +186,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 根据申请编号获取申请信息 */ - //@SaCheckPermission("jcbt:povertyApplication:query") + @SaCheckPermission("jcbt:povertyApplication:query") @GetMapping("/byApplicationNo/{applicationNo}") @Operation(summary = "根据申请编号获取申请信息") public R getInfoByApplicationNo(@Parameter(description = "申请编号") @PathVariable("applicationNo") String applicationNo) { @@ -196,7 +196,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 保存草稿 */ - //@SaCheckPermission("jcbt:povertyApplication:saveDraft") + @SaCheckPermission("jcbt:povertyApplication:saveDraft") @Log(title = "保存贫困生认定申请草稿", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/saveDraft") @@ -208,7 +208,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 审核通过 */ - //@SaCheckPermission("jcbt:povertyApplication:approve") + @SaCheckPermission("jcbt:povertyApplication:approve") @Log(title = "审核通过贫困生认定申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/approve") @@ -220,7 +220,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 审核驳回 */ - //@SaCheckPermission("jcbt:povertyApplication:reject") + @SaCheckPermission("jcbt:povertyApplication:reject") @Log(title = "审核驳回贫困生认定申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/reject") @@ -232,7 +232,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 生成申请编号 */ - //@SaCheckPermission("jcbt:povertyApplication:add") + @SaCheckPermission("jcbt:povertyApplication:add") @GetMapping("/generateApplicationNo") @Operation(summary = "生成申请编号") public R generateApplicationNo() { @@ -242,7 +242,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 检查学生申请是否重复 */ - //@SaCheckPermission("jcbt:povertyApplication:add") + @SaCheckPermission("jcbt:povertyApplication:add") @GetMapping("/checkDuplicate") @Operation(summary = "检查学生申请是否重复") public R checkDuplicate(@Parameter(description = "学生ID") @RequestParam("studentId") Long studentId, @@ -258,7 +258,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 获取申请统计信息 */ - //@SaCheckPermission("jcbt:povertyApplication:statistics") + @SaCheckPermission("jcbt:povertyApplication:statistics") @GetMapping("/statistics") @Operation(summary = "获取申请统计信息") public R> statistics(@Parameter(description = "班主任ID") @RequestParam(value = "teacherId", required = false) Long teacherId) { @@ -284,7 +284,7 @@ public class JcbtPovertyApplicationController extends BaseController { /** * 获取我的申请统计信息（班主任使用） */ - //@SaCheckPermission("jcbt:povertyApplication:myList") + @SaCheckPermission("jcbt:povertyApplication:myList") @GetMapping("/myStatistics") @Operation(summary = "获取我的申请统计信息") public R> myStatistics() { @@ -312,7 +312,7 @@ public class JcbtPovertyApplicationController extends BaseController { * 获取当前用户班级信息 */ @Operation(summary = "获取当前用户班级信息") - //@SaCheckPermission("jcbt:povertyApplication:list") + @SaCheckPermission("jcbt:povertyApplication:list") @GetMapping("/user/classes") public R>> getCurrentUserClasses() { Long currentUserId = LoginHelper.getLoginUser().getUserId(); @@ -325,7 +325,7 @@ public class JcbtPovertyApplicationController extends BaseController { */ @Operation(summary = "获取班级学生列表") @Parameter(name = "classId", description = "班级ID", required = true) - //@SaCheckPermission("jcbt:povertyApplication:list") + @SaCheckPermission("jcbt:povertyApplication:list") @GetMapping("/class/{classId}/students") public R>> getClassStudents(@PathVariable("classId") Long classId) { List> students = povertyApplicationService.getClassStudents(classId); diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java index d19ff4f9..3a613490 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java @@ -51,7 +51,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 查询待审核申请列表 */ - //@SaCheckPermission("jcbt:povertyApplication:query") + @SaCheckPermission("jcbt:povertyApplication:query") @GetMapping("/pendingList") @Operation(summary = "查询待审核申请列表") public TableDataInfo pendingList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) { @@ -61,7 +61,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 查询所有申请列表（支持多状态筛选） */ - //@SaCheckPermission("jcbt:povertyApplication:query") + @SaCheckPermission("jcbt:povertyApplication:query") @GetMapping("/list") @Operation(summary = "查询所有申请列表") public TableDataInfo list(JcbtPovertyApplicationBo bo, PageQuery pageQuery) { @@ -86,7 +86,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 获取申请详情 */ - //@SaCheckPermission("jcbt:povertyApplication:detail") + @SaCheckPermission("jcbt:povertyApplication:detail") @GetMapping("/{id}") @Operation(summary = "获取申请详情") public R getInfo(@Parameter(description = "申请ID") @PathVariable("id") Long id) { @@ -96,7 +96,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 审核通过 */ - //@SaCheckPermission("jcbt:povertyApplication:approve") + @SaCheckPermission("jcbt:povertyApplication:approve") @Log(title = "审核通过贫困生认定申请", businessType = BusinessType.UPDATE) @PutMapping("/approve") @Operation(summary = "审核通过") @@ -107,7 +107,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 审核驳回 */ - //@SaCheckPermission("jcbt:povertyApplication:reject") + @SaCheckPermission("jcbt:povertyApplication:reject") @Log(title = "审核驳回贫困生认定申请", businessType = BusinessType.UPDATE) @PutMapping("/reject") @Operation(summary = "审核驳回") @@ -118,7 +118,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 打回修改 */ - //@SaCheckPermission("jcbt:povertyApplication:reject") + @SaCheckPermission("jcbt:povertyApplication:reject") @Log(title = "打回修改贫困生认定申请", businessType = BusinessType.UPDATE) @PutMapping("/returnToDraft") @Operation(summary = "打回修改") @@ -129,7 +129,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 批量审核通过 */ - //@SaCheckPermission("jcbt:povertyApplication:approve") + @SaCheckPermission("jcbt:povertyApplication:approve") @Log(title = "批量审核通过贫困生认定申请", businessType = BusinessType.UPDATE) @PutMapping("/batchApprove") @Operation(summary = "批量审核通过") @@ -141,7 +141,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 批量审核驳回 */ - //@SaCheckPermission("jcbt:povertyApplication:reject") + @SaCheckPermission("jcbt:povertyApplication:reject") @Log(title = "批量审核驳回贫困生认定申请", businessType = BusinessType.UPDATE) @PutMapping("/batchReject") @Operation(summary = "批量审核驳回") @@ -155,7 +155,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 获取审核统计信息 */ - //@SaCheckPermission("jcbt:povertyApplication:statistics") + @SaCheckPermission("jcbt:povertyApplication:statistics") @GetMapping("/statistics") @Operation(summary = "获取审核统计信息") public R> statistics(@Parameter(description = "学年") @RequestParam(value = "academicYear", required = false) String academicYear, @@ -182,7 +182,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 获取审核工作量统计 */ - //@SaCheckPermission("jcbt:povertyApplication:statistics") + @SaCheckPermission("jcbt:povertyApplication:statistics") @GetMapping("/workloadStatistics") @Operation(summary = "获取审核工作量统计") public R>> workloadStatistics(@Parameter(description = "开始时间") @RequestParam(value = "startTime", required = false) String startTime, @@ -196,7 +196,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 导出申请数据 */ - //@SaCheckPermission("jcbt:povertyApplication:export") + @SaCheckPermission("jcbt:povertyApplication:export") @Log(title = "导出贫困生认定申请数据", businessType = BusinessType.EXPORT) @PostMapping("/export") @Operation(summary = "导出申请数据") @@ -208,7 +208,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 导出待审核申请数据 */ - //@SaCheckPermission("jcbt:povertyApplication:export") + @SaCheckPermission("jcbt:povertyApplication:export") @Log(title = "导出待审核贫困生认定申请数据", businessType = BusinessType.EXPORT) @PostMapping("/exportPending") @Operation(summary = "导出待审核申请数据") @@ -224,7 +224,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 获取申请附件预览信息 */ - //@SaCheckPermission("jcbt:povertyApplication:detail") + @SaCheckPermission("jcbt:povertyApplication:detail") @GetMapping("/{id}/attachments") @Operation(summary = "获取申请附件预览信息") public R> getAttachments(@Parameter(description = "申请ID") @PathVariable("id") Long id) { @@ -253,7 +253,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { /** * 获取审核历史记录 */ - //@SaCheckPermission("jcbt:povertyApplication:detail") + @SaCheckPermission("jcbt:povertyApplication:detail") @GetMapping("/{id}/history") @Operation(summary = "获取审核历史记录") public R>> getAuditHistory(@Parameter(description = "申请ID") @PathVariable("id") Long id) { diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java index a902c648..6a12e342 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java @@ -53,7 +53,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 查询奖学金申请记录列表 */ - //@SaCheckPermission("jcbt:scholarshipApplication:list") + @SaCheckPermission("jcbt:scholarshipApplication:list") @GetMapping("/list") @Operation(summary = "查询奖学金申请记录列表") public TableDataInfo list(JcbtScholarshipApplicationBo bo, PageQuery pageQuery) { @@ -63,7 +63,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 获取奖学金申请记录详细信息 */ - //@SaCheckPermission("jcbt:scholarshipApplication:query") + @SaCheckPermission("jcbt:scholarshipApplication:query") @GetMapping("/{id}") @Operation(summary = "获取奖学金申请记录详细信息") public R getInfo(@Parameter(description = "主键") @PathVariable("id") Long id) { @@ -73,7 +73,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 新增奖学金申请记录 */ - //@SaCheckPermission("jcbt:scholarshipApplication:add") + @SaCheckPermission("jcbt:scholarshipApplication:add") @Log(title = "奖学金申请记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -85,7 +85,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 修改奖学金申请记录 */ - //@SaCheckPermission("jcbt:scholarshipApplication:edit") + @SaCheckPermission("jcbt:scholarshipApplication:edit") @Log(title = "奖学金申请记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -116,7 +116,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 删除奖学金申请记录 */ - //@SaCheckPermission("jcbt:scholarshipApplication:remove") + @SaCheckPermission("jcbt:scholarshipApplication:remove") @Log(title = "奖学金申请记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") @Operation(summary = "删除奖学金申请记录") @@ -127,7 +127,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 获取可申请的奖学金类型列表 */ - //@SaCheckPermission("jcbt:scholarshipApplication:available") + @SaCheckPermission("jcbt:scholarshipApplication:available") @GetMapping("/available") @Operation(summary = "获取可申请的奖学金类型列表") public R>> getAvailableScholarshipTypes(@Parameter(description = "班级ID") @RequestParam("classId") Long classId, @@ -140,7 +140,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 查询我的申请记录（班主任） */ - //@SaCheckPermission("jcbt:scholarshipApplication:my") + @SaCheckPermission("jcbt:scholarshipApplication:my") @GetMapping("/my") @Operation(summary = "查询我的申请记录") public R> getMyApplications(@Parameter(description = "申请人ID") @RequestParam("applicantId") Long applicantId, @@ -151,7 +151,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 查询待审核申请 */ - //@SaCheckPermission("jcbt:scholarshipApplication:pending") + @SaCheckPermission("jcbt:scholarshipApplication:pending") @GetMapping("/pending") @Operation(summary = "查询待审核申请") public R> getPendingApplications(@Parameter(description = "审核人ID") @RequestParam(value = "reviewerId", required = false) Long reviewerId, @@ -162,7 +162,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 检查学生申请资格 */ - //@SaCheckPermission("jcbt:scholarshipApplication:check") + @SaCheckPermission("jcbt:scholarshipApplication:check") @GetMapping("/check") @Operation(summary = "检查学生申请资格") public R> checkStudentEligibility(@Parameter(description = "学生ID") @RequestParam("studentId") Long studentId, @@ -174,7 +174,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 批量审核申请 */ - //@SaCheckPermission("jcbt:scholarshipApplication:approve") + @SaCheckPermission("jcbt:scholarshipApplication:approve") @Log(title = "批量审核奖学金申请", businessType = BusinessType.UPDATE) @PostMapping("/approve") @Operation(summary = "批量审核申请") @@ -191,7 +191,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 导出奖学金申请记录列表 */ - //@SaCheckPermission("jcbt:scholarshipApplication:export") + @SaCheckPermission("jcbt:scholarshipApplication:export") @Log(title = "奖学金申请记录", businessType = BusinessType.EXPORT) @PostMapping("/export") @Operation(summary = "导出奖学金申请记录列表") @@ -203,7 +203,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 导入奖学金申请记录 */ - //@SaCheckPermission("jcbt:scholarshipApplication:import") + @SaCheckPermission("jcbt:scholarshipApplication:import") @Log(title = "奖学金申请记录", businessType = BusinessType.IMPORT) @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @Operation(summary = "导入奖学金申请记录") @@ -222,7 +222,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 获取申请统计数据 */ - //@SaCheckPermission("jcbt:scholarshipApplication:statistics") + @SaCheckPermission("jcbt:scholarshipApplication:statistics") @GetMapping("/statistics") @Operation(summary = "获取申请统计数据") public R> getStatistics(@Parameter(description = "批次ID") @RequestParam(value = "batchId", required = false) Long batchId, @@ -233,7 +233,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 班主任批量申请提交 */ - //@SaCheckPermission("jcbt:scholarshipApplication:batch") + @SaCheckPermission("jcbt:scholarshipApplication:batch") @Log(title = "班主任批量申请提交", businessType = BusinessType.INSERT) @PostMapping("/batch") @Operation(summary = "班主任批量申请提交") @@ -247,7 +247,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 提交申请 */ - //@SaCheckPermission("jcbt:scholarshipApplication:submit") + @SaCheckPermission("jcbt:scholarshipApplication:submit") @Log(title = "提交奖学金申请", businessType = BusinessType.UPDATE) @PostMapping("/{id}/submit") @Operation(summary = "提交申请") @@ -258,7 +258,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 撤回申请 */ - //@SaCheckPermission("jcbt:scholarshipApplication:withdraw") + @SaCheckPermission("jcbt:scholarshipApplication:withdraw") @Log(title = "撤回奖学金申请", businessType = BusinessType.UPDATE) @PostMapping("/{id}/withdraw") @Operation(summary = "撤回申请") @@ -272,7 +272,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 获取班级名额使用情况 */ - //@SaCheckPermission("jcbt:scholarshipApplication:quota") + @SaCheckPermission("jcbt:scholarshipApplication:quota") @GetMapping("/quota") @Operation(summary = "获取班级名额使用情况") public R> getClassQuotaUsage(@Parameter(description = "班级ID") @RequestParam("classId") Long classId, @@ -285,7 +285,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 获取班主任所带班级信息 */ - //@SaCheckPermission("jcbt:scholarshipApplication:classInfo") + @SaCheckPermission("jcbt:scholarshipApplication:classInfo") @GetMapping("/classInfo") @Operation(summary = "获取班主任所带班级信息") public R> getClassInfoByTeacher(@Parameter(description = "班主任ID") @RequestParam("teacherId") Long teacherId) { @@ -295,7 +295,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 获取班级学生列表（用于勾选） */ - //@SaCheckPermission("jcbt:scholarshipApplication:students") + @SaCheckPermission("jcbt:scholarshipApplication:students") @GetMapping("/students") @Operation(summary = "获取班级学生列表") public R>> getClassStudents(@Parameter(description = "班级ID") @RequestParam("classId") Long classId) { @@ -305,7 +305,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 根据批次获取可申请的奖学金类型 */ - //@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") + @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") @GetMapping("/scholarshipTypes") @Operation(summary = "根据批次获取可申请的奖学金类型") public R>> getScholarshipTypesByBatch(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId) { @@ -315,7 +315,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 根据批次和班级获取带名额信息的奖学金类型（班主任专用） */ - //@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") + @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") @GetMapping("/scholarshipTypesWithQuota") @Operation(summary = "根据批次和班级获取带名额信息的奖学金类型") public R>> getScholarshipTypesWithQuota( @@ -327,7 +327,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 确认选择班级（多班级时用户选择后调用） */ - //@SaCheckPermission("jcbt:scholarshipApplication:classInfo") + @SaCheckPermission("jcbt:scholarshipApplication:classInfo") @PostMapping("/confirmClass") @Operation(summary = "确认选择班级") public R> confirmClassSelection(@Parameter(description = "班主任ID") @RequestParam("teacherId") Long teacherId, @@ -338,7 +338,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 测试接口：获取奖学金类型数据结构 */ - //@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") + @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") @GetMapping("/test/scholarshipTypesStructure") @Operation(summary = "测试接口：获取奖学金类型数据结构") public R> testScholarshipTypesStructure(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId, @@ -361,7 +361,7 @@ public class JcbtScholarshipApplicationController extends BaseController { /** * 调试接口：详细SQL日志输出测试 */ - //@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") + @SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") @GetMapping("/debug/sqlLogs") @Operation(summary = "调试接口：详细SQL日志输出测试") public R> debugSqlLogs(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId, diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java index 6a5272dc..4ccf919d 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java @@ -41,7 +41,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 查询奖学金评定批次列表 */ - //@SaCheckPermission("jcbt:scholarshipBatch:list") + @SaCheckPermission("jcbt:scholarshipBatch:list") @GetMapping("/list") public TableDataInfo list(JcbtScholarshipBatchBo bo, PageQuery pageQuery) { return scholarshipBatchService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 导出奖学金评定批次列表 */ - //@SaCheckPermission("jcbt:scholarshipBatch:export") + @SaCheckPermission("jcbt:scholarshipBatch:export") @Log(title = "奖学金评定批次", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(JcbtScholarshipBatchBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 获取奖学金评定批次详细信息 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 新增奖学金评定批次 */ - //@SaCheckPermission("jcbt:scholarshipBatch:add") + @SaCheckPermission("jcbt:scholarshipBatch:add") @Log(title = "奖学金评定批次", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 修改奖学金评定批次 */ - //@SaCheckPermission("jcbt:scholarshipBatch:edit") + @SaCheckPermission("jcbt:scholarshipBatch:edit") @Log(title = "奖学金评定批次", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -93,7 +93,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 删除奖学金评定批次 */ - //@SaCheckPermission("jcbt:scholarshipBatch:remove") + @SaCheckPermission("jcbt:scholarshipBatch:remove") @Log(title = "奖学金评定批次", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -104,7 +104,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 根据批次编码查询批次信息 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getByCode/{batchCode}") public R getByBatchCode(@PathVariable("batchCode") String batchCode) { return R.ok(scholarshipBatchService.queryByBatchCode(batchCode)); @@ -113,7 +113,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 根据学年和学期查询批次列表 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getByAcademicYear") public R> getByAcademicYearAndSemester( @RequestParam("academicYear") String academicYear, @@ -124,7 +124,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 查询启用状态的批次列表 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getActiveBatches") public R> getActiveBatches() { return R.ok(scholarshipBatchService.queryActiveBatches()); @@ -133,7 +133,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 检查批次编码是否唯一 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/checkBatchCodeUnique") public R checkBatchCodeUnique(@RequestParam("batchCode") String batchCode, @RequestParam(value = "id", required = false) Long id) { @@ -143,7 +143,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 更改批次状态 */ - //@SaCheckPermission("jcbt:scholarshipBatch:edit") + @SaCheckPermission("jcbt:scholarshipBatch:edit") @Log(title = "奖学金评定批次", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") String status) { @@ -153,7 +153,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 查询当前进行中的批次 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getCurrentActiveBatches") public R> getCurrentActiveBatches() { return R.ok(scholarshipBatchService.queryCurrentActiveBatches()); @@ -162,7 +162,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 根据状态查询批次列表 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getByStatus/{status}") public R> getByStatus(@PathVariable("status") String status) { return R.ok(scholarshipBatchService.queryByStatus(status)); @@ -171,7 +171,7 @@ public class JcbtScholarshipBatchController extends BaseController { /** * 检查批次时间是否有冲突 */ - //@SaCheckPermission("jcbt:scholarshipBatch:query") + @SaCheckPermission("jcbt:scholarshipBatch:query") @PostMapping("/checkTimeConflict") public R checkTimeConflict(@RequestBody JcbtScholarshipBatchBo bo) { return R.ok(scholarshipBatchService.checkTimeConflict(bo)); diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java index f25be64f..30183665 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java @@ -41,7 +41,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 查询奖学金名额分配列表 */ - //@SaCheckPermission("jcbt:scholarshipQuota:list") + @SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/list") public TableDataInfo list(JcbtScholarshipQuotaBo bo, PageQuery pageQuery) { return scholarshipQuotaService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 查询指定批次的名额分配列表 */ - //@SaCheckPermission("jcbt:scholarshipQuota:list") + @SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/listByBatch/{batchId}") public R> listByBatch(@PathVariable("batchId") Long batchId) { List list = scholarshipQuotaService.queryListByBatchId(batchId); @@ -60,7 +60,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 查询指定批次和奖学金类型的名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:list") + @SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/listByBatchAndType") public R> listByBatchAndType(@RequestParam("batchId") Long batchId, @RequestParam("scholarshipTypeId") Long scholarshipTypeId) { @@ -71,7 +71,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 查询名额分配树形结构 */ - //@SaCheckPermission("jcbt:scholarshipQuota:list") + @SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/tree") public R> tree(@RequestParam("batchId") Long batchId, @RequestParam("scholarshipTypeId") Long scholarshipTypeId) { @@ -82,7 +82,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 查询名额使用统计 */ - //@SaCheckPermission("jcbt:scholarshipQuota:list") + @SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/statistics/{batchId}") public R> statistics(@PathVariable("batchId") Long batchId) { Map statistics = scholarshipQuotaService.queryQuotaUsageStatistics(batchId); @@ -92,7 +92,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 导出奖学金名额分配列表 */ - //@SaCheckPermission("jcbt:scholarshipQuota:export") + @SaCheckPermission("jcbt:scholarshipQuota:export") @Log(title = "导出奖学金名额分配", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(JcbtScholarshipQuotaBo bo, HttpServletResponse response) { @@ -103,7 +103,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 获取奖学金名额分配详细信息 */ - //@SaCheckPermission("jcbt:scholarshipQuota:query") + @SaCheckPermission("jcbt:scholarshipQuota:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(scholarshipQuotaService.queryById(id)); @@ -112,7 +112,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 新增奖学金名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:add") + @SaCheckPermission("jcbt:scholarshipQuota:add") @Log(title = "新增奖学金名额分配", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -123,7 +123,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 修改奖学金名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:edit") + @SaCheckPermission("jcbt:scholarshipQuota:edit") @Log(title = "修改奖学金名额分配", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -134,7 +134,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 删除奖学金名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:remove") + @SaCheckPermission("jcbt:scholarshipQuota:remove") @Log(title = "删除奖学金名额分配", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -144,7 +144,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 批量删除奖学金名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:remove") + @SaCheckPermission("jcbt:scholarshipQuota:remove") @Log(title = "批量删除奖学金名额分配", businessType = BusinessType.DELETE) @DeleteMapping("/batch") public R batchRemove(@RequestBody @NotEmpty(message = "主键不能为空") List ids) { @@ -154,7 +154,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 清空指定批次和奖学金类型的名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:remove") + @SaCheckPermission("jcbt:scholarshipQuota:remove") @Log(title = "清空奖学金名额分配", businessType = BusinessType.DELETE) @DeleteMapping("/clear") public R clearQuotaByBatchAndType(@RequestParam("batchId") Long batchId, @@ -165,7 +165,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 批量分配名额 */ - //@SaCheckPermission("jcbt:scholarshipQuota:add") + @SaCheckPermission("jcbt:scholarshipQuota:add") @Log(title = "批量分配奖学金名额", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batchAllocate") @@ -178,7 +178,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 调整名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:edit") + @SaCheckPermission("jcbt:scholarshipQuota:edit") @Log(title = "调整奖学金名额分配", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/adjust") @@ -192,7 +192,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 锁定/解锁名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:edit") + @SaCheckPermission("jcbt:scholarshipQuota:edit") @Log(title = "锁定/解锁奖学金名额分配", businessType = BusinessType.UPDATE) @PutMapping("/lock/{id}") public R lockQuota(@PathVariable("id") Long id, @RequestParam("isLocked") Integer isLocked) { @@ -202,7 +202,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 自动分配名额 */ - //@SaCheckPermission("jcbt:scholarshipQuota:edit") + @SaCheckPermission("jcbt:scholarshipQuota:edit") @Log(title = "自动分配奖学金名额", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/autoAllocate") @@ -215,7 +215,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 复制名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:add") + @SaCheckPermission("jcbt:scholarshipQuota:add") @Log(title = "复制奖学金名额分配", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/copy") @@ -228,7 +228,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 更新名额使用情况 */ - //@SaCheckPermission("jcbt:scholarshipQuota:edit") + @SaCheckPermission("jcbt:scholarshipQuota:edit") @Log(title = "更新奖学金名额使用情况", businessType = BusinessType.UPDATE) @PutMapping("/updateUsage/{id}") public R updateUsage(@PathVariable("id") Long id, @RequestParam("usedChange") Integer usedChange) { @@ -238,7 +238,7 @@ public class JcbtScholarshipQuotaController extends BaseController { /** * 验证名额分配 */ - //@SaCheckPermission("jcbt:scholarshipQuota:query") + @SaCheckPermission("jcbt:scholarshipQuota:query") @PostMapping("/validate") public R validate(@RequestBody JcbtScholarshipQuotaBo bo) { String validationMsg = scholarshipQuotaService.validateQuotaAllocation(bo); diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java index ff8c4417..88bd2d49 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java @@ -41,7 +41,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 查询奖学金审核记录列表 */ - //@SaCheckPermission("jcbt:review:list") + @SaCheckPermission("jcbt:review:list") @GetMapping("/list") public TableDataInfo list(JcbtScholarshipReviewBo bo, PageQuery pageQuery) { return reviewService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 导出奖学金审核记录列表 */ - //@SaCheckPermission("jcbt:review:export") + @SaCheckPermission("jcbt:review:export") @Log(title = "奖学金审核记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(JcbtScholarshipReviewBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 获取奖学金审核记录详细信息 */ - //@SaCheckPermission("jcbt:review:query") + @SaCheckPermission("jcbt:review:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -75,7 +75,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 根据申请ID查询审核记录 */ - //@SaCheckPermission("jcbt:review:query") + @SaCheckPermission("jcbt:review:query") @GetMapping("/application/{applicationId}") public R> getReviewsByApplicationId( @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { @@ -85,7 +85,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 查询当前用户待审核的记录 */ - //@SaCheckPermission("jcbt:review:pending") + @SaCheckPermission("jcbt:review:pending") @GetMapping("/pending") public TableDataInfo getPendingReviews( @RequestParam(value = "reviewerId", required = false) Long reviewerId, @@ -99,7 +99,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 查询审核历史记录 */ - //@SaCheckPermission("jcbt:review:history") + @SaCheckPermission("jcbt:review:history") @GetMapping("/history") public TableDataInfo getReviewHistory( @RequestParam(value = "reviewerId", required = false) Long reviewerId, @@ -114,7 +114,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 提交审核结果 */ - //@SaCheckPermission("jcbt:review:approve") + @SaCheckPermission("jcbt:review:approve") @Log(title = "提交审核结果", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/submit") @@ -130,7 +130,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 批量审核 */ - //@SaCheckPermission("jcbt:review:batchApprove") + @SaCheckPermission("jcbt:review:batchApprove") @Log(title = "批量审核", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batch") @@ -149,7 +149,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 转移审核任务 */ - //@SaCheckPermission("jcbt:review:transfer") + @SaCheckPermission("jcbt:review:transfer") @Log(title = "转移审核任务", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/transfer") @@ -164,7 +164,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 撤回审核结果 */ - //@SaCheckPermission("jcbt:review:revoke") + @SaCheckPermission("jcbt:review:revoke") @Log(title = "撤回审核结果", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/withdraw") @@ -177,7 +177,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 查询某个申请的最新审核记录 */ - //@SaCheckPermission("jcbt:review:query") + @SaCheckPermission("jcbt:review:query") @GetMapping("/latest/{applicationId}") public R getLatestReview( @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { @@ -187,7 +187,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 查询某个申请的指定级别审核记录 */ - //@SaCheckPermission("jcbt:review:query") + @SaCheckPermission("jcbt:review:query") @GetMapping("/level/{applicationId}/{reviewLevel}") public R getReviewByLevel( @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, @@ -198,7 +198,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 统计审核数量 */ - //@SaCheckPermission("jcbt:review:statistics") + @SaCheckPermission("jcbt:review:statistics") @GetMapping("/statistics/count") public R> getReviewCount( @RequestParam(value = "reviewerId", required = false) Long reviewerId, @@ -211,7 +211,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 获取下一级审核人员列表 */ - //@SaCheckPermission("jcbt:review:query") + @SaCheckPermission("jcbt:review:query") @GetMapping("/next-reviewers/{applicationId}/{currentLevel}") public R> getNextReviewers( @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, @@ -222,7 +222,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 审核流程推进 */ - //@SaCheckPermission("jcbt:review:approve") + @SaCheckPermission("jcbt:review:approve") @Log(title = "审核流程推进", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/advance") @@ -238,7 +238,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 检查用户审核权限 */ - //@SaCheckPermission("jcbt:review:query") + @SaCheckPermission("jcbt:review:query") @GetMapping("/permission") public R checkReviewPermission( @NotNull(message = "审核人ID不能为空") @RequestParam("reviewerId") Long reviewerId, @@ -250,7 +250,7 @@ public class JcbtScholarshipReviewController extends BaseController { /** * 获取审核统计信息 */ - //@SaCheckPermission("jcbt:review:statistics") + @SaCheckPermission("jcbt:review:statistics") @GetMapping("/statistics") public R> getReviewStatistics( @RequestParam(value = "reviewerId", required = false) Long reviewerId, diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java index 2b11142f..7d843df2 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java @@ -47,7 +47,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 查询奖学金类型列表 */ - //@SaCheckPermission("jcbt:scholarshipType:list") + @SaCheckPermission("jcbt:scholarshipType:list") @GetMapping("/list") public TableDataInfo list(JcbtScholarshipTypeBo bo, PageQuery pageQuery) { return scholarshipTypeService.queryPageList(bo, pageQuery); @@ -56,7 +56,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 导出奖学金类型列表 */ - //@SaCheckPermission("jcbt:scholarshipType:export") + @SaCheckPermission("jcbt:scholarshipType:export") @Log(title = "奖学金类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(JcbtScholarshipTypeBo bo, HttpServletResponse response) { @@ -67,7 +67,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 获取奖学金类型详细信息 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -77,7 +77,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 新增奖学金类型 */ - //@SaCheckPermission("jcbt:scholarshipType:add") + @SaCheckPermission("jcbt:scholarshipType:add") @Log(title = "奖学金类型", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -88,7 +88,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 修改奖学金类型 */ - //@SaCheckPermission("jcbt:scholarshipType:edit") + @SaCheckPermission("jcbt:scholarshipType:edit") @Log(title = "奖学金类型", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -99,7 +99,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 删除奖学金类型 */ - //@SaCheckPermission("jcbt:scholarshipType:remove") + @SaCheckPermission("jcbt:scholarshipType:remove") @Log(title = "奖学金类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -110,7 +110,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 根据类型名称查询奖学金类型 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/getByName/{typeName}") public R getByTypeName(@PathVariable("typeName") String typeName) { return R.ok(scholarshipTypeService.queryByTypeName(typeName)); @@ -119,7 +119,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 根据类别查询奖学金类型列表 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/getByCategory/{typeCategory}") public R> getByCategory(@PathVariable("typeCategory") String typeCategory) { return R.ok(scholarshipTypeService.queryByCategory(typeCategory)); @@ -128,7 +128,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 查询启用状态的奖学金类型列表 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/getActiveTypes") public R> getActiveTypes() { return R.ok(scholarshipTypeService.queryActiveTypes()); @@ -137,7 +137,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 检查奖学金名称是否重复 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/checkTypeNameUnique") public R checkTypeNameUnique(@RequestParam("typeName") String typeName, @RequestParam(value = "id", required = false) Long id) { @@ -147,7 +147,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 批量更新排序号 */ - //@SaCheckPermission("jcbt:scholarshipType:edit") + @SaCheckPermission("jcbt:scholarshipType:edit") @Log(title = "奖学金类型", businessType = BusinessType.UPDATE) @PutMapping("/batchUpdateSort") public R batchUpdateSortOrder(@RequestBody List scholarshipTypes) { @@ -157,7 +157,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 根据兼得类型查询相关奖学金类型 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/getByCompatibilityType/{compatibilityType}") public R> getByCompatibilityType(@PathVariable("compatibilityType") String compatibilityType) { return R.ok(scholarshipTypeService.queryByCompatibilityType(compatibilityType)); @@ -166,7 +166,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 启用/停用奖学金类型 */ - //@SaCheckPermission("jcbt:scholarshipType:edit") + @SaCheckPermission("jcbt:scholarshipType:edit") @Log(title = "奖学金类型", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { @@ -176,7 +176,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 获取奖学金类型选项列表 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/options") public R> getOptions() { return R.ok(scholarshipTypeService.queryOptions()); @@ -185,7 +185,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 获取奖学金类型的兼得关系配置 */ - //@SaCheckPermission("jcbt:scholarshipType:compatibility") + @SaCheckPermission("jcbt:scholarshipType:compatibility") @GetMapping("/{id}/compatibility") public R> getCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { // 获取所有启用的奖学金类型（除了当前奖学金） @@ -224,7 +224,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 保存奖学金类型的兼得关系配置 */ - //@SaCheckPermission("jcbt:scholarshipType:compatibility") + @SaCheckPermission("jcbt:scholarshipType:compatibility") @Log(title = "奖学金兼得关系配置", businessType = BusinessType.UPDATE) @PostMapping("/{id}/compatibility") public R saveCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, @@ -270,7 +270,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 检查两个奖学金类型是否兼容 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/checkCompatibility") public R checkCompatibility(@RequestParam("typeId1") Long typeId1, @RequestParam("typeId2") Long typeId2) { return R.ok(compatibilityService.checkCompatibility(typeId1, typeId2)); @@ -279,7 +279,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 获取可与指定奖学金兼得的奖学金类型列表 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/{id}/compatibleTypes") public R> getCompatibleTypes(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { List compatibleTypeIds = compatibilityService.getCompatibleTypeIds(id); @@ -298,7 +298,7 @@ public class JcbtScholarshipTypeController extends BaseController { /** * 获取奖学金类型的互斥关系显示文本 */ - //@SaCheckPermission("jcbt:scholarshipType:query") + @SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/{id}/exclusiveRelationDisplay") public R getExclusiveRelationDisplay(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(scholarshipTypeService.getExclusiveRelationDisplay(id)); diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java index e782b5d9..fa6ab68e 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java @@ -52,7 +52,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 查询本学院待审核申请列表 */ @Operation(summary = "查询本学院待审核申请列表") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/pendingList") public TableDataInfo pendingList(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) { // 获取当前用户的学院ID @@ -75,7 +75,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 查询本学院所有申请列表（支持多状态筛选） */ @Operation(summary = "查询本学院所有申请列表") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/list") public TableDataInfo list(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) { // 获取当前用户的学院ID @@ -108,7 +108,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 获取本学院申请详情 */ @Operation(summary = "获取本学院申请详情") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/{id}") public R getInfo(@PathVariable("id") Long id) { // 获取申请信息 @@ -146,7 +146,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 学院审核 */ @Operation(summary = "学院审核") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @Log(title = "勤工俭学申请学院审核", businessType = BusinessType.UPDATE) @PostMapping("/review") public R review(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) { @@ -168,7 +168,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 批量学院审核 */ @Operation(summary = "批量学院审核") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @Log(title = "勤工俭学申请批量学院审核", businessType = BusinessType.UPDATE) @PostMapping("/batchReview") public R batchReview( @@ -198,7 +198,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 获取本学院申请统计信息 */ @Operation(summary = "获取本学院申请统计信息") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/statistics") public R> getStatistics() { Long currentUserCollegeId = getCurrentUserCollegeIdAsLong(); @@ -246,7 +246,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 获取可用选项 */ @Operation(summary = "获取可用选项") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/options") public R> getOptions() { Map options = Map.of( @@ -273,7 +273,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl * 调试权限信息 - 查看当前用户的学院关联情况 */ @Operation(summary = "调试权限信息") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/debug/permission") public R> debugPermission() { Map result = new HashMap<>(); diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java index 592baa0b..45deb2e8 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java @@ -67,7 +67,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 获取勤工俭学申请信息详细信息 */ @Operation(summary = "获取勤工俭学申请信息详细信息") - // @SaCheckPermission("jcbt:workStudyApplication:query") // 暂时注释权限检查，用于测试 + @SaCheckPermission("jcbt:workStudyApplication:query") // 暂时注释权限检查，用于测试 @GetMapping("/detail/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(workStudyApplicationService.queryById(id)); @@ -77,7 +77,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 新增勤工俭学申请信息 */ @Operation(summary = "新增勤工俭学申请信息") - // @SaCheckPermission("jcbt:workStudyApplication:add") // 暂时注释权限检查，用于测试 + @SaCheckPermission("jcbt:workStudyApplication:add") // 暂时注释权限检查，用于测试 @Log(title = "勤工俭学申请信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -89,7 +89,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 修改勤工俭学申请信息 */ @Operation(summary = "修改勤工俭学申请信息") - //@SaCheckPermission("jcbt:workStudyApplication:edit") + @SaCheckPermission("jcbt:workStudyApplication:edit") @Log(title = "勤工俭学申请信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -101,7 +101,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 删除勤工俭学申请信息 */ @Operation(summary = "删除勤工俭学申请信息") - //@SaCheckPermission("jcbt:workStudyApplication:remove") + @SaCheckPermission("jcbt:workStudyApplication:remove") @Log(title = "勤工俭学申请信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -112,7 +112,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 导出勤工俭学申请信息列表 */ @Operation(summary = "导出勤工俭学申请信息列表") - //@SaCheckPermission("jcbt:workStudyApplication:export") + @SaCheckPermission("jcbt:workStudyApplication:export") @Log(title = "勤工俭学申请信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(JcbtWorkStudyApplicationBo bo, HttpServletResponse response) { @@ -171,7 +171,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 查询我的申请列表 */ @Operation(summary = "查询我的申请列表") - //@SaCheckPermission("jcbt:workStudyApplication:myList") + @SaCheckPermission("jcbt:workStudyApplication:myList") @GetMapping("/myList") public TableDataInfo myList(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) { return workStudyApplicationService.queryMyApplications(bo, pageQuery); @@ -181,7 +181,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 查询待学院审核列表 */ @Operation(summary = "查询待学院审核列表") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/pendingCollegeReview") public TableDataInfo pendingCollegeReview(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) { return workStudyApplicationService.queryPendingCollegeReview(bo, pageQuery); @@ -191,7 +191,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 查询待学生处审核列表 */ @Operation(summary = "查询待学生处审核列表") - //@SaCheckPermission("jcbt:workStudyApplication:finalReview") + @SaCheckPermission("jcbt:workStudyApplication:finalReview") @GetMapping("/pendingFinalReview") public TableDataInfo pendingFinalReview(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) { return workStudyApplicationService.queryPendingFinalReview(bo, pageQuery); @@ -201,7 +201,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 获取岗位申请统计信息 */ @Operation(summary = "获取岗位申请统计信息") - //@SaCheckPermission("jcbt:workStudyApplication:statistics") + @SaCheckPermission("jcbt:workStudyApplication:statistics") @GetMapping("/statistics/{positionId}") public R> getStatistics(@PathVariable("positionId") Long positionId) { return R.ok(workStudyApplicationService.getPositionApplicationStatistics(positionId)); @@ -213,7 +213,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 提交申请 */ @Operation(summary = "提交申请") - //@SaCheckPermission("jcbt:workStudyApplication:submit") + @SaCheckPermission("jcbt:workStudyApplication:submit") @Log(title = "勤工俭学申请", businessType = BusinessType.UPDATE) @PostMapping("/submit/{id}") public R submitApplication(@PathVariable("id") Long id) { @@ -224,7 +224,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 撤销申请 */ @Operation(summary = "撤销申请") - //@SaCheckPermission("jcbt:workStudyApplication:cancel") + @SaCheckPermission("jcbt:workStudyApplication:cancel") @Log(title = "勤工俭学申请", businessType = BusinessType.UPDATE) @PostMapping("/cancel/{id}") public R cancelApplication(@PathVariable("id") Long id) { @@ -235,7 +235,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 学院审核 */ @Operation(summary = "学院审核") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @Log(title = "勤工俭学申请学院审核", businessType = BusinessType.UPDATE) @PostMapping("/collegeReview") public R collegeReview(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) { @@ -246,7 +246,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 学生处审核 */ @Operation(summary = "学生处审核") - //@SaCheckPermission("jcbt:workStudyApplication:finalReview") + @SaCheckPermission("jcbt:workStudyApplication:finalReview") @Log(title = "勤工俭学申请学生处审核", businessType = BusinessType.UPDATE) @PostMapping("/finalReview") public R finalReview(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) { @@ -257,7 +257,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 批量学院审核 */ @Operation(summary = "批量学院审核") - //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") + @SaCheckPermission("jcbt:workStudyApplication:collegeReview") @Log(title = "勤工俭学申请批量学院审核", businessType = BusinessType.UPDATE) @PostMapping("/batchCollegeReview") public R batchCollegeReview( @@ -271,7 +271,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 批量学生处审核 */ @Operation(summary = "批量学生处审核") - //@SaCheckPermission("jcbt:workStudyApplication:finalReview") + @SaCheckPermission("jcbt:workStudyApplication:finalReview") @Log(title = "勤工俭学申请批量学生处审核", businessType = BusinessType.UPDATE) @PostMapping("/batchFinalReview") public R batchFinalReview( @@ -289,7 +289,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 检查学生是否已申请该岗位 */ @Operation(summary = "检查学生是否已申请该岗位") - //@SaCheckPermission("jcbt:workStudyApplication:check") + @SaCheckPermission("jcbt:workStudyApplication:check") @GetMapping("/hasApplied") public R hasApplied(@RequestParam("studentId") Long studentId, @RequestParam("positionId") Long positionId) { return R.ok(workStudyApplicationService.hasApplied(studentId, positionId)); @@ -299,7 +299,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 获取可用选项 */ @Operation(summary = "获取可用选项") - //@SaCheckPermission("jcbt:workStudyApplication:options") + @SaCheckPermission("jcbt:workStudyApplication:options") @GetMapping("/options") public R> getOptions() { Map options = Map.of( @@ -351,7 +351,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { */ @Operation(summary = "获取学生已申请岗位列表") @GetMapping("/student/applicationStatus") - //@SaCheckPermission("jcbt:workStudyApplication:query") + @SaCheckPermission("jcbt:workStudyApplication:query") public R>> getStudentApplicationStatus() { List> statusList = workStudyApplicationService.getStudentApplicationStatus(); diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java index 47da6a7f..fdf61768 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java @@ -49,7 +49,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 查询待学工处审核申请列表（学院审核通过的申请） */ @Operation(summary = "查询待学工处审核申请列表") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @GetMapping("/pendingList") public TableDataInfo pendingList(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) { // 只查询学院审核通过状态的申请（待学工处审核） @@ -62,7 +62,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 查询学工处审核历史列表（支持多状态筛选） */ @Operation(summary = "查询学工处审核历史列表") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @GetMapping("/list") public TableDataInfo list(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) { // 学工处可查看所有相关状态的申请 @@ -82,7 +82,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 获取勤工俭学申请详情 */ @Operation(summary = "获取勤工俭学申请详情") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @GetMapping("/{id}") public R getInfo(@Parameter(description = "主键") @PathVariable("id") Long id) { JcbtWorkStudyApplicationVo vo = workStudyApplicationService.queryById(id); @@ -106,7 +106,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 学工处审核申请 */ @Operation(summary = "学工处审核申请") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @Log(title = "勤工俭学申请学工处审核", businessType = BusinessType.UPDATE) @PutMapping("/review") public R review(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) { @@ -137,7 +137,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 批量学工处审核 */ @Operation(summary = "批量学工处审核") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @Log(title = "勤工俭学申请批量学工处审核", businessType = BusinessType.UPDATE) @PutMapping("/batchReview") public R batchReview( @@ -179,7 +179,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 获取学工处审核统计信息 */ @Operation(summary = "获取学工处审核统计信息") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @GetMapping("/statistics") public R> getStatistics() { // 构建查询条件 @@ -225,7 +225,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 获取按学院分组的统计信息 */ @Operation(summary = "获取按学院分组的统计信息") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @GetMapping("/statisticsByCollege") public R> getStatisticsByCollege() { // 构建查询条件 @@ -255,7 +255,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base * 获取可用选项 */ @Operation(summary = "获取可用选项") - //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") + @SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @GetMapping("/options") public R> getOptions() { Map options = Map.of( diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java index 6b76176f..7f91cc98 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java @@ -58,7 +58,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 查询勤工俭学岗位信息列表 */ @Operation(summary = "查询勤工俭学岗位信息列表") - //@SaCheckPermission("jcbt:workStudyPosition:list") + @SaCheckPermission("jcbt:workStudyPosition:list") @GetMapping("/list") public TableDataInfo list(JcbtWorkStudyPositionBo bo, PageQuery pageQuery) { return workStudyPositionService.queryPageList(bo, pageQuery); @@ -68,7 +68,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 获取勤工俭学岗位信息详细信息 */ @Operation(summary = "获取勤工俭学岗位信息详细信息") - //@SaCheckPermission("jcbt:workStudyPosition:query") + @SaCheckPermission("jcbt:workStudyPosition:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) @@ -80,7 +80,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 获取岗位详情及当前用户申请状态 */ @Operation(summary = "获取岗位详情及当前用户申请状态") - //@SaCheckPermission("jcbt:workStudyPosition:query") + @SaCheckPermission("jcbt:workStudyPosition:query") @GetMapping("/{id}/withApplicationStatus") public R> getPositionWithApplicationStatus(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) @@ -108,7 +108,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 新增勤工俭学岗位信息 */ @Operation(summary = "新增勤工俭学岗位信息") - //@SaCheckPermission("jcbt:workStudyPosition:add") + @SaCheckPermission("jcbt:workStudyPosition:add") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -120,7 +120,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 修改勤工俭学岗位信息 */ @Operation(summary = "修改勤工俭学岗位信息") - //@SaCheckPermission("jcbt:workStudyPosition:edit") + @SaCheckPermission("jcbt:workStudyPosition:edit") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -132,7 +132,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 删除勤工俭学岗位信息 */ @Operation(summary = "删除勤工俭学岗位信息") - //@SaCheckPermission("jcbt:workStudyPosition:remove") + @SaCheckPermission("jcbt:workStudyPosition:remove") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -145,7 +145,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 导出勤工俭学岗位信息列表 */ @Operation(summary = "导出勤工俭学岗位信息列表") - //@SaCheckPermission("jcbt:workStudyPosition:export") + @SaCheckPermission("jcbt:workStudyPosition:export") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(JcbtWorkStudyPositionBo bo, HttpServletResponse response) { @@ -159,7 +159,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 我的岗位 - 查询当前用户所在学院的岗位 */ @Operation(summary = "我的岗位") - //@SaCheckPermission("jcbt:workStudyPosition:myList") + @SaCheckPermission("jcbt:workStudyPosition:myList") @GetMapping("/myList") public TableDataInfo myList(PageQuery pageQuery) { // TODO: 获取当前用户所在学院ID @@ -171,7 +171,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 可见岗位 - 查询学院可见的岗位（本学院岗位 + 全校范围岗位） */ @Operation(summary = "可见岗位") - //@SaCheckPermission("jcbt:workStudyPosition:visibleList") + @SaCheckPermission("jcbt:workStudyPosition:visibleList") @GetMapping("/visibleList") public TableDataInfo visibleList( JcbtWorkStudyPositionBo bo, @@ -208,7 +208,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 岗位状态检查 - 检查岗位是否可以申请 */ @Operation(summary = "岗位状态检查") - //@SaCheckPermission("jcbt:workStudyPosition:checkAvailable") + @SaCheckPermission("jcbt:workStudyPosition:checkAvailable") @GetMapping("/checkAvailable/{id}") public R checkAvailable(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) @@ -220,7 +220,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 岗位统计 - 获取岗位统计信息 */ @Operation(summary = "岗位统计") - //@SaCheckPermission("jcbt:workStudyPosition:statistics") + @SaCheckPermission("jcbt:workStudyPosition:statistics") @GetMapping("/statistics") public R> statistics(@Parameter(description = "学院ID") @RequestParam(value = "collegeId", required = false) Long collegeId) { return R.ok(workStudyPositionService.getPositionStatistics(collegeId)); @@ -232,7 +232,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 发布岗位 */ @Operation(summary = "发布岗位") - //@SaCheckPermission("jcbt:workStudyPosition:publish") + @SaCheckPermission("jcbt:workStudyPosition:publish") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE) @PutMapping("/publish/{id}") public R publish(@NotNull(message = "主键不能为空") @@ -245,7 +245,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 开启招录 */ @Operation(summary = "开启招录") - //@SaCheckPermission("jcbt:workStudyPosition:startRecruiting") + @SaCheckPermission("jcbt:workStudyPosition:startRecruiting") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE) @PutMapping("/startRecruiting/{id}") public R startRecruiting(@NotNull(message = "主键不能为空") @@ -258,7 +258,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 暂停招录 */ @Operation(summary = "暂停招录") - //@SaCheckPermission("jcbt:workStudyPosition:suspend") + @SaCheckPermission("jcbt:workStudyPosition:suspend") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE) @PutMapping("/suspend/{id}") public R suspend(@NotNull(message = "主键不能为空") @@ -271,7 +271,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 取消岗位 */ @Operation(summary = "取消岗位") - //@SaCheckPermission("jcbt:workStudyPosition:cancel") + @SaCheckPermission("jcbt:workStudyPosition:cancel") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE) @PutMapping("/cancel/{id}") public R cancel(@NotNull(message = "主键不能为空") @@ -284,7 +284,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 批量更新状态 */ @Operation(summary = "批量更新状态") - //@SaCheckPermission("jcbt:workStudyPosition:batchUpdateStatus") + @SaCheckPermission("jcbt:workStudyPosition:batchUpdateStatus") @Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE) @PutMapping("/batchUpdateStatus") public R batchUpdateStatus(@RequestParam("ids") @NotEmpty(message = "岗位ID列表不能为空") List ids, @@ -296,7 +296,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 按状态分组统计 */ @Operation(summary = "按状态分组统计") - //@SaCheckPermission("jcbt:workStudyPosition:countByStatus") + @SaCheckPermission("jcbt:workStudyPosition:countByStatus") @GetMapping("/countByStatus") public R>> countByStatus(@Parameter(description = "学院ID") @RequestParam(value = "collegeId", required = false) Long collegeId) { return R.ok(workStudyPositionService.countByStatus(collegeId)); @@ -341,7 +341,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 根据状态查询岗位 */ @Operation(summary = "根据状态查询岗位") - //@SaCheckPermission("jcbt:workStudyPosition:queryByStatus") + @SaCheckPermission("jcbt:workStudyPosition:queryByStatus") @GetMapping("/queryByStatus") public TableDataInfo queryByStatus(@RequestParam("status") String status, PageQuery pageQuery) { return workStudyPositionService.queryByStatus(status, pageQuery); @@ -351,7 +351,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 根据发布范围查询岗位 */ @Operation(summary = "根据发布范围查询岗位") - //@SaCheckPermission("jcbt:workStudyPosition:queryByScope") + @SaCheckPermission("jcbt:workStudyPosition:queryByScope") @GetMapping("/queryByScope") public TableDataInfo queryByScope(@RequestParam("positionScope") String positionScope, PageQuery pageQuery) { return workStudyPositionService.queryByPositionScope(positionScope, pageQuery); @@ -361,7 +361,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 即将过期的岗位 */ @Operation(summary = "即将过期的岗位") - //@SaCheckPermission("jcbt:workStudyPosition:expiringPositions") + @SaCheckPermission("jcbt:workStudyPosition:expiringPositions") @GetMapping("/expiringPositions") public R> expiringPositions(@RequestParam(value = "days", defaultValue = "7") int days) { return R.ok(workStudyPositionService.getExpiringPositions(days)); @@ -371,7 +371,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 热门岗位 */ @Operation(summary = "热门岗位") - //@SaCheckPermission("jcbt:workStudyPosition:popularPositions") + @SaCheckPermission("jcbt:workStudyPosition:popularPositions") @GetMapping("/popularPositions") public R> popularPositions(@RequestParam(value = "limit", defaultValue = "10") int limit) { return R.ok(workStudyPositionService.getPopularPositions(limit)); @@ -383,7 +383,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 更新过期岗位状态（定时任务调用） */ @Operation(summary = "更新过期岗位状态") - //@SaCheckPermission("jcbt:workStudyPosition:updateExpired") + @SaCheckPermission("jcbt:workStudyPosition:updateExpired") @PostMapping("/updateExpired") public R updateExpiredPositions() { int count = workStudyPositionService.updateExpiredPositions(); @@ -394,7 +394,7 @@ public class JcbtWorkStudyPositionController extends BaseController { * 更新满员岗位状态（定时任务调用） */ @Operation(summary = "更新满员岗位状态") - //@SaCheckPermission("jcbt:workStudyPosition:updateFull") + @SaCheckPermission("jcbt:workStudyPosition:updateFull") @PostMapping("/updateFull") public R updateFullPositions() { int count = workStudyPositionService.updateFullPositions(); diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsInitController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsInitController.java index f8912879..9e5d1965 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsInitController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsInitController.java @@ -1,8 +1,5 @@ package org.dromara.rs.controller; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.Resource; - import org.dromara.common.core.domain.R; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; @@ -15,17 +12,22 @@ import org.springframework.web.bind.annotation.RestController; import cn.dev33.satoken.annotation.SaCheckPermission; /** - * 人事管理初始化控制器 - * + * 人事管理初始化控制器（运维/一次性初始化用途） + *

+ * 会直接写删 sys_menu / sys_role_menu / 字典，整类须具备 system:menu:edit。 + * 生产环境建议勿调用；长期应改为 SQL 脚本并移除此 Controller。 + *

+ * * @author wuzilong */ +@SaCheckPermission("system:menu:edit") @RestController @RequestMapping("/rs/init") public class RsInitController extends BaseController { - + @Autowired private JdbcTemplate jdbcTemplate; - + /** * 初始化菜单数据 */ @@ -116,9 +118,8 @@ public class RsInitController extends BaseController { } /** - * 更新菜单数据（须登录且具备菜单编辑权限） + * 更新菜单数据 */ - @SaCheckPermission("system:menu:edit") @PostMapping("/update-menu") @Log(title = "更新人事管理菜单", businessType = BusinessType.UPDATE) public R updateMenu() { diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java index ac89c1ee..9ec78ad4 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java @@ -77,7 +77,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 查询出国申请列表 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/list") public TableDataInfo list(RsOverseasApplicationQuery query) { query.setTenantId(LoginHelper.getTenantId()); // 设置租户ID @@ -87,7 +87,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 查询我的出国申请列表（排除已通过的申请，已通过的申请显示在出国记录中） */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/my/list") public TableDataInfo myList(RsOverseasApplicationQuery query) { Long userId = LoginHelper.getUserId(); @@ -101,7 +101,7 @@ public class RsOverseasApplicationController extends BaseController { * * @deprecated 已废弃，请使用 pendingPageList 方法（支持分页和搜索） */ - // @SaCheckPermission("rs:overseasapproval:list") + @SaCheckPermission("rs:overseasapproval:list") @GetMapping("/pending/list") public R> pendingList() { List list = applicationService.queryPendingByCurrentUser(); @@ -126,7 +126,7 @@ public class RsOverseasApplicationController extends BaseController { * - college_leader_role → approval_level='4' * - party_secretary_role → approval_level='5' */ - // @SaCheckPermission("rs:overseasapproval:list") + @SaCheckPermission("rs:overseasapproval:list") @GetMapping("/pending/page") public TableDataInfo pendingPageList(RsOverseasApplicationQuery query) { return applicationService.queryPendingPageListByRole(query); @@ -148,7 +148,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 根据状态查询申请列表 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/status/{status}") public R> listByStatus(@PathVariable("status") String status) { List list = applicationService.queryByStatus(status); @@ -158,7 +158,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 导出出国申请列表 */ - // @SaCheckPermission("rs:overseas:export") + @SaCheckPermission("rs:overseas:export") @Log(title = "出国申请", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(RsOverseasApplicationQuery query, HttpServletResponse response) { @@ -177,7 +177,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 获取出国申请详细信息 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/detail/{applicationId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("applicationId") Long applicationId) { return R.ok(applicationService.queryById(applicationId)); @@ -186,7 +186,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 获取申请人的部门负责人ID */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/dept-approver/{applicationId}") public R getDepartmentApproverId(@PathVariable("applicationId") Long applicationId) { RsOverseasApplicationVo application = applicationService.queryById(applicationId); @@ -203,7 +203,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 新增出国申请 */ - // @SaCheckPermission("rs:overseas:add") + @SaCheckPermission("rs:overseas:add") @Log(title = "出国申请", businessType = BusinessType.INSERT) @PostMapping public R> add(@Validated(AddGroup.class) @RequestBody RsOverseasApplicationBo bo) { @@ -250,7 +250,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 修改出国申请 */ - // @SaCheckPermission("rs:overseas:edit") + @SaCheckPermission("rs:overseas:edit") @Log(title = "出国申请", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated(EditGroup.class) @RequestBody RsOverseasApplicationBo bo) { @@ -260,7 +260,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 提交出国申请 */ - // @SaCheckPermission("rs:overseas:submit") + @SaCheckPermission("rs:overseas:submit") @Log(title = "提交出国申请", businessType = BusinessType.UPDATE) @PutMapping("/submit/{applicationId}") public R submit(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { @@ -292,7 +292,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 重新提交被拒绝的出国申请 */ - // @SaCheckPermission("rs:overseas:edit") + @SaCheckPermission("rs:overseas:edit") @Log(title = "重新提交出国申请", businessType = BusinessType.UPDATE) @PutMapping("/resubmit/{applicationId}") public R resubmit(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, @@ -304,7 +304,7 @@ public class RsOverseasApplicationController extends BaseController { * 校验出国申请前置条件 * 用于前端在填写表单时实时提示用户 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/validatePrerequisites") public R> validatePrerequisites( @RequestParam(value = "politicalStatus", required = false) String politicalStatus, @@ -324,7 +324,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 取消出国申请 */ - // @SaCheckPermission("rs:overseas:cancel") + @SaCheckPermission("rs:overseas:cancel") @Log(title = "取消出国申请", businessType = BusinessType.UPDATE) @PutMapping("/cancel/{applicationId}") public R cancel(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, @@ -336,14 +336,14 @@ public class RsOverseasApplicationController extends BaseController { * 审批出国申请（支持标准工作流模式） * 🔴 支持五级审批权限：满足任一级别权限即可访问接口，具体级别在Service层验证 */ - // @SaCheckPermission(value = { - // "rs:overseas:approve", // 通用审批权限（超级管理员/高级审批者） - // "rs:overseas:approve1", // 第1级：部门负责人 - // "rs:overseas:approve2", // 第2级：人事处 - // "rs:overseas:approve3", // 第3级：纪委 - // "rs:overseas:approve4", // 第4级：学院分管领导 - // "rs:overseas:approve5" // 第5级：学院党委书记 - // }, mode = SaMode.OR) // 🔴 关键：OR模式，满足任一权限即可通过 + @SaCheckPermission(value = { + "rs:overseas:approve", // 通用审批权限（超级管理员/高级审批者） + "rs:overseas:approve1", // 第1级：部门负责人 + "rs:overseas:approve2", // 第2级：人事处 + "rs:overseas:approve3", // 第3级：纪委 + "rs:overseas:approve4", // 第4级：学院分管领导 + "rs:overseas:approve5" // 第5级：学院党委书记 + }, mode = SaMode.OR) // OR模式，满足任一权限即可通过 @Log(title = "审批出国申请", businessType = BusinessType.UPDATE) @PostMapping("/approve") public R approve(@RequestBody ApprovalRequest request) { @@ -363,7 +363,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 批量删除出国申请 */ - // @SaCheckPermission("rs:overseas:remove") + @SaCheckPermission("rs:overseas:remove") @Log(title = "出国申请", businessType = BusinessType.DELETE) @DeleteMapping("/{applicationIds}") public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("applicationIds") List applicationIds) { @@ -373,7 +373,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 查询出国申请审批历史 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/approval/history/{applicationId}") public R> getApprovalHistory(@PathVariable("applicationId") Long applicationId) { List approvalList = overseasApprovalService @@ -384,7 +384,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 修复已审批通过但未创建记录的申请 */ - // @SaCheckPermission("rs:overseas:approve") + @SaCheckPermission("rs:overseas:approve") @Log(title = "修复出国记录", businessType = BusinessType.UPDATE) @PostMapping("/fix/records") public R fixApprovedRecords() { @@ -452,7 +452,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 生成出国申请登记表PDF */ - // @SaCheckPermission("rs:overseas:generate") + @SaCheckPermission("rs:overseas:generate") @PostMapping("/generateRegistrationForm") @Log(title = "生成出国申请登记表", businessType = BusinessType.OTHER) public R generateRegistrationForm(@RequestBody @Validated GenerateRegistrationFormBo bo) { @@ -463,7 +463,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 下载生成的PDF文档 */ - // @SaCheckPermission("rs:overseas:download") + @SaCheckPermission("rs:overseas:download") @GetMapping("/downloadPdf/{documentId}") public void downloadPdf(@PathVariable("documentId") String documentId, HttpServletResponse response) { registrationFormService.downloadPdf(documentId, response); @@ -472,7 +472,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 预览生成的PDF文档 */ - // @SaCheckPermission("rs:overseas:preview") + @SaCheckPermission("rs:overseas:preview") @GetMapping("/previewPdf/{documentId}") public void previewPdf(@PathVariable("documentId") String documentId, HttpServletResponse response) { registrationFormService.downloadPdf(documentId, response); @@ -485,7 +485,7 @@ public class RsOverseasApplicationController extends BaseController { * * @param applicantId 申请人ID */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/getDepartmentApproverByApplicant/{applicantId}") public R getDepartmentApproverByApplicant(@PathVariable("applicantId") Long applicantId) { Long departmentApproverId = applicationService.getDepartmentApproverId(applicantId); @@ -497,7 +497,7 @@ public class RsOverseasApplicationController extends BaseController { * * @param applicantId 申请人ID */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/getHrApprovers/{applicantId}") public R> getHrApprovers(@PathVariable("applicantId") Long applicantId) { List hrApprovers = applicationService.getHrApprovers(applicantId); @@ -509,7 +509,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 上传登记备案表盖章文件 */ - // @SaCheckPermission("rs:overseas:add") + @SaCheckPermission("rs:overseas:add") @PostMapping("/uploadStampedFile") @Log(title = "上传盖章文件", businessType = BusinessType.OTHER) public R> uploadStampedFile(@RequestParam("file") MultipartFile file, @@ -552,7 +552,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 下载盖章文件（安全下载） */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/downloadStampedFile/{applicationId}") public void downloadStampedFile(@PathVariable("applicationId") Long applicationId, HttpServletResponse response) { try { @@ -576,7 +576,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 上传党籍保留附件 */ - // @SaCheckPermission("rs:overseas:add") + @SaCheckPermission("rs:overseas:add") @PostMapping("/uploadPartyRetentionFile") @Log(title = "上传党籍保留附件", businessType = BusinessType.OTHER) public R> uploadPartyRetentionFile(@RequestParam("file") MultipartFile file, @@ -619,7 +619,7 @@ public class RsOverseasApplicationController extends BaseController { /** * 下载党籍保留附件（安全下载） */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/downloadPartyRetentionFile/{applicationId}") public void downloadPartyRetentionFile(@PathVariable("applicationId") Long applicationId, HttpServletResponse response) { try { diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java index 3fd60a7d..4352d3af 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java @@ -52,7 +52,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 查询出国审批记录列表 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/list") public TableDataInfo list(RsOverseasApprovalQuery query) { return approvalService.queryPageList(query); @@ -61,7 +61,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 查询我的审批记录列表 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/my/list") public TableDataInfo myList(RsOverseasApprovalQuery query) { Long userId = LoginHelper.getUserId(); @@ -72,7 +72,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 联合查询出国审批记录列表（包含待审批申请和已审批记录） */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/combined/list") public TableDataInfo combinedList(RsOverseasApprovalQuery query) { return approvalService.queryCombinedPageList(query); @@ -81,7 +81,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 调试接口：查看当前用户的权限过滤情况 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/debug/permission") public R> debugPermission(RsOverseasApprovalQuery query) { Map debugInfo = new HashMap<>(); @@ -115,7 +115,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 根据申请ID查询审批记录列表 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/application/{applicationId}") public R> getByApplicationId(@PathVariable("applicationId") Long applicationId) { List list = approvalService.queryByApplicationId(applicationId); @@ -125,7 +125,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 导出出国审批记录列表 */ - // @SaCheckPermission("rs:overseas:export") + @SaCheckPermission("rs:overseas:export") @Log(title = "出国审批记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(RsOverseasApprovalQuery query, HttpServletResponse response) { @@ -136,7 +136,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 获取出国审批记录详细信息 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/{approvalId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("approvalId") Long approvalId) { return R.ok(approvalService.queryById(approvalId)); @@ -145,7 +145,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 新增出国审批记录 */ - // @SaCheckPermission("rs:overseas:add") + @SaCheckPermission("rs:overseas:add") @Log(title = "出国审批记录", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated(AddGroup.class) @RequestBody RsOverseasApprovalBo bo) { @@ -158,7 +158,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 修改出国审批记录 */ - // @SaCheckPermission("rs:overseas:edit") + @SaCheckPermission("rs:overseas:edit") @Log(title = "出国审批记录", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated(EditGroup.class) @RequestBody RsOverseasApprovalBo bo) { @@ -168,7 +168,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 批量删除出国审批记录 */ - // @SaCheckPermission("rs:overseas:remove") + @SaCheckPermission("rs:overseas:remove") @Log(title = "出国审批记录", businessType = BusinessType.DELETE) @DeleteMapping("/{approvalIds}") public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("approvalIds") List approvalIds) { @@ -178,7 +178,7 @@ public class RsOverseasApprovalController extends BaseController { /** * 修复审批记录测试数据 */ - // @SaCheckPermission("rs:overseas:edit") + @SaCheckPermission("rs:overseas:edit") @Log(title = "出国审批记录", businessType = BusinessType.UPDATE) @PostMapping("/fixData") public R fixApprovalData() { diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java index 21f8537a..e6e7acd1 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java @@ -44,7 +44,7 @@ public class RsOverseasApprovalMonitorController extends BaseController { * @param query 查询条件 * @return 所有待审批申请列表 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/pending/list") public TableDataInfo pendingList(RsOverseasApprovalMonitorQuery query) { log.info("查询所有待审批申请列表"); @@ -64,7 +64,7 @@ public class RsOverseasApprovalMonitorController extends BaseController { * @param query 查询条件 * @return 所有已完成审批的申请列表 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/completed/list") public TableDataInfo completedList(RsOverseasApprovalMonitorQuery query) { log.info("查询所有已完成审批的申请列表，查询条件：{}", query); @@ -84,7 +84,7 @@ public class RsOverseasApprovalMonitorController extends BaseController { * @param applicationId 申请ID * @return 申请详情 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/detail/{applicationId}") public R getDetail(@PathVariable("applicationId") @NotNull(message = "申请ID不能为空") Long applicationId) { log.info("查询申请详情，申请ID：{}", applicationId); @@ -103,7 +103,7 @@ public class RsOverseasApprovalMonitorController extends BaseController { * * @return 统计数据 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/statistics") public R statistics() { log.info("查询审批进度统计"); @@ -118,7 +118,7 @@ public class RsOverseasApprovalMonitorController extends BaseController { * @param applicationId 申请ID * @param response HTTP响应对象 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/downloadApprovalPdf/{applicationId}") public void downloadApprovalPdf( @PathVariable("applicationId") @NotNull(message = "申请ID不能为空") Long applicationId, diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java index 6b41b9cb..a767ddb7 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java @@ -43,7 +43,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 查询行程变更申请列表 */ - // @SaCheckPermission("rs:itineraryChange:list") + @SaCheckPermission("rs:itineraryChange:list") @GetMapping("/list") public TableDataInfo list(RsOverseasItineraryChangeQuery query) { query.setTenantId(LoginHelper.getTenantId()); @@ -54,7 +54,7 @@ public class RsOverseasItineraryChangeController extends BaseController { * 查询我的变更记录列表（只显示已通过的变更申请） * 说明：变更记录Tab只显示已通过审批的变更申请，这些是真正生效的变更记录 */ - // @SaCheckPermission("rs:itineraryChange:list") + @SaCheckPermission("rs:itineraryChange:list") @GetMapping("/my/list") public TableDataInfo myList(RsOverseasItineraryChangeQuery query) { query.setTenantId(LoginHelper.getTenantId()); @@ -64,7 +64,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 查询待审批的行程变更申请列表（status=0） */ - // @SaCheckPermission("rs:itineraryChange:approve") + @SaCheckPermission("rs:itineraryChange:approve") @GetMapping("/pending/list") public TableDataInfo pendingList(RsOverseasItineraryChangeQuery query) { query.setTenantId(LoginHelper.getTenantId()); @@ -74,7 +74,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 查询行程变更申请详情 */ - // @SaCheckPermission("rs:itineraryChange:query") + @SaCheckPermission("rs:itineraryChange:query") @GetMapping("/{changeId}") public R getInfo(@PathVariable("changeId") Long changeId) { return R.ok(changeService.queryById(changeId)); @@ -84,7 +84,7 @@ public class RsOverseasItineraryChangeController extends BaseController { * 获取可用的出国记录列表（用于选择原出国申请） * 说明：选择的是出国记录选项卡中的记录 */ - // @SaCheckPermission("rs:itineraryChange:list") + @SaCheckPermission("rs:itineraryChange:list") @GetMapping("/available-records") public R> getAvailableRecords() { // 查询当前用户的所有出国记录 @@ -99,7 +99,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 根据出国记录ID查询记录详情（用于显示原申请信息） */ - // @SaCheckPermission("rs:itineraryChange:query") + @SaCheckPermission("rs:itineraryChange:query") @GetMapping("/record/{recordId}") public R getRecordInfo(@PathVariable("recordId") Long recordId) { return R.ok(recordService.queryById(recordId)); @@ -108,7 +108,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 新增行程变更申请 */ - // @SaCheckPermission("rs:itineraryChange:add") + @SaCheckPermission("rs:itineraryChange:add") @Log(title = "行程变更申请", businessType = BusinessType.INSERT) @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody RsOverseasItineraryChangeBo bo) { @@ -119,7 +119,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 修改行程变更申请（重新提交） */ - // @SaCheckPermission("rs:itineraryChange:edit") + @SaCheckPermission("rs:itineraryChange:edit") @Log(title = "行程变更申请", businessType = BusinessType.UPDATE) @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody RsOverseasItineraryChangeBo bo) { @@ -129,7 +129,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 删除行程变更申请 */ - // @SaCheckPermission("rs:itineraryChange:remove") + @SaCheckPermission("rs:itineraryChange:remove") @Log(title = "行程变更申请", businessType = BusinessType.DELETE) @DeleteMapping("/{changeIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("changeIds") Long[] changeIds) { @@ -139,7 +139,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 撤回行程变更申请 */ - // @SaCheckPermission("rs:itineraryChange:cancel") + @SaCheckPermission("rs:itineraryChange:cancel") @Log(title = "行程变更申请", businessType = BusinessType.UPDATE) @PutMapping("/cancel/{changeId}") public R cancel(@PathVariable("changeId") Long changeId) { @@ -149,7 +149,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 审批行程变更申请 */ - // @SaCheckPermission("rs:itineraryChange:approve") + @SaCheckPermission("rs:itineraryChange:approve") @Log(title = "行程变更申请", businessType = BusinessType.UPDATE) @PutMapping("/approve") public R approve(@RequestBody Map params) { @@ -163,7 +163,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 导出行程变更申请列表 */ - // @SaCheckPermission("rs:itineraryChange:export") + @SaCheckPermission("rs:itineraryChange:export") @Log(title = "行程变更申请", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(RsOverseasItineraryChangeQuery query, HttpServletResponse response) { @@ -175,7 +175,7 @@ public class RsOverseasItineraryChangeController extends BaseController { /** * 查询某个出国记录的所有变更历史 */ - // @SaCheckPermission("rs:itineraryChange:query") + @SaCheckPermission("rs:itineraryChange:query") @GetMapping("/record/{recordId}/history") public R> getChangeHistory(@PathVariable("recordId") Long recordId) { return R.ok(changeService.queryByRecordId(recordId)); diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java index b20fd7ef..89c28045 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java @@ -57,7 +57,7 @@ public class RsOverseasRecordController extends BaseController { /** * 查询出国记录列表 */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/list") public TableDataInfo list(RsOverseasRecordQuery query) { return recordService.queryPageList(query); @@ -66,7 +66,7 @@ public class RsOverseasRecordController extends BaseController { /** * 查询我的出国记录列表（联合查询：记录+已通过申请） */ - // @SaCheckPermission("rs:overseas:list") + @SaCheckPermission("rs:overseas:list") @GetMapping("/my/list") public TableDataInfo myList(RsOverseasRecordQuery query) { Long userId = LoginHelper.getUserId(); @@ -86,7 +86,7 @@ public class RsOverseasRecordController extends BaseController { /** * 根据申请ID查询出国记录 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/application/{applicationId}") public R getByApplicationId(@PathVariable("applicationId") Long applicationId) { RsOverseasRecordVo record = recordService.queryByApplicationId(applicationId); @@ -96,7 +96,7 @@ public class RsOverseasRecordController extends BaseController { /** * 导出出国记录列表 */ - // @SaCheckPermission("rs:overseas:export") + @SaCheckPermission("rs:overseas:export") @Log(title = "出国记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(RsOverseasRecordQuery query, HttpServletResponse response) { @@ -108,7 +108,7 @@ public class RsOverseasRecordController extends BaseController { * 下载党籍保留申请PDF模板 * 注意：此接口必须放在 /{recordId} 之前，避免路由冲突 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @Log(title = "下载党籍保留申请模板", businessType = BusinessType.EXPORT) @GetMapping("/downloadPartyRetention") public void downloadPartyRetention(HttpServletResponse response) { @@ -118,7 +118,7 @@ public class RsOverseasRecordController extends BaseController { /** * 获取出国记录详细信息 */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @GetMapping("/{recordId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("recordId") Long recordId) { return R.ok(recordService.queryById(recordId)); @@ -127,7 +127,7 @@ public class RsOverseasRecordController extends BaseController { /** * 新增出国记录 */ - // @SaCheckPermission("rs:overseas:add") + @SaCheckPermission("rs:overseas:add") @Log(title = "出国记录", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated(AddGroup.class) @RequestBody RsOverseasRecordBo bo) { @@ -137,7 +137,7 @@ public class RsOverseasRecordController extends BaseController { /** * 修改出国记录 */ - // @SaCheckPermission("rs:overseas:edit") + @SaCheckPermission("rs:overseas:edit") @Log(title = "出国记录", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated(EditGroup.class) @RequestBody RsOverseasRecordBo bo) { @@ -147,7 +147,7 @@ public class RsOverseasRecordController extends BaseController { /** * 基于申请信息创建出国记录 */ - // @SaCheckPermission("rs:overseas:add") + @SaCheckPermission("rs:overseas:add") @Log(title = "创建出国记录", businessType = BusinessType.INSERT) @PostMapping("/create/{applicationId}") public R createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { @@ -157,7 +157,7 @@ public class RsOverseasRecordController extends BaseController { /** * 更新出国记录完成状态 */ - // @SaCheckPermission("rs:overseas:edit") + @SaCheckPermission("rs:overseas:edit") @Log(title = "更新出国记录完成状态", businessType = BusinessType.UPDATE) @PutMapping("/complete") public R updateCompletion(@RequestBody CompletionRequest request) { @@ -169,7 +169,7 @@ public class RsOverseasRecordController extends BaseController { /** * 批量删除出国记录 */ - // @SaCheckPermission("rs:overseas:remove") + @SaCheckPermission("rs:overseas:remove") @Log(title = "出国记录", businessType = BusinessType.DELETE) @DeleteMapping("/{recordIds}") public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("recordIds") List recordIds) { @@ -179,7 +179,7 @@ public class RsOverseasRecordController extends BaseController { /** * 下载因私出国（境）情况回执PDF */ - // @SaCheckPermission("rs:overseas:query") + @SaCheckPermission("rs:overseas:query") @Log(title = "下载出国情况回执", businessType = BusinessType.EXPORT) @GetMapping("/downloadReceipt/{recordId}") public void downloadReceipt(@NotNull(message = "记录ID不能为空") @PathVariable("recordId") Long recordId, @@ -226,7 +226,7 @@ public class RsOverseasRecordController extends BaseController { /** * 初始化测试数据（临时接口，用于解决出国记录列表显示问题） */ - // @SaCheckPermission("rs:overseas:add") + @SaCheckPermission("rs:overseas:add") @PostMapping("/initTestData") public R initTestData() { try { diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java index f661ae7e..ec0e6047 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java @@ -47,7 +47,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 查询出国登记列表 */ - // @SaCheckPermission("rs:overseasregistration:list") + @SaCheckPermission("rs:overseasregistration:list") @GetMapping("/list") public TableDataInfo list(RsOverseasRegistrationQuery query) { return registrationService.queryPageList(query); @@ -56,7 +56,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 查询我的出国登记列表 */ - // @SaCheckPermission("rs:overseasregistration:list") + @SaCheckPermission("rs:overseasregistration:list") @GetMapping("/my/list") public TableDataInfo myList(RsOverseasRegistrationQuery query) { return registrationService.queryMyRegistrationList(query); @@ -65,7 +65,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 导出出国登记列表 */ - // @SaCheckPermission("rs:overseasregistration:export") + @SaCheckPermission("rs:overseasregistration:export") @Log(title = "出国登记", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(RsOverseasRegistrationQuery query, HttpServletResponse response) { @@ -76,7 +76,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 获取出国登记详细信息 */ - // @SaCheckPermission("rs:overseasregistration:query") + @SaCheckPermission("rs:overseasregistration:query") @GetMapping("/{registrationId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { return R.ok(registrationService.queryById(registrationId)); @@ -85,7 +85,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 根据申请ID获取出国登记信息 */ - // @SaCheckPermission("rs:overseasregistration:query") + @SaCheckPermission("rs:overseasregistration:query") @GetMapping("/application/{applicationId}") public R getByApplicationId( @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { @@ -95,7 +95,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 新增出国登记 */ - // @SaCheckPermission("rs:overseasregistration:add") + @SaCheckPermission("rs:overseasregistration:add") @Log(title = "出国登记", businessType = BusinessType.INSERT) @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody RsOverseasRegistrationBo bo) { @@ -105,7 +105,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 新增并提交出国登记 */ - // @SaCheckPermission("rs:overseasregistration:add") + @SaCheckPermission("rs:overseasregistration:add") @Log(title = "出国登记", businessType = BusinessType.INSERT) @PostMapping("/addAndSubmit") public R addAndSubmit(@Validated(AddGroup.class) @RequestBody RsOverseasRegistrationBo bo) { @@ -115,7 +115,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 修改出国登记 */ - // @SaCheckPermission("rs:overseasregistration:edit") + @SaCheckPermission("rs:overseasregistration:edit") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody RsOverseasRegistrationBo bo) { @@ -125,7 +125,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 删除出国登记 */ - // @SaCheckPermission("rs:overseasregistration:remove") + @SaCheckPermission("rs:overseasregistration:remove") @Log(title = "出国登记", businessType = BusinessType.DELETE) @DeleteMapping("/{registrationIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("registrationIds") Long[] registrationIds) { @@ -135,7 +135,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 提交出国登记 */ - // @SaCheckPermission("rs:overseasregistration:submit") + @SaCheckPermission("rs:overseasregistration:submit") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/submit/{registrationId}") public R submit(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { @@ -145,7 +145,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 确认出国登记 */ - // @SaCheckPermission("rs:overseasregistration:confirm") + @SaCheckPermission("rs:overseasregistration:confirm") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/confirm/{registrationId}") public R confirm(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { @@ -155,7 +155,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 撤回出国登记 */ - // @SaCheckPermission("rs:overseasregistration:withdraw") + @SaCheckPermission("rs:overseasregistration:withdraw") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/withdraw/{registrationId}") public R withdraw(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { @@ -165,7 +165,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 基于出国申请创建登记记录 */ - // @SaCheckPermission("rs:overseasregistration:create") + @SaCheckPermission("rs:overseasregistration:create") @Log(title = "出国登记", businessType = BusinessType.INSERT) @PostMapping("/create/{applicationId}") public R createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { @@ -175,7 +175,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 批准出国登记 */ - // @SaCheckPermission("rs:registration:approve") + @SaCheckPermission("rs:registration:approve") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/approve/{registrationId}") public R approve(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId, @@ -187,7 +187,7 @@ public class RsOverseasRegistrationController extends BaseController { /** * 拒绝出国登记 */ - // @SaCheckPermission("rs:registration:reject") + @SaCheckPermission("rs:registration:reject") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/reject/{registrationId}") public R reject(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId, diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java index eb4b5a53..2ec0888c 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java @@ -54,7 +54,7 @@ public class RsStaffInfoController extends BaseController { /** * 查询人员信息列表 */ - // @SaCheckPermission("rs:staffInfo:list") + @SaCheckPermission("rs:staffInfo:list") @GetMapping("/list") public TableDataInfo list(RsStaffInfoBo bo, PageQuery pageQuery) { return staffInfoService.queryPageList(bo, pageQuery); @@ -63,7 +63,7 @@ public class RsStaffInfoController extends BaseController { /** * 根据部门ID查询人员信息列表 */ - // @SaCheckPermission("rs:staffInfo:list") + @SaCheckPermission("rs:staffInfo:list") @PostMapping("/listByDeptId") public TableDataInfo listByDeptId(@RequestBody Map requestBody, PageQuery pageQuery) { @@ -145,7 +145,7 @@ public class RsStaffInfoController extends BaseController { /** * 获取人员信息详细信息 */ - // @SaCheckPermission("rs:staffInfo:query") + @SaCheckPermission("rs:staffInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(staffInfoService.queryById(id)); @@ -154,7 +154,7 @@ public class RsStaffInfoController extends BaseController { /** * 新增人员信息 */ - // @SaCheckPermission("rs:staffInfo:add") + @SaCheckPermission("rs:staffInfo:add") @Log(title = "人员信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -165,7 +165,7 @@ public class RsStaffInfoController extends BaseController { /** * 修改人员信息 */ - // @SaCheckPermission("rs:staffInfo:edit") + @SaCheckPermission("rs:staffInfo:edit") @Log(title = "人员信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -176,7 +176,7 @@ public class RsStaffInfoController extends BaseController { /** * 删除人员信息 */ - // @SaCheckPermission("rs:staffInfo:remove") + @SaCheckPermission("rs:staffInfo:remove") @Log(title = "人员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -186,7 +186,7 @@ public class RsStaffInfoController extends BaseController { /** * 获取部门树形数据 */ - // @SaCheckPermission("rs:staffInfo:list") + @SaCheckPermission("rs:staffInfo:list") @GetMapping("/deptTree") public R> deptTree() { List depts = deptService.selectDeptList( @@ -197,7 +197,7 @@ public class RsStaffInfoController extends BaseController { /** * 导出人员信息 */ - // @SaCheckPermission("rs:staffInfo:export") + @SaCheckPermission("rs:staffInfo:export") @Log(title = "人员信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RsStaffInfoBo query) { @@ -241,7 +241,7 @@ public class RsStaffInfoController extends BaseController { /** * 导入人员数据 */ - // @SaCheckPermission("rs:staffInfo:import") + @SaCheckPermission("rs:staffInfo:import") @Log(title = "人员信息", businessType = BusinessType.IMPORT) @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, String deptId, boolean updateSupport) throws Exception { diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java index 4c61655c..9b494139 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java @@ -54,7 +54,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 查询培训申请列表（供管理员和审批人使用） */ - // @SaCheckPermission("rs:trainingapplication:list") + @SaCheckPermission("rs:trainingapplication:list") @GetMapping("/list") public TableDataInfo list(RsTrainingApplication application, PageQuery pageQuery) { return trainingApplicationService.selectPageRsTrainingApplicationList(application, pageQuery); @@ -63,7 +63,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 导出培训申请列表 */ - // @SaCheckPermission("rs:trainingapplication:export") + @SaCheckPermission("rs:trainingapplication:export") @Log(title = "培训申请", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RsTrainingApplication application) { @@ -74,7 +74,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 获取培训申请详细信息 */ - // @SaCheckPermission("rs:trainingapplication:query") + @SaCheckPermission("rs:trainingapplication:query") @GetMapping("/{applicationId}") public R getInfo(@PathVariable("applicationId") Long applicationId) { return R.ok(trainingApplicationService.selectRsTrainingApplicationById(applicationId)); @@ -196,7 +196,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 新增培训申请 */ - // @SaCheckPermission("rs:trainingapplication:add") + @SaCheckPermission("rs:trainingapplication:add") @Log(title = "培训申请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -229,7 +229,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 修改培训申请 */ - // @SaCheckPermission("rs:trainingapplication:edit") + @SaCheckPermission("rs:trainingapplication:edit") @Log(title = "培训申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -240,7 +240,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 删除培训申请 */ - // @SaCheckPermission("rs:trainingapplication:remove") + @SaCheckPermission("rs:trainingapplication:remove") @Log(title = "培训申请", businessType = BusinessType.DELETE) @DeleteMapping("/{applicationIds}") public R remove(@PathVariable("applicationIds") Long[] applicationIds) { @@ -250,7 +250,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 取消培训申请 */ - // @SaCheckPermission("rs:trainingapplication:cancel") + @SaCheckPermission("rs:trainingapplication:cancel") @Log(title = "培训申请", businessType = BusinessType.UPDATE) @PutMapping("/cancel/{applicationId}") public R cancel(@PathVariable("applicationId") Long applicationId) { @@ -264,7 +264,7 @@ public class RsTrainingApplicationController extends BaseController { * 用户应通过工作流API pageByTaskWait() 获取待办任务 * 而不是调用自定义的业务API */ - // @SaCheckPermission("rs:trainingapproval:process") + @SaCheckPermission("rs:trainingapproval:process") @GetMapping("/pending/list") public R pendingList(RsTrainingApplication application, PageQuery pageQuery) { // 提示用户使用标准工作流API @@ -274,7 +274,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 查询我的培训申请列表（供申请人使用） */ - // @SaCheckPermission("rs:trainingapplication:query") + @SaCheckPermission("rs:trainingapplication:query") @GetMapping("/my") public TableDataInfo listMyApplications(RsTrainingApplication application, PageQuery pageQuery) { @@ -286,7 +286,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 查询指定课程的申请列表 */ - // @SaCheckPermission("rs:trainingapplication:list") + @SaCheckPermission("rs:trainingapplication:list") @GetMapping("/list/{courseId}") public TableDataInfo listByCourse(@PathVariable("courseId") Long courseId, RsTrainingApplication application, PageQuery pageQuery) { @@ -296,7 +296,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 新增培训申请（供普通用户使用） */ - // @SaCheckPermission("rs:trainingapplication:submit") + @SaCheckPermission("rs:trainingapplication:submit") @Log(title = "培训申请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/submit") @@ -329,7 +329,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 更新培训申请状态 */ - // @SaCheckPermission("rs:trainingapplication:process") + @SaCheckPermission("rs:trainingapplication:process") @Log(title = "培训申请状态", businessType = BusinessType.UPDATE) @PutMapping("/status/{applicationId}/{status}") public R updateStatus( @@ -342,7 +342,7 @@ public class RsTrainingApplicationController extends BaseController { /** * 重新提交被拒绝的培训申请 */ - // @SaCheckPermission("rs:trainingapplication:submit") + @SaCheckPermission("rs:trainingapplication:submit") @Log(title = "重新提交培训申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/resubmit/{applicationId}") @@ -457,7 +457,7 @@ public class RsTrainingApplicationController extends BaseController { * @param userIds 用户ID列表（逗号分隔） * @return 用户基本信息列表 */ - // @SaCheckPermission("rs:trainingapplication:query") + @SaCheckPermission("rs:trainingapplication:query") @GetMapping("/companions/batch") public R> batchQueryCompanions(@RequestParam("userIds") String userIds) { log.info("批量查询同行人信息，用户ID列表: {}", userIds); diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java index 48cadd58..de86abd7 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java @@ -40,7 +40,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 查询培训审批列表 */ - // @SaCheckPermission("rs:trainingapproval:list") + @SaCheckPermission("rs:trainingapproval:list") @GetMapping("/list") public TableDataInfo list(RsTrainingApproval approval, PageQuery pageQuery, @RequestParam(value = "courseName", required = false) String courseName, @@ -60,7 +60,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 获取培训审批详细信息 */ - // @SaCheckPermission("rs:trainingapproval:query") + @SaCheckPermission("rs:trainingapproval:query") @GetMapping("/{approvalId}") public R getInfo(@PathVariable("approvalId") Long approvalId) { return R.ok(trainingApprovalService.selectRsTrainingApprovalById(approvalId)); @@ -69,7 +69,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 新增培训审批 */ - // @SaCheckPermission("rs:trainingapproval:add") + @SaCheckPermission("rs:trainingapproval:add") @Log(title = "培训审批", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -80,7 +80,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 修改培训审批 */ - // @SaCheckPermission("rs:trainingapproval:edit") + @SaCheckPermission("rs:trainingapproval:edit") @Log(title = "培训审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -91,7 +91,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 删除培训审批 */ - // @SaCheckPermission("rs:trainingapproval:remove") + @SaCheckPermission("rs:trainingapproval:remove") @Log(title = "培训审批", businessType = BusinessType.DELETE) @DeleteMapping("/{approvalIds}") public R remove(@PathVariable("approvalIds") Long[] approvalIds) { @@ -101,7 +101,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 查询待我审批的列表 */ - // @SaCheckPermission("rs:trainingapproval:process") + @SaCheckPermission("rs:trainingapproval:process") @GetMapping("/pending") public TableDataInfo listPendingApprovals(RsTrainingApproval approval, PageQuery pageQuery) { // 安全获取用户ID，兼容 "sys_user:2091" 格式 @@ -141,7 +141,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 处理审批 */ - // @SaCheckPermission("rs:trainingapproval:process") + @SaCheckPermission("rs:trainingapproval:process") @Log(title = "培训审批", businessType = BusinessType.UPDATE) @PutMapping("/process/{applicationId}/{status}") public R processApproval(@PathVariable("applicationId") Long applicationId, @@ -153,7 +153,7 @@ public class RsTrainingApprovalController extends BaseController { /** * 查询申请审批历史 */ - // @SaCheckPermission("rs:trainingapproval:query") + @SaCheckPermission("rs:trainingapproval:query") @GetMapping("/history/{applicationId}") public R> getApprovalHistory(@PathVariable("applicationId") Long applicationId) { System.out.println("查询审批历史记录 - applicationId: " + applicationId); diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java index 9e34f3ab..0c6c56b6 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java @@ -46,7 +46,7 @@ public class RsTrainingRecordController extends BaseController { /** * 查询培训记录列表 */ - // @SaCheckPermission("rs:trainingrecord:list") + @SaCheckPermission("rs:trainingrecord:list") @GetMapping("/list") public TableDataInfo list(RsTrainingRecord record, PageQuery pageQuery) { return trainingRecordService.selectPageRsTrainingRecordList(record, pageQuery); @@ -55,7 +55,7 @@ public class RsTrainingRecordController extends BaseController { /** * 测试培训地点搜索功能 */ - // @SaCheckPermission("rs:trainingrecord:list") + @SaCheckPermission("rs:trainingrecord:list") @GetMapping("/test-location") public R> testLocationSearch(@RequestParam("location") String location) { log.info("测试培训地点搜索 - location参数: {}", location); @@ -82,7 +82,7 @@ public class RsTrainingRecordController extends BaseController { /** * 导出培训记录列表 */ - // @SaCheckPermission("rs:trainingrecord:export") + @SaCheckPermission("rs:trainingrecord:export") @Log(title = "培训记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RsTrainingRecord record) { @@ -93,7 +93,7 @@ public class RsTrainingRecordController extends BaseController { /** * 获取培训记录详细信息 */ - // @SaCheckPermission("rs:trainingrecord:query") + @SaCheckPermission("rs:trainingrecord:query") @GetMapping("/{recordId}") public R getInfo(@PathVariable("recordId") Long recordId) { return R.ok(trainingRecordService.selectRsTrainingRecordById(recordId)); @@ -102,7 +102,7 @@ public class RsTrainingRecordController extends BaseController { /** * 新增培训记录 */ - // @SaCheckPermission("rs:trainingrecord:add") + @SaCheckPermission("rs:trainingrecord:add") @Log(title = "培训记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -113,7 +113,7 @@ public class RsTrainingRecordController extends BaseController { /** * 修改培训记录 */ - // @SaCheckPermission("rs:trainingrecord:edit") + @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "培训记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -124,7 +124,7 @@ public class RsTrainingRecordController extends BaseController { /** * 删除培训记录 */ - // @SaCheckPermission("rs:trainingrecord:remove") + @SaCheckPermission("rs:trainingrecord:remove") @Log(title = "培训记录", businessType = BusinessType.DELETE) @DeleteMapping("/{recordIds}") public R remove(@PathVariable("recordIds") Long[] recordIds) { @@ -134,7 +134,7 @@ public class RsTrainingRecordController extends BaseController { /** * 修复培训记录中缺失的课程信息 */ - // @SaCheckPermission("rs:trainingrecord:edit") + @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "培训记录", businessType = BusinessType.UPDATE) @PostMapping("/fixCourseInfo") public R fixCourseInfo() { @@ -146,7 +146,7 @@ public class RsTrainingRecordController extends BaseController { /** * 查询我的培训记录列表 */ - // @SaCheckPermission("rs:trainingrecord:query") + @SaCheckPermission("rs:trainingrecord:query") @GetMapping("/my") public TableDataInfo listMyRecords(RsTrainingRecord record, PageQuery pageQuery) { // 安全获取用户ID，兼容 "sys_user:2091" 格式 @@ -186,7 +186,7 @@ public class RsTrainingRecordController extends BaseController { /** * 更新培训记录完成状态 */ - // @SaCheckPermission("rs:trainingrecord:edit") + @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "培训记录", businessType = BusinessType.UPDATE) @PutMapping("/status/{recordId}/{status}") public R updateCompletionStatus(@PathVariable("recordId") Long recordId, @@ -197,7 +197,7 @@ public class RsTrainingRecordController extends BaseController { /** * 上传培训证书 */ - // @SaCheckPermission("rs:trainingrecord:edit") + @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "培训记录", businessType = BusinessType.UPDATE) @PutMapping("/certificate/{recordId}") public R uploadCertificate(@PathVariable("recordId") Long recordId, @RequestBody Map params) { @@ -209,7 +209,7 @@ public class RsTrainingRecordController extends BaseController { /** * 上传培训证书文件 */ - // @SaCheckPermission("rs:trainingrecord:edit") + @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "上传培训证书文件", businessType = BusinessType.UPDATE) @PostMapping("/certificate/upload/{recordId}") public R> uploadCertificateFile(@PathVariable("recordId") Long recordId, @@ -259,7 +259,7 @@ public class RsTrainingRecordController extends BaseController { /** * 获取培训统计数据 */ - // @SaCheckPermission("rs:trainingrecord:list") + @SaCheckPermission("rs:trainingrecord:list") @GetMapping("/statistics") public R> getStatistics() { // 这里可以实现培训统计数据的获取逻辑 @@ -270,7 +270,7 @@ public class RsTrainingRecordController extends BaseController { /** * 更新培训记录的证书附件ID */ - // @SaCheckPermission("rs:trainingrecord:edit") + @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "更新培训记录证书附件", businessType = BusinessType.UPDATE) @PutMapping("/attachments/{recordId}") public R updateAttachments(@PathVariable("recordId") Long recordId, @RequestBody Map params) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java index dd9d8579..34fab2fc 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java @@ -41,7 +41,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 查询活动考勤签到列表 */ - //@SaCheckPermission("stgl:activityAttendance:list") + @SaCheckPermission("stgl:activityAttendance:list") @GetMapping("/list") public TableDataInfo list(StglActivityAttendanceBo bo, PageQuery pageQuery) { return stglActivityAttendanceService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 导出活动考勤签到列表 */ - //@SaCheckPermission("stgl:activityAttendance:export") + @SaCheckPermission("stgl:activityAttendance:export") @Log(title = "活动考勤签到", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglActivityAttendanceBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 获取活动考勤签到详细信息 */ - //@SaCheckPermission("stgl:activityAttendance:query") + @SaCheckPermission("stgl:activityAttendance:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 新增活动考勤签到 */ - //@SaCheckPermission("stgl:activityAttendance:add") + @SaCheckPermission("stgl:activityAttendance:add") @Log(title = "活动考勤签到", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 修改活动考勤签到 */ - //@SaCheckPermission("stgl:activityAttendance:edit") + @SaCheckPermission("stgl:activityAttendance:edit") @Log(title = "活动考勤签到", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -93,7 +93,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 删除活动考勤签到 */ - //@SaCheckPermission("stgl:activityAttendance:remove") + @SaCheckPermission("stgl:activityAttendance:remove") @Log(title = "活动考勤签到", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -104,7 +104,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 查询用户已报名成功且进行中的活动列表 */ - //@SaCheckPermission("stgl:activityAttendance:list") + @SaCheckPermission("stgl:activityAttendance:list") @GetMapping("/userAvailableActivities") public R> getUserAvailableActivities() { Long userId = LoginHelper.getUserId(); @@ -114,7 +114,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 根据活动ID和用户ID查询签到记录 */ - //@SaCheckPermission("stgl:activityAttendance:query") + @SaCheckPermission("stgl:activityAttendance:query") @GetMapping("/getByActivityAndUser") public R getByActivityAndUser(@RequestParam("activityId") Long activityId) { Long userId = LoginHelper.getUserId(); @@ -124,7 +124,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 根据活动ID和用户ID查询所有签到记录（支持多次签到） */ - //@SaCheckPermission("stgl:activityAttendance:query") + @SaCheckPermission("stgl:activityAttendance:query") @GetMapping("/getAllByActivityAndUser") public R> getAllByActivityAndUser( @RequestParam("activityId") Long activityId, @@ -146,7 +146,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 用户签到 */ - //@SaCheckPermission("stgl:activityAttendance:signIn") + @SaCheckPermission("stgl:activityAttendance:signIn") @Log(title = "活动签到", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/signIn") @@ -158,7 +158,7 @@ public class StglActivityAttendanceController extends BaseController { /** * 用户签退 */ - //@SaCheckPermission("stgl:activityAttendance:signOut") + @SaCheckPermission("stgl:activityAttendance:signOut") @Log(title = "活动签退", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/signOut") diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java index ebbb1fec..23bd07f8 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java @@ -37,7 +37,7 @@ public class StglActivityAuditController extends BaseController { /** * 查询活动审批记录详细 */ - //@SaCheckPermission("stgl:activity:query") + @SaCheckPermission("stgl:activity:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -47,7 +47,7 @@ public class StglActivityAuditController extends BaseController { /** * 根据活动ID查询审批记录 */ - //@SaCheckPermission("stgl:activity:query") + @SaCheckPermission("stgl:activity:query") @GetMapping("/byActivity/{activityId}") public R> getByActivityId(@NotNull(message = "活动ID不能为空") @PathVariable("activityId") Long activityId) { @@ -57,7 +57,7 @@ public class StglActivityAuditController extends BaseController { /** * 根据审批人ID查询待审批记录 */ - //@SaCheckPermission("stgl:activity:query") + @SaCheckPermission("stgl:activity:query") @GetMapping("/pending/{approverId}") public R> getPendingByApproverId(@NotNull(message = "审批人ID不能为空") @PathVariable("approverId") Long approverId) { @@ -67,7 +67,7 @@ public class StglActivityAuditController extends BaseController { /** * 新增活动审批记录 */ - //@SaCheckPermission("stgl:activity:add") + @SaCheckPermission("stgl:activity:add") @Log(title = "活动审批记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -78,7 +78,7 @@ public class StglActivityAuditController extends BaseController { /** * 修改活动审批记录 */ - //@SaCheckPermission("stgl:activity:edit") + @SaCheckPermission("stgl:activity:edit") @Log(title = "活动审批记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -89,7 +89,7 @@ public class StglActivityAuditController extends BaseController { /** * 删除活动审批记录 */ - //@SaCheckPermission("stgl:activity:remove") + @SaCheckPermission("stgl:activity:remove") @Log(title = "活动审批记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -100,7 +100,7 @@ public class StglActivityAuditController extends BaseController { /** * 审批活动 */ - //@SaCheckPermission("stgl:activity:approve") + @SaCheckPermission("stgl:activity:approve") @Log(title = "活动审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/approve") diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java index d64e5ea0..2a7c36b5 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java @@ -42,7 +42,7 @@ public class StglActivityController extends BaseController { /** * 查询活动信息列表 */ - //@SaCheckPermission("stgl:activity:list") + @SaCheckPermission("stgl:activity:list") @GetMapping("/list") public TableDataInfo list(StglActivityBo bo, PageQuery pageQuery) { return stglActivityService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class StglActivityController extends BaseController { /** * 导出活动信息列表 */ - //@SaCheckPermission("stgl:activity:export") + @SaCheckPermission("stgl:activity:export") @Log(title = "活动信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglActivityBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class StglActivityController extends BaseController { /** * 获取活动信息详细信息 */ - //@SaCheckPermission("stgl:activity:query") + @SaCheckPermission("stgl:activity:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityService.queryById(id)); @@ -71,7 +71,7 @@ public class StglActivityController extends BaseController { /** * 新增活动信息 */ - //@SaCheckPermission("stgl:activity:add") + @SaCheckPermission("stgl:activity:add") @Log(title = "活动信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class StglActivityController extends BaseController { /** * 修改活动信息 */ - //@SaCheckPermission("stgl:activity:edit") + @SaCheckPermission("stgl:activity:edit") @Log(title = "活动信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -93,7 +93,7 @@ public class StglActivityController extends BaseController { /** * 删除活动信息 */ - //@SaCheckPermission("stgl:activity:remove") + @SaCheckPermission("stgl:activity:remove") @Log(title = "活动信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -103,7 +103,7 @@ public class StglActivityController extends BaseController { /** * 复制活动信息 */ - //@SaCheckPermission("stgl:activity:add") + @SaCheckPermission("stgl:activity:add") @Log(title = "复制活动信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/copy") @@ -117,7 +117,7 @@ public class StglActivityController extends BaseController { /** * 活动总结 */ - //@SaCheckPermission("stgl:activity:edit") + @SaCheckPermission("stgl:activity:edit") @Log(title = "活动总结", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/summarize") @@ -132,7 +132,7 @@ public class StglActivityController extends BaseController { /** * 查询社团选择器选项 */ - //@SaCheckPermission("stgl:activity:query") + @SaCheckPermission("stgl:activity:query") @GetMapping("/club/options") public R> getClubOptions() { return R.ok(stglActivityService.queryClubOptions()); @@ -141,7 +141,7 @@ public class StglActivityController extends BaseController { /** * 查询志愿者队伍选择器选项 */ - //@SaCheckPermission("stgl:activity:query") + @SaCheckPermission("stgl:activity:query") @GetMapping("/volunteer/options") public R> getVolunteerTeamOptions() { return R.ok(stglActivityService.queryVolunteerTeamOptions()); @@ -150,7 +150,7 @@ public class StglActivityController extends BaseController { /** * 查询活动评分列表 */ - //@SaCheckPermission("stgl:activity:query") + @SaCheckPermission("stgl:activity:query") @GetMapping("/{id}/ratings") public R> getActivityRatings(@NotNull(message = "活动ID不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityService.getActivityRatings(id)); diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java index 4e8cf21d..11461379 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java @@ -41,7 +41,7 @@ public class StglActivityRegisterController extends BaseController { /** * 查询活动报名管理列表 */ - //@SaCheckPermission("stgl:activityRegister:list") + @SaCheckPermission("stgl:activityRegister:list") @GetMapping("/list") public TableDataInfo list(StglActivityRegistrationBo bo, PageQuery pageQuery) { return stglActivityRegistrationService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class StglActivityRegisterController extends BaseController { /** * 导出活动报名管理列表 */ - //@SaCheckPermission("stgl:activityRegister:export") + @SaCheckPermission("stgl:activityRegister:export") @Log(title = "活动报名管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglActivityRegistrationBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class StglActivityRegisterController extends BaseController { /** * 获取活动报名管理详细信息 */ - //@SaCheckPermission("stgl:activityRegister:query") + @SaCheckPermission("stgl:activityRegister:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityRegistrationService.queryById(id)); @@ -70,7 +70,7 @@ public class StglActivityRegisterController extends BaseController { /** * 新增活动报名管理 */ - //@SaCheckPermission("stgl:activityRegister:add") + @SaCheckPermission("stgl:activityRegister:add") @Log(title = "活动报名管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated(AddGroup.class) @RequestBody StglActivityRegistrationBo bo) { @@ -80,7 +80,7 @@ public class StglActivityRegisterController extends BaseController { /** * 修改活动报名管理 */ - //@SaCheckPermission("stgl:activityRegister:edit") + @SaCheckPermission("stgl:activityRegister:edit") @Log(title = "活动报名管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated(EditGroup.class) @RequestBody StglActivityRegistrationBo bo) { @@ -90,7 +90,7 @@ public class StglActivityRegisterController extends BaseController { /** * 删除活动报名管理 */ - //@SaCheckPermission("stgl:activityRegister:remove") + @SaCheckPermission("stgl:activityRegister:remove") @Log(title = "活动报名管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -100,7 +100,7 @@ public class StglActivityRegisterController extends BaseController { /** * 审核活动报名 */ - //@SaCheckPermission("stgl:activityRegister:approve") + @SaCheckPermission("stgl:activityRegister:approve") @Log(title = "活动报名审核", businessType = BusinessType.UPDATE) @PostMapping("/approve/{id}") public R approve(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, @@ -117,7 +117,7 @@ public class StglActivityRegisterController extends BaseController { /** * 批量审核活动报名 */ - //@SaCheckPermission("stgl:activityRegister:approve") + @SaCheckPermission("stgl:activityRegister:approve") @Log(title = "活动报名批量审核", businessType = BusinessType.UPDATE) @PostMapping("/batchApprove") public R batchApprove(@Validated @RequestBody StglBatchApprovalBo batchApprovalBo) { @@ -127,7 +127,7 @@ public class StglActivityRegisterController extends BaseController { /** * 录入成绩 */ - //@SaCheckPermission("stgl:activityRegister:recordScore") + @SaCheckPermission("stgl:activityRegister:recordScore") @Log(title = "录入成绩", businessType = BusinessType.UPDATE) @PostMapping("/score/{id}") public R recordScore(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java index 48409731..83d2575e 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java @@ -40,7 +40,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 查询活动报名列表 */ - //@SaCheckPermission("stgl:activityregistration:list") + @SaCheckPermission("stgl:activityregistration:list") @GetMapping("/list") public TableDataInfo list(StglActivityRegistrationBo bo, PageQuery pageQuery) { return stglActivityRegistrationService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 导出活动报名列表 */ - //@SaCheckPermission("stgl:activityregistration:export") + @SaCheckPermission("stgl:activityregistration:export") @Log(title = "活动报名", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglActivityRegistrationBo bo, HttpServletResponse response) { @@ -60,7 +60,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 获取活动报名详细信息 */ - //@SaCheckPermission("stgl:activityregistration:query") + @SaCheckPermission("stgl:activityregistration:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityRegistrationService.queryById(id)); @@ -69,7 +69,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 新增活动报名 */ - //@SaCheckPermission("stgl:activityregistration:add") + @SaCheckPermission("stgl:activityregistration:add") @Log(title = "活动报名", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated(AddGroup.class) @RequestBody StglActivityRegistrationBo bo) { @@ -79,7 +79,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 修改活动报名 */ - //@SaCheckPermission("stgl:activityregistration:edit") + @SaCheckPermission("stgl:activityregistration:edit") @Log(title = "活动报名", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated(EditGroup.class) @RequestBody StglActivityRegistrationBo bo) { @@ -89,7 +89,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 删除活动报名 */ - //@SaCheckPermission("stgl:activityregistration:remove") + @SaCheckPermission("stgl:activityregistration:remove") @Log(title = "活动报名", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -99,7 +99,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 审核活动报名 */ - //@SaCheckPermission("stgl:activityregistration:approval") + @SaCheckPermission("stgl:activityregistration:approval") @Log(title = "活动报名审核", businessType = BusinessType.UPDATE) @PostMapping("/approval") public R approval(@RequestParam("id") Long id, @@ -111,7 +111,7 @@ public class StglActivityRegistrationController extends BaseController { /** * 录入成绩 */ - //@SaCheckPermission("stgl:activityregistration:score") + @SaCheckPermission("stgl:activityregistration:score") @Log(title = "录入成绩", businessType = BusinessType.UPDATE) @PostMapping("/inputScore") public R inputScore(@RequestParam("id") Long id, @RequestParam("score") String score) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java index c5fcd013..5ddaea33 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java @@ -39,7 +39,7 @@ public class StglActivityTeamInfoController extends BaseController { /** * 查询活动团队信息列表 */ - //@SaCheckPermission("stgl:activityteaminfo:list") + @SaCheckPermission("stgl:activityteaminfo:list") @GetMapping("/list") public TableDataInfo list(StglActivityTeamInfoBo bo, PageQuery pageQuery) { return stglActivityTeamInfoService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class StglActivityTeamInfoController extends BaseController { /** * 导出活动团队信息列表 */ - //@SaCheckPermission("stgl:activityteaminfo:export") + @SaCheckPermission("stgl:activityteaminfo:export") @Log(title = "活动团队信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglActivityTeamInfoBo bo, HttpServletResponse response) { @@ -59,7 +59,7 @@ public class StglActivityTeamInfoController extends BaseController { /** * 获取活动团队信息详细信息 */ - //@SaCheckPermission("stgl:activityteaminfo:query") + @SaCheckPermission("stgl:activityteaminfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityTeamInfoService.queryById(id)); @@ -68,7 +68,7 @@ public class StglActivityTeamInfoController extends BaseController { /** * 新增活动团队信息 */ - //@SaCheckPermission("stgl:activityteaminfo:add") + @SaCheckPermission("stgl:activityteaminfo:add") @Log(title = "活动团队信息", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated(AddGroup.class) @RequestBody StglActivityTeamInfoBo bo) { @@ -78,7 +78,7 @@ public class StglActivityTeamInfoController extends BaseController { /** * 修改活动团队信息 */ - //@SaCheckPermission("stgl:activityteaminfo:edit") + @SaCheckPermission("stgl:activityteaminfo:edit") @Log(title = "活动团队信息", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated(EditGroup.class) @RequestBody StglActivityTeamInfoBo bo) { @@ -88,7 +88,7 @@ public class StglActivityTeamInfoController extends BaseController { /** * 删除活动团队信息 */ - //@SaCheckPermission("stgl:activityteaminfo:remove") + @SaCheckPermission("stgl:activityteaminfo:remove") @Log(title = "活动团队信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java index 7a9918c1..b3650096 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java @@ -40,7 +40,7 @@ public class StglAnnualReviewAuditController extends BaseController { /** * 查询社团年审审批详细 */ - //@SaCheckPermission("stgl:annualReviewAudit:query") + @SaCheckPermission("stgl:annualReviewAudit:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -50,7 +50,7 @@ public class StglAnnualReviewAuditController extends BaseController { /** * 根据年审记录ID查询审批记录 */ - //@SaCheckPermission("stgl:annualReviewAudit:query") + @SaCheckPermission("stgl:annualReviewAudit:query") @GetMapping("/byAnnualReview/{annualReviewId}") public R> getByAnnualReviewId(@NotNull(message = "年审记录ID不能为空") @PathVariable("annualReviewId") Long annualReviewId) { @@ -60,7 +60,7 @@ public class StglAnnualReviewAuditController extends BaseController { /** * 根据审批人ID查询待审批记录 */ - //@SaCheckPermission("stgl:annualReviewAudit:query") + @SaCheckPermission("stgl:annualReviewAudit:query") @GetMapping("/pending/{approverId}") public R> getPendingByApproverId(@NotNull(message = "审批人ID不能为空") @PathVariable("approverId") Long approverId) { @@ -70,7 +70,7 @@ public class StglAnnualReviewAuditController extends BaseController { /** * 新增社团年审审批 */ - //@SaCheckPermission("stgl:annualReviewAudit:add") + @SaCheckPermission("stgl:annualReviewAudit:add") @Log(title = "社团年审审批", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +81,7 @@ public class StglAnnualReviewAuditController extends BaseController { /** * 修改社团年审审批 */ - //@SaCheckPermission("stgl:annualReviewAudit:edit") + @SaCheckPermission("stgl:annualReviewAudit:edit") @Log(title = "社团年审审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -92,7 +92,7 @@ public class StglAnnualReviewAuditController extends BaseController { /** * 删除社团年审审批 */ - //@SaCheckPermission("stgl:annualReviewAudit:remove") + @SaCheckPermission("stgl:annualReviewAudit:remove") @Log(title = "社团年审审批", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -103,7 +103,7 @@ public class StglAnnualReviewAuditController extends BaseController { /** * 审批年审记录 */ - //@SaCheckPermission("stgl:annualReviewAudit:approve") + @SaCheckPermission("stgl:annualReviewAudit:approve") @Log(title = "社团年审审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/approve") diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java index 8112b31d..46e6e9c0 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java @@ -42,7 +42,7 @@ public class StglAuditorController extends BaseController { /** * 查询社团管理审核人配置列表 */ - //@SaCheckPermission("stgl:auditor:list") + @SaCheckPermission("stgl:auditor:list") @GetMapping("/list") public TableDataInfo list(StglAuditorBo bo, PageQuery pageQuery) { return stglAuditorService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class StglAuditorController extends BaseController { /** * 导出社团管理审核人配置列表 */ - //@SaCheckPermission("stgl:auditor:export") + @SaCheckPermission("stgl:auditor:export") @Log(title = "社团管理审核人配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglAuditorBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class StglAuditorController extends BaseController { /** * 获取社团管理审核人配置详细信息 */ - //@SaCheckPermission("stgl:auditor:query") + @SaCheckPermission("stgl:auditor:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class StglAuditorController extends BaseController { /** * 新增社团管理审核人配置 */ - //@SaCheckPermission("stgl:auditor:add") + @SaCheckPermission("stgl:auditor:add") @Log(title = "社团管理审核人配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class StglAuditorController extends BaseController { /** * 修改社团管理审核人配置 */ - //@SaCheckPermission("stgl:auditor:edit") + @SaCheckPermission("stgl:auditor:edit") @Log(title = "社团管理审核人配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class StglAuditorController extends BaseController { /** * 删除社团管理审核人配置 */ - //@SaCheckPermission("stgl:auditor:remove") + @SaCheckPermission("stgl:auditor:remove") @Log(title = "社团管理审核人配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -105,7 +105,7 @@ public class StglAuditorController extends BaseController { /** * 批量添加审核人 */ - //@SaCheckPermission("stgl:auditor:add") + @SaCheckPermission("stgl:auditor:add") @Log(title = "批量添加审核人", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batchAdd") @@ -116,7 +116,7 @@ public class StglAuditorController extends BaseController { /** * 查询我配置的审核人列表 */ - //@SaCheckPermission("stgl:auditor:list") + @SaCheckPermission("stgl:auditor:list") @GetMapping("/myConfig") public TableDataInfo myConfigList(StglAuditorBo bo, PageQuery pageQuery) { return stglAuditorService.queryMyConfigList(bo, pageQuery); @@ -125,7 +125,7 @@ public class StglAuditorController extends BaseController { /** * 批量启用审核人 */ - //@SaCheckPermission("stgl:auditor:edit") + @SaCheckPermission("stgl:auditor:edit") @Log(title = "启用审核人", businessType = BusinessType.UPDATE) @PostMapping("/enable") public R enable(@RequestBody List ids) { @@ -135,7 +135,7 @@ public class StglAuditorController extends BaseController { /** * 批量停用审核人 */ - //@SaCheckPermission("stgl:auditor:edit") + @SaCheckPermission("stgl:auditor:edit") @Log(title = "停用审核人", businessType = BusinessType.UPDATE) @PostMapping("/disable") public R disable(@RequestBody List ids) { @@ -145,7 +145,7 @@ public class StglAuditorController extends BaseController { /** * 根据部门ID获取用户列表 */ - //@SaCheckPermission("stgl:auditor:list") + @SaCheckPermission("stgl:auditor:list") @GetMapping("/users/{deptId}") public R> listUserByDeptId(@PathVariable("deptId") String deptId) { List users = sysUserService.selectUserListByDept(Long.valueOf(deptId)); diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java index da1ef74e..916dbb9d 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java @@ -41,7 +41,7 @@ public class StglClassController extends BaseController { /** * 查询班主任的班级列表 */ - //@SaCheckPermission("stgl:stclass:list") + @SaCheckPermission("stgl:stclass:list") @GetMapping("/teacher/classes") public R>> getTeacherClasses() { Long userId = LoginHelper.getUserId(); @@ -52,7 +52,7 @@ public class StglClassController extends BaseController { /** * 查询班级学生社团、志愿者队伍、活动参加情况列表 */ - //@SaCheckPermission("stgl:stclass:list") + @SaCheckPermission("stgl:stclass:list") @GetMapping("/list") public TableDataInfo list(StglClassBo bo, PageQuery pageQuery) { return stglClassService.queryPageList(bo, pageQuery); @@ -61,7 +61,7 @@ public class StglClassController extends BaseController { /** * 查询学生社团详情 */ - //@SaCheckPermission("stgl:stclass:query") + @SaCheckPermission("stgl:stclass:query") @GetMapping("/student/clubs/{studentId}") public R>> getStudentClubs(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { List> list = stglClassService.getStudentClubs(studentId); @@ -71,7 +71,7 @@ public class StglClassController extends BaseController { /** * 查询学生志愿者队伍详情 */ - //@SaCheckPermission("stgl:stclass:query") + @SaCheckPermission("stgl:stclass:query") @GetMapping("/student/volunteer-teams/{studentId}") public R>> getStudentVolunteerTeams(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { List> list = stglClassService.getStudentVolunteerTeams(studentId); @@ -81,7 +81,7 @@ public class StglClassController extends BaseController { /** * 查询学生活动详情 */ - //@SaCheckPermission("stgl:stclass:query") + @SaCheckPermission("stgl:stclass:query") @GetMapping("/student/activities/{studentId}") public R>> getStudentActivities(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { List> list = stglClassService.getStudentActivities(studentId); @@ -91,7 +91,7 @@ public class StglClassController extends BaseController { /** * 导出班级学生社团、志愿者队伍、活动参加情况列表 */ - //@SaCheckPermission("stgl:stclass:export") + @SaCheckPermission("stgl:stclass:export") @Log(title = "班级学生社团、志愿者队伍、活动参加情况", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglClassBo bo, HttpServletResponse response) { @@ -102,7 +102,7 @@ public class StglClassController extends BaseController { /** * 查询班主任所辖班级中当前正在参加活动的学生列表 */ - //@SaCheckPermission("stgl:stclass:list") + @SaCheckPermission("stgl:stclass:list") @GetMapping("/current-activities") public TableDataInfo> currentActivities(StglClassBo bo, PageQuery pageQuery) { return stglClassService.getCurrentActiveStudents(bo, pageQuery); diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java index 60677c23..1dedebf3 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java @@ -45,7 +45,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 查询社团指导老师任职历史列表 */ @Operation(summary = "查询社团指导老师任职历史列表") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/list") public TableDataInfo list(StglClubAdvisorHistoryBo bo, PageQuery pageQuery) { return stglClubAdvisorHistoryService.queryPageList(bo, pageQuery); @@ -55,7 +55,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 导出社团指导老师任职历史列表 */ @Operation(summary = "导出社团指导老师任职历史列表") - //@SaCheckPermission("stgl:club:export") + @SaCheckPermission("stgl:club:export") @Log(title = "社团指导老师任职历史", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglClubAdvisorHistoryBo bo, HttpServletResponse response) { @@ -67,7 +67,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 获取社团指导老师任职历史详细信息 */ @Operation(summary = "获取社团指导老师任职历史详细信息") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglClubAdvisorHistoryService.queryById(id)); @@ -77,7 +77,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 查询指定社团的当前在任指导老师 */ @Operation(summary = "查询指定社团的当前在任指导老师") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/current/{clubId}") @Parameter(name = "clubId", description = "社团ID", required = true) public R> getCurrentAdvisors(@PathVariable("clubId") Long clubId) { @@ -89,7 +89,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 查询指定社团的历史指导老师（已离任） */ @Operation(summary = "查询指定社团的历史指导老师") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/history/{clubId}") @Parameter(name = "clubId", description = "社团ID", required = true) public R> getHistoryAdvisors(@PathVariable("clubId") Long clubId) { @@ -101,7 +101,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 查询指定社团的所有指导老师（包含当前和历史） */ @Operation(summary = "查询指定社团的所有指导老师") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/all/{clubId}") @Parameter(name = "clubId", description = "社团ID", required = true) public R> getAllAdvisors(@PathVariable("clubId") Long clubId) { @@ -113,7 +113,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 新增社团指导老师任职历史 */ @Operation(summary = "新增社团指导老师任职历史") - //@SaCheckPermission("stgl:club:add") + @SaCheckPermission("stgl:club:add") @Log(title = "社团指导老师任职历史", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -125,7 +125,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 修改社团指导老师任职历史 */ @Operation(summary = "修改社团指导老师任职历史") - //@SaCheckPermission("stgl:club:edit") + @SaCheckPermission("stgl:club:edit") @Log(title = "社团指导老师任职历史", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -137,7 +137,7 @@ public class StglClubAdvisorHistoryController extends BaseController { * 删除社团指导老师任职历史 */ @Operation(summary = "删除社团指导老师任职历史") - //@SaCheckPermission("stgl:club:remove") + @SaCheckPermission("stgl:club:remove") @Log(title = "社团指导老师任职历史", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java index 4629b90d..2e3b6c9f 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java @@ -45,7 +45,7 @@ public class StglClubAnnualReviewController extends BaseController { * 查询社团年审记录列表 */ @Operation(summary = "查询社团年审记录列表") - //@SaCheckPermission("stgl:clubAnnualReview:list") + @SaCheckPermission("stgl:clubAnnualReview:list") @GetMapping("/list") public TableDataInfo list(StglClubAnnualReviewBo bo, PageQuery pageQuery) { return stglClubAnnualReviewService.queryPageList(bo, pageQuery); @@ -55,7 +55,7 @@ public class StglClubAnnualReviewController extends BaseController { * 查询我的社团年审记录列表 */ @Operation(summary = "查询我的社团年审记录列表") - //@SaCheckPermission("stgl:clubAnnualReview:myList") + @SaCheckPermission("stgl:clubAnnualReview:myList") @GetMapping("/myList") public TableDataInfo myList(StglClubAnnualReviewBo bo, PageQuery pageQuery) { return stglClubAnnualReviewService.queryMyPageList(bo, pageQuery); @@ -65,7 +65,7 @@ public class StglClubAnnualReviewController extends BaseController { * 导出社团年审记录列表 */ @Operation(summary = "导出社团年审记录列表") - //@SaCheckPermission("stgl:clubAnnualReview:export") + @SaCheckPermission("stgl:clubAnnualReview:export") @Log(title = "社团年审记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglClubAnnualReviewBo bo, HttpServletResponse response) { @@ -77,7 +77,7 @@ public class StglClubAnnualReviewController extends BaseController { * 获取社团年审记录详细信息 */ @Operation(summary = "获取社团年审记录详细信息") - //@SaCheckPermission("stgl:clubAnnualReview:query") + @SaCheckPermission("stgl:clubAnnualReview:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -88,7 +88,7 @@ public class StglClubAnnualReviewController extends BaseController { * 新增社团年审记录 */ @Operation(summary = "新增社团年审记录") - //@SaCheckPermission("stgl:clubAnnualReview:add") + @SaCheckPermission("stgl:clubAnnualReview:add") @Log(title = "社团年审记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -100,7 +100,7 @@ public class StglClubAnnualReviewController extends BaseController { * 修改社团年审记录 */ @Operation(summary = "修改社团年审记录") - //@SaCheckPermission("stgl:clubAnnualReview:edit") + @SaCheckPermission("stgl:clubAnnualReview:edit") @Log(title = "社团年审记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -112,7 +112,7 @@ public class StglClubAnnualReviewController extends BaseController { * 删除社团年审记录 */ @Operation(summary = "删除社团年审记录") - //@SaCheckPermission("stgl:clubAnnualReview:remove") + @SaCheckPermission("stgl:clubAnnualReview:remove") @Log(title = "社团年审记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -124,7 +124,7 @@ public class StglClubAnnualReviewController extends BaseController { * 提交年审记录 */ @Operation(summary = "提交年审记录") - //@SaCheckPermission("stgl:clubAnnualReview:submit") + @SaCheckPermission("stgl:clubAnnualReview:submit") @Log(title = "社团年审记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/submit/{id}") @@ -137,7 +137,7 @@ public class StglClubAnnualReviewController extends BaseController { * 撤回年审记录 */ @Operation(summary = "撤回年审记录") - //@SaCheckPermission("stgl:clubAnnualReview:withdraw") + @SaCheckPermission("stgl:clubAnnualReview:withdraw") @Log(title = "社团年审记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/withdraw/{id}") @@ -150,7 +150,7 @@ public class StglClubAnnualReviewController extends BaseController { * 审核年审记录 */ @Operation(summary = "审核年审记录") - //@SaCheckPermission("stgl:clubAnnualReview:audit") + @SaCheckPermission("stgl:clubAnnualReview:audit") @Log(title = "社团年审记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/audit") @@ -165,7 +165,7 @@ public class StglClubAnnualReviewController extends BaseController { * 检查是否可以创建年审记录 */ @Operation(summary = "检查是否可以创建年审记录") - //@SaCheckPermission("stgl:clubAnnualReview:check") + @SaCheckPermission("stgl:clubAnnualReview:check") @GetMapping("/check") public R checkCanCreate(@RequestParam("clubId") @NotNull(message = "社团ID不能为空") Long clubId, @RequestParam("reviewYear") @NotNull(message = "年审年度不能为空") Integer reviewYear) { @@ -190,7 +190,7 @@ public class StglClubAnnualReviewController extends BaseController { @Parameter(name = "clubId", description = "社团ID", required = true), @Parameter(name = "reviewYear", description = "年审年度", required = true) }) - //@SaCheckPermission("stgl:clubAnnualReview:query") + @SaCheckPermission("stgl:clubAnnualReview:query") @GetMapping("/clubActivities") public R> getClubActivities( @RequestParam("clubId") @NotNull(message = "社团ID不能为空") Long clubId, @@ -203,7 +203,7 @@ public class StglClubAnnualReviewController extends BaseController { */ @Operation(summary = "根据年审记录ID获取对应的活动数据") @Parameter(name = "id", description = "年审记录ID", required = true) - //@SaCheckPermission("stgl:clubAnnualReview:query") + @SaCheckPermission("stgl:clubAnnualReview:query") @GetMapping("/{id}/activities") public R> getAnnualReviewActivities( @NotNull(message = "年审记录ID不能为空") @PathVariable("id") Long id) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java index 9401e715..ec16eb81 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java @@ -46,7 +46,7 @@ public class StglClubController extends BaseController { * 查询社团信息列表 */ @Operation(summary = "查询社团信息列表") - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/list") public TableDataInfo list(StglClubBo bo, PageQuery pageQuery) { return stglClubService.queryPageList(bo, pageQuery); @@ -56,7 +56,7 @@ public class StglClubController extends BaseController { * 导出社团信息列表 */ @Operation(summary = "导出社团信息列表") - //@SaCheckPermission("stgl:club:export") + @SaCheckPermission("stgl:club:export") @Log(title = "社团信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglClubBo bo, HttpServletResponse response) { @@ -68,7 +68,7 @@ public class StglClubController extends BaseController { * 获取社团信息详细信息 */ @Operation(summary = "获取社团信息详细信息") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -79,7 +79,7 @@ public class StglClubController extends BaseController { * 新增社团信息 */ @Operation(summary = "新增社团信息") - //@SaCheckPermission("stgl:club:add") + @SaCheckPermission("stgl:club:add") @Log(title = "社团信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -91,7 +91,7 @@ public class StglClubController extends BaseController { * 修改社团信息 */ @Operation(summary = "修改社团信息") - //@SaCheckPermission("stgl:club:edit") + @SaCheckPermission("stgl:club:edit") @Log(title = "社团信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -103,7 +103,7 @@ public class StglClubController extends BaseController { * 删除社团信息 */ @Operation(summary = "删除社团信息") - //@SaCheckPermission("stgl:club:remove") + @SaCheckPermission("stgl:club:remove") @Log(title = "社团信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -115,7 +115,7 @@ public class StglClubController extends BaseController { * 查询可用的社团选项 */ @Operation(summary = "查询可用的社团选项") - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/options") public R> getOptions() { return R.ok(stglClubService.queryAvailableOptions()); @@ -125,7 +125,7 @@ public class StglClubController extends BaseController { * 根据社团类型查询社团列表 */ @Operation(summary = "根据社团类型查询社团列表") - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/listByType/{clubType}") @Parameters({ @Parameter(name = "clubType", description = "社团类型", required = true) @@ -138,7 +138,7 @@ public class StglClubController extends BaseController { * 查询我管理的社团列表 */ @Operation(summary = "查询我管理的社团列表") - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/myClubs") public R> getMyClubs() { return R.ok(stglClubService.queryMyClubs()); @@ -148,7 +148,7 @@ public class StglClubController extends BaseController { * 检查社团名称是否重复 */ @Operation(summary = "检查社团名称是否重复") - //@SaCheckPermission("stgl:club:add") + @SaCheckPermission("stgl:club:add") @GetMapping("/checkClubName") @Parameters({ @Parameter(name = "clubName", description = "社团名称", required = true), @@ -162,7 +162,7 @@ public class StglClubController extends BaseController { * 验证当前用户是否为社团社长 */ @Operation(summary = "验证当前用户是否为社团社长") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/checkPresident/{id}") @Parameters({ @Parameter(name = "id", description = "社团ID", required = true) @@ -180,7 +180,7 @@ public class StglClubController extends BaseController { * 社团转让 */ @Operation(summary = "社团转让") - //@SaCheckPermission("stgl:club:edit") + @SaCheckPermission("stgl:club:edit") @Log(title = "社团转让", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/transfer/{id}") @@ -196,7 +196,7 @@ public class StglClubController extends BaseController { * 临时测试接口：验证副社长数据映射 */ @Operation(summary = "测试副社长数据映射") - //@SaCheckPermission("stgl:club:query") + @SaCheckPermission("stgl:club:query") @GetMapping("/testVicePresidentData/{id}") public R testVicePresidentData(@PathVariable("id") Long id) { StglClubVo club = stglClubService.queryById(id); @@ -217,7 +217,7 @@ public class StglClubController extends BaseController { * 启用/禁用社团 */ @Operation(summary = "启用/禁用社团") - //@SaCheckPermission("stgl:club:edit") + @SaCheckPermission("stgl:club:edit") @Log(title = "社团信息", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") @Parameters({ @@ -232,7 +232,7 @@ public class StglClubController extends BaseController { * 修改社团报名开启状态 */ @Operation(summary = "修改社团报名开启状态") - //@SaCheckPermission("stgl:club:edit") + @SaCheckPermission("stgl:club:edit") @Log(title = "社团信息", businessType = BusinessType.UPDATE) @PutMapping("/changeSighOpenStatus") @Parameters({ @@ -248,7 +248,7 @@ public class StglClubController extends BaseController { * 为缺失社长、副社长成员记录的社团补充相应记录 */ @Operation(summary = "修复已存在社团的成员记录") - //@SaCheckPermission("stgl:club:edit") + @SaCheckPermission("stgl:club:edit") @Log(title = "社团信息", businessType = BusinessType.UPDATE) @PostMapping("/fixMemberRecords") public R fixMemberRecords() { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java index 5f501d8e..654e0875 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java @@ -37,7 +37,7 @@ public class StglClubPermissionController extends BaseController { * @param clubId 社团ID * @return 权限检查结果 */ - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/checkActivityPermission/{clubId}") @Log(title = "检查社团活动权限", businessType = BusinessType.OTHER) public R checkActivityPermission(@PathVariable("clubId") Long clubId) { @@ -64,7 +64,7 @@ public class StglClubPermissionController extends BaseController { * @param clubIds 社团ID列表 * @return 权限检查结果映射 */ - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @PostMapping("/batchCheckPermission") @Log(title = "批量检查社团权限", businessType = BusinessType.OTHER) public R> batchCheckPermission(@RequestBody List clubIds) { @@ -95,7 +95,7 @@ public class StglClubPermissionController extends BaseController { * @param clubId 社团ID * @return 是否在年审窗口期 */ - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/isInAnnualReviewWindow/{clubId}") public R isInAnnualReviewWindow(@PathVariable("clubId") Long clubId) { log.debug("检查社团是否在年审窗口期，clubId: {}", clubId); @@ -119,7 +119,7 @@ public class StglClubPermissionController extends BaseController { * @param clubId 社团ID * @return 距离年审的天数 */ - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/getDaysUntilNextAnnualReview/{clubId}") public R getDaysUntilNextAnnualReview(@PathVariable("clubId") Long clubId) { log.debug("获取社团距离年审天数，clubId: {}", clubId); @@ -143,7 +143,7 @@ public class StglClubPermissionController extends BaseController { * @param clubId 社团ID * @return 是否已提交年审 */ - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/hasSubmittedCurrentYearAnnualReview/{clubId}") public R hasSubmittedCurrentYearAnnualReview(@PathVariable("clubId") Long clubId) { log.debug("检查社团是否已提交年审，clubId: {}", clubId); @@ -167,7 +167,7 @@ public class StglClubPermissionController extends BaseController { * @param clubId 社团ID * @return 权限详细信息 */ - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/getPermissionDetails/{clubId}") @Log(title = "获取社团权限详情", businessType = BusinessType.OTHER) public R> getPermissionDetails(@PathVariable("clubId") Long clubId) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java index 43854ca3..6f3f2d08 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java @@ -41,7 +41,7 @@ public class StglClubRegisterController extends BaseController { * 查询社团报名大厅列表 */ @Operation(summary = "查询社团报名大厅列表") - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/list") public TableDataInfo list(@RequestParam(value = "clubType", required = false) String clubType, @RequestParam(value = "clubName", required = false) String clubName, @@ -75,7 +75,7 @@ public class StglClubRegisterController extends BaseController { * 申请加入社团 */ @Operation(summary = "申请加入社团") - //@SaCheckPermission("stgl:register:apply") + @SaCheckPermission("stgl:register:apply") @Log(title = "社团申请", businessType = BusinessType.INSERT) @PostMapping("/apply") public R applyClub(@RequestParam("clubId") Long clubId, @RequestBody StglClubApplyBo applyBo) { @@ -88,7 +88,7 @@ public class StglClubRegisterController extends BaseController { * 退出社团 */ @Operation(summary = "退出社团") - //@SaCheckPermission("stgl:register:quit") + @SaCheckPermission("stgl:register:quit") @Log(title = "社团退出", businessType = BusinessType.UPDATE) @PostMapping("/quit/{clubId}") @Parameters({ @@ -103,7 +103,7 @@ public class StglClubRegisterController extends BaseController { * 查询我参与的社团列表 */ @Operation(summary = "查询我参与的社团列表") - //@SaCheckPermission("stgl:register:list") + @SaCheckPermission("stgl:register:list") @GetMapping("/myClubs") public R> getMyClubs() { Long userId = LoginHelper.getUserId(); @@ -132,7 +132,7 @@ public class StglClubRegisterController extends BaseController { * 查询推荐社团 */ @Operation(summary = "查询推荐社团") - //@SaCheckPermission("stgl:club:list") + @SaCheckPermission("stgl:club:list") @GetMapping("/recommend") @Parameters({ @Parameter(name = "clubType", description = "社团类型", required = false), diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java index a3387a6c..f43a8b81 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java @@ -42,7 +42,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 查询材料提交记录列表 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/list") public TableDataInfo list(StglMaterialSubmissionBo bo, PageQuery pageQuery) { return materialSubmissionService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 导出材料提交记录列表 */ - //@SaCheckPermission("stgl:activitymaterial:export") + @SaCheckPermission("stgl:activitymaterial:export") @Log(title = "材料提交记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglMaterialSubmissionBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 获取材料提交记录详细信息 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(materialSubmissionService.queryById(id)); @@ -71,7 +71,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 新增材料提交记录 */ - //@SaCheckPermission("stgl:activitymaterial:upload") + @SaCheckPermission("stgl:activitymaterial:upload") @Log(title = "材料提交记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -82,7 +82,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 修改材料提交记录 */ - //@SaCheckPermission("stgl:activitymaterial:upload") + @SaCheckPermission("stgl:activitymaterial:upload") @Log(title = "材料提交记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -93,7 +93,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 删除材料提交记录 */ - //@SaCheckPermission("stgl:activitymaterial:remove") + @SaCheckPermission("stgl:activitymaterial:remove") @Log(title = "材料提交记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -103,7 +103,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 材料上传 */ - //@SaCheckPermission("stgl:activitymaterial:upload") + @SaCheckPermission("stgl:activitymaterial:upload") @Log(title = "材料上传", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/upload") @@ -114,7 +114,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 根据任务ID查询提交记录 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/task/{taskId}") public R> getByTaskId(@PathVariable("taskId") Long taskId) { List submissions = materialSubmissionService.queryByTaskId(taskId); @@ -124,7 +124,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 查询用户在指定任务的提交记录 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/task/{taskId}/user/{userId}") public R getByTaskIdAndUserId(@PathVariable("taskId") Long taskId, @PathVariable("userId") Long userId) { StglMaterialSubmissionVo submission = materialSubmissionService.queryByTaskIdAndUserId(taskId, userId); @@ -134,7 +134,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 查询团队在指定任务的提交记录 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/task/{taskId}/team/{teamId}") public R getByTaskIdAndTeamId(@PathVariable("taskId") Long taskId, @PathVariable("teamId") Long teamId) { StglMaterialSubmissionVo submission = materialSubmissionService.queryByTaskIdAndTeamId(taskId, teamId); @@ -144,7 +144,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 获取任务的提交统计信息 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/statistics/{taskId}") public R> getSubmissionStatistics(@PathVariable("taskId") Long taskId) { Map statistics = materialSubmissionService.getSubmissionStatistics(taskId); @@ -154,7 +154,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 审核材料 */ - //@SaCheckPermission("stgl:activitymaterial:review") + @SaCheckPermission("stgl:activitymaterial:review") @Log(title = "材料审核", businessType = BusinessType.UPDATE) @PutMapping("/review/{id}") public R reviewSubmission(@PathVariable("id") Long id, @@ -169,7 +169,7 @@ public class StglMaterialSubmissionController extends BaseController { /** * 批量审核材料 */ - //@SaCheckPermission("stgl:activitymaterial:review") + @SaCheckPermission("stgl:activitymaterial:review") @Log(title = "批量材料审核", businessType = BusinessType.UPDATE) @PutMapping("/review/batch") public R batchReviewSubmissions(@RequestParam("ids") String ids, diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java index d24330c7..1dcbba59 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java @@ -42,7 +42,7 @@ public class StglMaterialTaskController extends BaseController { /** * 查询材料收集任务列表 */ - //@SaCheckPermission("stgl:activitymaterial:list") + @SaCheckPermission("stgl:activitymaterial:list") @GetMapping("/list") public TableDataInfo list(StglMaterialTaskQueryBo queryBo, PageQuery pageQuery) { return materialTaskService.queryPageList(queryBo, pageQuery); @@ -51,7 +51,7 @@ public class StglMaterialTaskController extends BaseController { /** * 导出材料收集任务列表 */ - //@SaCheckPermission("stgl:activitymaterial:export") + @SaCheckPermission("stgl:activitymaterial:export") @Log(title = "材料收集任务", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglMaterialTaskQueryBo queryBo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class StglMaterialTaskController extends BaseController { /** * 获取材料收集任务详细信息 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(materialTaskService.queryById(id)); @@ -71,7 +71,7 @@ public class StglMaterialTaskController extends BaseController { /** * 新增材料收集任务 */ - //@SaCheckPermission("stgl:activitymaterial:add") + @SaCheckPermission("stgl:activitymaterial:add") @Log(title = "材料收集任务", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -82,7 +82,7 @@ public class StglMaterialTaskController extends BaseController { /** * 修改材料收集任务 */ - //@SaCheckPermission("stgl:activitymaterial:edit") + @SaCheckPermission("stgl:activitymaterial:edit") @Log(title = "材料收集任务", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -93,7 +93,7 @@ public class StglMaterialTaskController extends BaseController { /** * 删除材料收集任务 */ - //@SaCheckPermission("stgl:activitymaterial:remove") + @SaCheckPermission("stgl:activitymaterial:remove") @Log(title = "材料收集任务", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -103,7 +103,7 @@ public class StglMaterialTaskController extends BaseController { /** * 更新任务状态（开启/关闭） */ - //@SaCheckPermission("stgl:activitymaterial:status") + @SaCheckPermission("stgl:activitymaterial:status") @Log(title = "材料收集任务状态", businessType = BusinessType.UPDATE) @PutMapping("/status") public R updateStatus(@RequestParam("id") Long id, @RequestParam("taskStatus") Integer taskStatus) { @@ -116,7 +116,7 @@ public class StglMaterialTaskController extends BaseController { /** * 查询用户可上传的材料收集任务 */ - //@SaCheckPermission("stgl:activitymaterial:upload") + @SaCheckPermission("stgl:activitymaterial:upload") @GetMapping("/uploadable") public R> getUploadableTasks(@RequestParam("userId") Long userId, @RequestParam(value = "activityId", required = false) Long activityId) { @@ -127,7 +127,7 @@ public class StglMaterialTaskController extends BaseController { /** * 验证用户上传权限 */ - //@SaCheckPermission("stgl:activitymaterial:upload") + @SaCheckPermission("stgl:activitymaterial:upload") @GetMapping("/validate") public R validateUploadPermission(@RequestParam("taskId") Long taskId, @RequestParam("userId") Long userId) { Boolean hasPermission = materialTaskService.validateUploadPermission(taskId, userId); @@ -137,7 +137,7 @@ public class StglMaterialTaskController extends BaseController { /** * 查询活动的材料收集任务 */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/activity/{activityId}") public R> getTasksByActivityId(@PathVariable("activityId") Long activityId) { List tasks = materialTaskService.queryTasksByActivityId(activityId); @@ -147,7 +147,7 @@ public class StglMaterialTaskController extends BaseController { /** * 更新任务统计信息 */ - //@SaCheckPermission("stgl:activitymaterial:edit") + @SaCheckPermission("stgl:activitymaterial:edit") @Log(title = "材料收集任务统计", businessType = BusinessType.UPDATE) @PutMapping("/statistics/{taskId}") public R updateStatistics(@PathVariable("taskId") Long taskId) { @@ -157,7 +157,7 @@ public class StglMaterialTaskController extends BaseController { /** * 根据活动名称查询活动选项（用于选择器） */ - //@SaCheckPermission("stgl:activitymaterial:query") + @SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/activity/options") public R> getActivityOptions(@RequestParam(value = "activityName", required = false) String activityName) { List options = materialTaskService.queryActivityOptions(activityName); diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java index 913ad92f..6bf0def6 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java @@ -60,7 +60,7 @@ public class StglMemberController extends BaseController { * 查询社团成员列表 */ @Operation(summary = "查询社团成员列表") - //@SaCheckPermission("stgl:clubmember:list") + @SaCheckPermission("stgl:clubmember:list") @GetMapping("/list") public TableDataInfo list(StglMemberBo bo, PageQuery pageQuery) { return stglMemberService.queryPageList(bo, pageQuery); @@ -70,7 +70,7 @@ public class StglMemberController extends BaseController { * 导出社团成员列表 */ @Operation(summary = "导出社团成员列表") - //@SaCheckPermission("stgl:clubmember:export") + @SaCheckPermission("stgl:clubmember:export") @Log(title = "社团成员", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglMemberBo bo, HttpServletResponse response) { @@ -82,7 +82,7 @@ public class StglMemberController extends BaseController { * 获取社团成员详细信息 */ @Operation(summary = "获取社团成员详细信息") - //@SaCheckPermission("stgl:clubmember:query") + @SaCheckPermission("stgl:clubmember:query") @GetMapping("/{id}") @Parameters({ @Parameter(name = "id", description = "成员ID", required = true) @@ -96,7 +96,7 @@ public class StglMemberController extends BaseController { * 新增社团成员 */ @Operation(summary = "新增社团成员") - //@SaCheckPermission("stgl:clubmember:add") + @SaCheckPermission("stgl:clubmember:add") @Log(title = "社团成员", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -108,7 +108,7 @@ public class StglMemberController extends BaseController { * 修改社团成员 */ @Operation(summary = "修改社团成员") - //@SaCheckPermission("stgl:clubmember:edit") + @SaCheckPermission("stgl:clubmember:edit") @Log(title = "社团成员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -120,7 +120,7 @@ public class StglMemberController extends BaseController { * 删除社团成员 */ @Operation(summary = "删除社团成员") - //@SaCheckPermission("stgl:clubmember:remove") + @SaCheckPermission("stgl:clubmember:remove") @Log(title = "社团成员", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -132,7 +132,7 @@ public class StglMemberController extends BaseController { * 批量添加成员 */ @Operation(summary = "批量添加成员") - //@SaCheckPermission("stgl:clubmember:add") + @SaCheckPermission("stgl:clubmember:add") @Log(title = "社团成员", businessType = BusinessType.INSERT) @PostMapping("/batchAdd") @Parameters({ @@ -152,7 +152,7 @@ public class StglMemberController extends BaseController { * 更新成员角色 */ @Operation(summary = "更新成员角色") - //@SaCheckPermission("stgl:clubmember:edit") + @SaCheckPermission("stgl:clubmember:edit") @Log(title = "社团成员", businessType = BusinessType.UPDATE) @PutMapping("/updateRole") @Parameters({ @@ -167,7 +167,7 @@ public class StglMemberController extends BaseController { * 审核成员申请 */ @Operation(summary = "审核成员申请") - //@SaCheckPermission("stgl:clubmember:approve") + @SaCheckPermission("stgl:clubmember:approve") @Log(title = "社团成员审核", businessType = BusinessType.UPDATE) @PutMapping("/approve/{id}") @Parameters({ @@ -182,7 +182,7 @@ public class StglMemberController extends BaseController { * 退出社团/队伍 */ @Operation(summary = "退出社团/队伍") - //@SaCheckPermission("stgl:clubmember:edit") + @SaCheckPermission("stgl:clubmember:edit") @Log(title = "社团成员", businessType = BusinessType.UPDATE) @PutMapping("/quit/{id}") @Parameters({ @@ -200,7 +200,7 @@ public class StglMemberController extends BaseController { */ @Operation(summary = "导入社团成员数据") @Log(title = "社团成员", businessType = BusinessType.IMPORT) - //@SaCheckPermission("stgl:clubmember:import") + @SaCheckPermission("stgl:clubmember:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), @@ -213,7 +213,7 @@ public class StglMemberController extends BaseController { * 获取社团成员导入模板 */ @Operation(summary = "获取社团成员导入模板") - //@SaCheckPermission("stgl:member:import") + @SaCheckPermission("stgl:member:import") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { // 创建示例数据 diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java index 9a1707ce..6b21c5ff 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java @@ -40,7 +40,7 @@ public class StglMyController extends BaseController { * 查询我参与的社团列表 */ @Operation(summary = "查询我参与的社团列表") - //@SaCheckPermission("stgl:my:list") + @SaCheckPermission("stgl:my:list") @GetMapping("/clubs") public R> getMyClubs() { List list = stglMyService.queryMyClubs(); @@ -51,7 +51,7 @@ public class StglMyController extends BaseController { * 查询我参与的志愿团队列表 */ @Operation(summary = "查询我参与的志愿团队列表") - //@SaCheckPermission("stgl:my:list") + @SaCheckPermission("stgl:my:list") @GetMapping("/volunteerTeams") public R> getMyVolunteerTeams() { List list = stglMyService.queryMyVolunteerTeams(); @@ -62,7 +62,7 @@ public class StglMyController extends BaseController { * 查询我报名的活动列表 */ @Operation(summary = "查询我报名的活动列表") - //@SaCheckPermission("stgl:my:list") + @SaCheckPermission("stgl:my:list") @GetMapping("/activities") public R> getMyActivities( @Parameter(description = "活动名称") @RequestParam(value = "activityName", required = false) String activityName, @@ -76,7 +76,7 @@ public class StglMyController extends BaseController { * 分页查询我的报名记录 */ @Operation(summary = "分页查询我的报名记录") - //@SaCheckPermission("stgl:my:list") + @SaCheckPermission("stgl:my:list") @GetMapping("/registrations") public TableDataInfo getMyRegistrations( @Parameter(description = "分页参数") PageQuery pageQuery, @@ -89,7 +89,7 @@ public class StglMyController extends BaseController { * 对活动进行评分 */ @Operation(summary = "对活动进行评分") - //@SaCheckPermission("stgl:my:rate") + @SaCheckPermission("stgl:my:rate") @PostMapping("/activities/{id}/rate") public R rateActivity( @Parameter(description = "活动ID") @PathVariable("id") Long activityId, @@ -102,7 +102,7 @@ public class StglMyController extends BaseController { * 检查是否可以对活动评分 */ @Operation(summary = "检查是否可以对活动评分") - //@SaCheckPermission("stgl:my:rate") + @SaCheckPermission("stgl:my:rate") @GetMapping("/activities/{id}/canRate") public R canRateActivity(@Parameter(description = "活动ID") @PathVariable("id") Long activityId) { Boolean canRate = stglMyService.canRateActivity(activityId); diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java index 55cc54ee..7e7620ce 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java @@ -52,7 +52,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 查询志愿者成员列表 */ - //@SaCheckPermission("stgl:volunteermember:list") + @SaCheckPermission("stgl:volunteermember:list") @GetMapping("/list") public TableDataInfo list(StglMemberBo bo, PageQuery pageQuery) { bo.setMemberType(2); // 志愿者成员 @@ -62,7 +62,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 导出志愿者成员列表 */ - //@SaCheckPermission("stgl:volunteermember:export") + @SaCheckPermission("stgl:volunteermember:export") @Log(title = "志愿者成员", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglMemberBo bo, HttpServletResponse response) { @@ -74,7 +74,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 获取志愿者成员详细信息 */ - //@SaCheckPermission("stgl:volunteermember:query") + @SaCheckPermission("stgl:volunteermember:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -84,7 +84,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 新增志愿者成员 */ - //@SaCheckPermission("stgl:volunteermember:add") + @SaCheckPermission("stgl:volunteermember:add") @Log(title = "志愿者成员", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -100,7 +100,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 修改志愿者成员 */ - //@SaCheckPermission("stgl:volunteermember:edit") + @SaCheckPermission("stgl:volunteermember:edit") @Log(title = "志愿者成员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -112,7 +112,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 删除志愿者成员 */ - //@SaCheckPermission("stgl:volunteermember:remove") + @SaCheckPermission("stgl:volunteermember:remove") @Log(title = "志愿者成员", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -123,7 +123,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 我的志愿队伍成员 */ - //@SaCheckPermission("stgl:volunteerRegistration:my") + @SaCheckPermission("stgl:volunteerRegistration:my") @GetMapping("/my") public R> getMyTeamMembers() { Long userId = LoginHelper.getUserId(); @@ -150,7 +150,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 根据队伍ID查询成员 */ - //@SaCheckPermission("stgl:volunteermember:list") + @SaCheckPermission("stgl:volunteermember:list") @GetMapping("/team/{teamId}") public R> getTeamMembers(@NotNull(message = "队伍ID不能为空") @PathVariable("teamId") Long teamId) { @@ -164,7 +164,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 批量分配队伍 */ - //@SaCheckPermission("stgl:volunteermember:edit") + @SaCheckPermission("stgl:volunteermember:edit") @Log(title = "志愿者成员", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/assignTeam") @@ -175,7 +175,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 获取志愿者成员统计信息 */ - //@SaCheckPermission("stgl:volunteermember:query") + @SaCheckPermission("stgl:volunteermember:query") @GetMapping("/stats") public R getStats() { return R.ok(stglMemberService.getVolunteerMemberStats()); @@ -185,7 +185,7 @@ public class StglVolunteerMemberController extends BaseController { * 下载志愿者成员导入模板 */ @PostMapping("/importTemplate") - //@SaCheckPermission("stgl:volunteermember:import") + @SaCheckPermission("stgl:volunteermember:import") public void importTemplate(HttpServletResponse response) { // 创建示例数据 List templateData = new ArrayList<>(); @@ -211,7 +211,7 @@ public class StglVolunteerMemberController extends BaseController { /** * 导入志愿者成员数据 */ - //@SaCheckPermission("stgl:volunteermember:import") + @SaCheckPermission("stgl:volunteermember:import") @Log(title = "志愿者成员", businessType = BusinessType.IMPORT) @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java index 3caf2543..a99201df 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java @@ -18,9 +18,9 @@ import org.dromara.common.web.core.BaseController; import org.dromara.stgl.domain.bo.StglVolunteerTeamBo; import org.dromara.stgl.domain.bo.StglVolunteerTeamApplicationBo; import org.dromara.stgl.domain.vo.StglVolunteerTeamVo; +import org.dromara.stgl.domain.vo.StglStudentBriefVo; +import org.dromara.stgl.domain.vo.StglTeacherBriefVo; import org.dromara.stgl.service.IStglVolunteerTeamService; -import org.dromara.xg.domain.vo.XgStudentMsgVo; -import org.dromara.system.domain.vo.SysUserVo; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -47,7 +47,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 查询志愿者队伍列表 */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/list") public TableDataInfo list(StglVolunteerTeamBo bo, PageQuery pageQuery) { return stglVolunteerTeamService.queryPageList(bo, pageQuery); @@ -56,7 +56,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 导出志愿者队伍列表 */ - // @SaCheckPermission("stgl:volunteerTeam:export") + @SaCheckPermission("stgl:volunteerTeam:export") @Log(title = "志愿者队伍", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(StglVolunteerTeamBo bo, HttpServletResponse response) { @@ -67,7 +67,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 获取志愿者队伍详细信息 */ - // @SaCheckPermission("stgl:volunteerTeam:query") + @SaCheckPermission("stgl:volunteerTeam:query") @GetMapping("/{id}") public R getInfo(@PathVariable("id") Long id) { return R.ok(stglVolunteerTeamService.queryById(id)); @@ -76,7 +76,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 新增志愿者队伍 */ - // @SaCheckPermission("stgl:volunteerTeam:add") + @SaCheckPermission("stgl:volunteerTeam:add") @Log(title = "志愿者队伍", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -87,7 +87,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 修改志愿者队伍 */ - // @SaCheckPermission("stgl:volunteerTeam:edit") + @SaCheckPermission("stgl:volunteerTeam:edit") @Log(title = "志愿者队伍", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -98,7 +98,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 删除志愿者队伍 */ - // @SaCheckPermission("stgl:volunteerTeam:remove") + @SaCheckPermission("stgl:volunteerTeam:remove") @Log(title = "志愿者队伍", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable("ids") Long[] ids) { @@ -108,7 +108,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 获取志愿者队伍可用选项列表 */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/options") public R> getAvailableOptions() { List list = stglVolunteerTeamService.queryAvailableOptions(); @@ -118,7 +118,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 根据队长用户ID查询队伍 */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/byLeader/{leaderUserId}") public R> getByLeaderUserId(@PathVariable("leaderUserId") Long leaderUserId) { List list = stglVolunteerTeamService.queryByLeaderUserId(leaderUserId); @@ -128,7 +128,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 根据队伍类型查询队伍列表 */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/byType/{teamType}") public R> getByTeamType(@PathVariable("teamType") String teamType) { List list = stglVolunteerTeamService.queryByTeamType(teamType); @@ -138,7 +138,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 启用/禁用志愿者队伍 */ - // @SaCheckPermission("stgl:volunteerTeam:edit") + @SaCheckPermission("stgl:volunteerTeam:edit") @Log(title = "志愿者队伍状态变更", businessType = BusinessType.UPDATE) @PutMapping("/status") public R updateStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { @@ -148,7 +148,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 导入志愿者队伍数据 */ - // @SaCheckPermission("stgl:volunteerTeam:import") + @SaCheckPermission("stgl:volunteerTeam:import") @Log(title = "志愿者队伍", businessType = BusinessType.IMPORT) @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file) throws Exception { @@ -165,7 +165,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 获取导入模板 */ - // @SaCheckPermission("stgl:volunteerTeam:import") + @SaCheckPermission("stgl:volunteerTeam:import") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { ExcelUtil.exportExcel(List.of(), "志愿者队伍", StglVolunteerTeamVo.class, response); @@ -174,7 +174,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 申请加入志愿者队伍 */ - // @SaCheckPermission("stgl:volunteerRegistration:apply") + @SaCheckPermission("stgl:volunteerRegistration:apply") @PostMapping("/apply") @RepeatSubmit() public R applyJoinVolunteerTeam(@Validated @RequestBody StglVolunteerTeamApplicationBo applicationBo) { @@ -182,19 +182,18 @@ public class StglVolunteerTeamController extends BaseController { } /** - * 根据姓名搜索学生信息（用于队长选择） + * 根据姓名搜索学生简要信息（用于队长选择） */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/searchStudentByName") - public R> searchStudentByName(@RequestParam("name") String name) { - List students = stglVolunteerTeamService.searchStudentByName(name); - return R.ok(students); + public R> searchStudentByName(@RequestParam("name") String name) { + return R.ok(stglVolunteerTeamService.searchStudentByName(name)); } /** * 查询志愿者队伍报名大厅列表（无数据权限限制） */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/registration/list") public TableDataInfo registrationList(StglVolunteerTeamBo bo, PageQuery pageQuery) { return stglVolunteerTeamService.queryRegistrationPageList(bo, pageQuery); @@ -203,7 +202,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 查询志愿者队伍报名大厅列表（学生专用） */ - // @SaCheckPermission("stgl:volunteerRegistration:list") + @SaCheckPermission("stgl:volunteerRegistration:list") @GetMapping("/registration/student/list") public TableDataInfo registrationStudentList(StglVolunteerTeamBo bo, PageQuery pageQuery) { return stglVolunteerTeamService.queryRegistrationPageList(bo, pageQuery); @@ -212,7 +211,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 获取志愿者队伍详细信息（学生报名大厅专用） */ - // @SaCheckPermission("stgl:volunteerRegistration:query") + @SaCheckPermission("stgl:volunteerRegistration:query") @GetMapping("/registration/{id}") public R getRegistrationInfo(@PathVariable("id") Long id) { StglVolunteerTeamVo vo = stglVolunteerTeamService.queryRegistrationById(id); @@ -220,40 +219,37 @@ public class StglVolunteerTeamController extends BaseController { } /** - * 根据学号获取学生详细信息（用于自动填充） + * 根据学号获取学生简要信息（用于自动填充，不含身份证等敏感字段） */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/getStudentByNo") - public R getStudentByNo(@RequestParam("studentNo") String studentNo) { - XgStudentMsgVo student = stglVolunteerTeamService.getStudentByNo(studentNo); - return R.ok(student); + public R getStudentByNo(@RequestParam("studentNo") String studentNo) { + return R.ok(stglVolunteerTeamService.getStudentByNo(studentNo)); } /** - * 根据姓名搜索指导老师信息 + * 根据姓名搜索指导老师简要信息 */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/searchTeacherByName") - public R> searchTeacherByName(@RequestParam("name") String name) { - List teachers = stglVolunteerTeamService.searchTeacherByName(name); - return R.ok(teachers); + public R> searchTeacherByName(@RequestParam("name") String name) { + return R.ok(stglVolunteerTeamService.searchTeacherByName(name)); } /** - * 根据用户ID获取教师详细信息（用于自动填充） + * 根据用户ID获取教师简要信息（用于自动填充） */ - // @SaCheckPermission("stgl:volunteerTeam:list") + @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/getTeacherById") - public R getTeacherById(@RequestParam("userId") Long userId) { - SysUserVo teacher = stglVolunteerTeamService.getTeacherById(userId); - return R.ok(teacher); + public R getTeacherById(@RequestParam("userId") Long userId) { + return R.ok(stglVolunteerTeamService.getTeacherById(userId)); } /** * 修复所有已存在志愿者队伍的队长成员记录 * 为那些没有对应成员记录的队长补充成员记录 */ - // @SaCheckPermission("stgl:volunteerTeam:edit") + @SaCheckPermission("stgl:volunteerTeam:edit") @Log(title = "修复志愿者队伍队长成员记录", businessType = BusinessType.UPDATE) @PostMapping("/fixLeaderRecords") public R fixExistingTeamLeaderRecords() { @@ -268,7 +264,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 验证当前用户是否为志愿者队伍队长 */ - // @SaCheckPermission("stgl:volunteerTeam:query") + @SaCheckPermission("stgl:volunteerTeam:query") @GetMapping("/checkLeader/{id}") public R checkTeamLeader(@PathVariable("id") Long id) { Long currentUserId = LoginHelper.getUserId(); @@ -282,7 +278,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 志愿者队伍转让 */ - // @SaCheckPermission("stgl:volunteerTeam:transfer") + @SaCheckPermission("stgl:volunteerTeam:transfer") @Log(title = "志愿者队伍转让", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/transfer/{id}") @@ -307,7 +303,7 @@ public class StglVolunteerTeamController extends BaseController { /** * 修改志愿者团队报名开启状态 */ - // @SaCheckPermission("stgl:volunteerTeam:edit") + @SaCheckPermission("stgl:volunteerTeam:edit") @Log(title = "志愿者团队报名状态变更", businessType = BusinessType.UPDATE) @PutMapping("/changeSighOpenStatus") public R changeSighOpenStatus(@RequestParam("id") Long id, @RequestParam("sighOpen") String sighOpen) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/domain/vo/StglStudentBriefVo.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/domain/vo/StglStudentBriefVo.java new file mode 100644 index 00000000..7d1eeb5a --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/domain/vo/StglStudentBriefVo.java @@ -0,0 +1,37 @@ +package org.dromara.stgl.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 志愿团队场景下的学生简要信息（仅自动填充所需字段，避免返回完整学籍档案） + */ +@Data +public class StglStudentBriefVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** 学生主键ID（用作队长 userId 关联） */ + private Long id; + + /** 学号 */ + private String studentNo; + + /** 姓名 */ + private String name; + + /** 手机号 */ + private String phone; + + /** 学院名称 */ + private String collegeName; + + /** 专业名称 */ + private String majorName; + + /** 班级名称 */ + private String className; +} diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/domain/vo/StglTeacherBriefVo.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/domain/vo/StglTeacherBriefVo.java new file mode 100644 index 00000000..bf6d436e --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/domain/vo/StglTeacherBriefVo.java @@ -0,0 +1,31 @@ +package org.dromara.stgl.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 志愿团队场景下的指导老师简要信息（仅自动填充所需字段） + */ +@Data +public class StglTeacherBriefVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** 用户ID */ + private Long userId; + + /** 用户账号 */ + private String userName; + + /** 昵称/姓名 */ + private String nickName; + + /** 手机号 */ + private String phonenumber; + + /** 部门ID */ + private Long deptId; +} diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglVolunteerTeamService.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglVolunteerTeamService.java index 92954480..9063abb3 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglVolunteerTeamService.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/IStglVolunteerTeamService.java @@ -1,12 +1,12 @@ package org.dromara.stgl.service; import org.dromara.stgl.domain.vo.StglVolunteerTeamVo; +import org.dromara.stgl.domain.vo.StglStudentBriefVo; +import org.dromara.stgl.domain.vo.StglTeacherBriefVo; import org.dromara.stgl.domain.bo.StglVolunteerTeamBo; import org.dromara.stgl.domain.bo.StglVolunteerTeamApplicationBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.xg.domain.vo.XgStudentMsgVo; -import org.dromara.system.domain.vo.SysUserVo; import java.util.Collection; import java.util.List; @@ -75,9 +75,9 @@ public interface IStglVolunteerTeamService { Boolean applyJoinVolunteerTeam(StglVolunteerTeamApplicationBo applicationBo); /** - * 根据姓名搜索学生信息（用于队长选择） + * 根据姓名搜索学生简要信息（用于队长选择） */ - List searchStudentByName(String name); + List searchStudentByName(String name); /** * 查询志愿者队伍报名大厅列表（无数据权限限制） @@ -108,19 +108,19 @@ public interface IStglVolunteerTeamService { Boolean isTeamLeader(Long teamId, Long userId); /** - * 根据学号获取学生详细信息（用于自动填充） + * 根据学号获取学生简要信息（用于自动填充，不含身份证等敏感字段） */ - XgStudentMsgVo getStudentByNo(String studentNo); + StglStudentBriefVo getStudentByNo(String studentNo); /** - * 根据姓名搜索指导老师信息 + * 根据姓名搜索指导老师简要信息 */ - List searchTeacherByName(String name); + List searchTeacherByName(String name); /** - * 根据用户ID获取教师详细信息（用于自动填充） + * 根据用户ID获取教师简要信息（用于自动填充） */ - SysUserVo getTeacherById(Long userId); + StglTeacherBriefVo getTeacherById(Long userId); /** * 修复所有已存在志愿者队伍的队长成员记录 diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglVolunteerTeamServiceImpl.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglVolunteerTeamServiceImpl.java index 32503971..9cb93e51 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglVolunteerTeamServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/service/impl/StglVolunteerTeamServiceImpl.java @@ -15,15 +15,15 @@ import org.dromara.stgl.domain.StglMember; import org.dromara.stgl.domain.bo.StglVolunteerTeamBo; import org.dromara.stgl.domain.bo.StglVolunteerTeamApplicationBo; import org.dromara.stgl.domain.vo.StglVolunteerTeamVo; +import org.dromara.stgl.domain.vo.StglStudentBriefVo; +import org.dromara.stgl.domain.vo.StglTeacherBriefVo; import org.dromara.stgl.mapper.StglVolunteerTeamMapper; import org.dromara.stgl.mapper.StglMemberMapper; import org.dromara.stgl.service.IStglVolunteerTeamService; import org.dromara.xg.mapper.XgStudentMsgMapper; -import org.dromara.xg.domain.vo.XgStudentMsgVo; import org.dromara.xg.domain.XgStudentMsg; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.mapper.SysUserRoleMapper; -import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserRole; import org.dromara.common.satoken.utils.LoginHelper; @@ -487,51 +487,101 @@ public class StglVolunteerTeamServiceImpl implements IStglVolunteerTeamService { * 根据姓名搜索学生信息（用于队长选择） */ @Override - public List searchStudentByName(String name) { + public List searchStudentByName(String name) { + if (StringUtils.isBlank(name)) { + return Collections.emptyList(); + } LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(XgStudentMsg::getId, XgStudentMsg::getStudentNo, XgStudentMsg::getName, + XgStudentMsg::getPhone, XgStudentMsg::getCollegeName, XgStudentMsg::getMajorName, + XgStudentMsg::getClassName); lqw.like(XgStudentMsg::getName, name); lqw.orderByAsc(XgStudentMsg::getName); - lqw.last("LIMIT 10"); // 限制返回数量 - - List students = studentMsgMapper.selectList(lqw); - return MapstructUtils.convert(students, XgStudentMsgVo.class); + lqw.last("LIMIT 10"); + + return studentMsgMapper.selectList(lqw).stream() + .map(this::toStudentBrief) + .collect(Collectors.toList()); } /** - * 根据学号获取学生详细信息（用于自动填充） + * 根据学号获取学生简要信息（用于自动填充） */ @Override - public XgStudentMsgVo getStudentByNo(String studentNo) { + public StglStudentBriefVo getStudentByNo(String studentNo) { + if (StringUtils.isBlank(studentNo)) { + return null; + } LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(XgStudentMsg::getId, XgStudentMsg::getStudentNo, XgStudentMsg::getName, + XgStudentMsg::getPhone, XgStudentMsg::getCollegeName, XgStudentMsg::getMajorName, + XgStudentMsg::getClassName); lqw.eq(XgStudentMsg::getStudentNo, studentNo); - + XgStudentMsg student = studentMsgMapper.selectOne(lqw); - return student != null ? MapstructUtils.convert(student, XgStudentMsgVo.class) : null; + return student != null ? toStudentBrief(student) : null; } /** - * 根据姓名搜索指导老师信息 + * 根据姓名搜索指导老师简要信息 */ @Override - public List searchTeacherByName(String name) { + public List searchTeacherByName(String name) { + if (StringUtils.isBlank(name)) { + return Collections.emptyList(); + } LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, + SysUser::getPhonenumber, SysUser::getDeptId); lqw.like(SysUser::getNickName, name); lqw.eq(SysUser::getDelFlag, "0"); - lqw.eq(SysUser::getStatus, "0"); // 正常状态 + lqw.eq(SysUser::getStatus, "0"); lqw.orderByAsc(SysUser::getNickName); - lqw.last("LIMIT 10"); // 限制返回数量 - - List teachers = userMapper.selectList(lqw); - return MapstructUtils.convert(teachers, SysUserVo.class); + lqw.last("LIMIT 10"); + + return userMapper.selectList(lqw).stream() + .map(this::toTeacherBrief) + .collect(Collectors.toList()); } /** - * 根据用户ID获取教师详细信息（用于自动填充） + * 根据用户ID获取教师简要信息（用于自动填充） */ @Override - public SysUserVo getTeacherById(Long userId) { - SysUser teacher = userMapper.selectById(userId); - return teacher != null ? MapstructUtils.convert(teacher, SysUserVo.class) : null; + public StglTeacherBriefVo getTeacherById(Long userId) { + if (userId == null) { + return null; + } + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, + SysUser::getPhonenumber, SysUser::getDeptId); + lqw.eq(SysUser::getUserId, userId); + lqw.eq(SysUser::getDelFlag, "0"); + + SysUser teacher = userMapper.selectOne(lqw); + return teacher != null ? toTeacherBrief(teacher) : null; + } + + private StglStudentBriefVo toStudentBrief(XgStudentMsg student) { + StglStudentBriefVo vo = new StglStudentBriefVo(); + vo.setId(student.getId()); + vo.setStudentNo(student.getStudentNo()); + vo.setName(student.getName()); + vo.setPhone(student.getPhone()); + vo.setCollegeName(student.getCollegeName()); + vo.setMajorName(student.getMajorName()); + vo.setClassName(student.getClassName()); + return vo; + } + + private StglTeacherBriefVo toTeacherBrief(SysUser teacher) { + StglTeacherBriefVo vo = new StglTeacherBriefVo(); + vo.setUserId(teacher.getUserId()); + vo.setUserName(teacher.getUserName()); + vo.setNickName(teacher.getNickName()); + vo.setPhonenumber(teacher.getPhonenumber()); + vo.setDeptId(teacher.getDeptId()); + return vo; } /** diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java index 9e743f1f..bfc1244f 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java @@ -43,7 +43,7 @@ public class SysRegionController extends BaseController { /** * 查询行政区划列表 */ - //@SaCheckPermission("system:SysRegion:list") + @SaCheckPermission("system:SysRegion:list") @GetMapping("/list") public TableDataInfo list(SysRegionBo bo, PageQuery pageQuery) { return sysRegionService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class SysRegionController extends BaseController { /** * 导出行政区划列表 */ - //@SaCheckPermission("system:SysRegion:export") + @SaCheckPermission("system:SysRegion:export") @Log(title = "行政区划", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysRegionBo bo, HttpServletResponse response) { @@ -65,7 +65,7 @@ public class SysRegionController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("system:SysRegion:query") + @SaCheckPermission("system:SysRegion:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(sysRegionService.queryById(id)); @@ -74,7 +74,7 @@ public class SysRegionController extends BaseController { /** * 新增行政区划 */ - //@SaCheckPermission("system:SysRegion:add") + @SaCheckPermission("system:SysRegion:add") @Log(title = "行政区划", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -85,7 +85,7 @@ public class SysRegionController extends BaseController { /** * 修改行政区划 */ - //@SaCheckPermission("system:SysRegion:edit") + @SaCheckPermission("system:SysRegion:edit") @Log(title = "行政区划", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -98,7 +98,7 @@ public class SysRegionController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("system:SysRegion:remove") + @SaCheckPermission("system:SysRegion:remove") @Log(title = "行政区划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -108,7 +108,7 @@ public class SysRegionController extends BaseController { /** * 获取省市区树形数据 */ - //@SaCheckPermission("system:SysRegion:list") + @SaCheckPermission("system:SysRegion:list") @GetMapping("/tree") public R> getRegionTree() { List tree = sysRegionService.getRegionTree(); @@ -121,7 +121,7 @@ public class SysRegionController extends BaseController { * @param request 请求参数 * @return 逆地理编码结果 */ - //@SaCheckPermission("system:SysRegion:geocode") + @SaCheckPermission("system:SysRegion:geocode") @PostMapping("/reverse-geocode") public R reverseGeocode(@Validated @RequestBody GeocodingRequestBo request) { GeocodingResponseVo result = amapService.reverseGeocode(request); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java index c79a4e49..5dc019a3 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java @@ -32,7 +32,7 @@ public class SysTeacherController extends BaseController { /** * 查询教师信息列表 */ - //@SaCheckPermission("system:teacher:list") + @SaCheckPermission("system:teacher:list") @GetMapping("/list") public TableDataInfo list(SysTeacherBo bo, PageQuery pageQuery) { return sysTeacherService.queryPageList(bo, pageQuery); @@ -41,7 +41,7 @@ public class SysTeacherController extends BaseController { /** * 根据姓名搜索教师 */ - //@SaCheckPermission("system:teacher:list") + @SaCheckPermission("system:teacher:list") @GetMapping("/search") public R> searchByName(@RequestParam("name") String name, @RequestParam(value = "limit", defaultValue = "10") Integer limit) { @@ -52,7 +52,7 @@ public class SysTeacherController extends BaseController { /** * 获取部门树形结构 */ - //@SaCheckPermission("system:teacher:list") + @SaCheckPermission("system:teacher:list") @GetMapping("/deptTree") public R> getDeptTreeData() { List tree = sysTeacherService.getDeptTreeData(); @@ -62,7 +62,7 @@ public class SysTeacherController extends BaseController { /** * 根据部门ID获取教师列表 */ - //@SaCheckPermission("system:teacher:list") + @SaCheckPermission("system:teacher:list") @GetMapping("/dept/{deptId}") public R> getTeachersByDeptId(@PathVariable("deptId") Long deptId) { List list = sysTeacherService.getTeachersByDeptId(deptId); @@ -72,7 +72,7 @@ public class SysTeacherController extends BaseController { /** * 获取教师详细信息 */ - //@SaCheckPermission("system:teacher:query") + @SaCheckPermission("system:teacher:query") @GetMapping("/{userId}") public R getInfo(@PathVariable("userId") Long userId) { return R.ok(sysTeacherService.queryById(userId)); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java index 930c818b..1e9c6558 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java @@ -27,7 +27,7 @@ public class CacheController { /** * 获取缓存监控列表 */ - //@SaCheckPermission("monitor:cache:list") + @SaCheckPermission("monitor:cache:list") @GetMapping() public R getInfo() throws Exception { RedisConnection connection = connectionFactory.getConnection(); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java index 79ead66d..580a585b 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java @@ -36,7 +36,7 @@ public class SysLogininforController extends BaseController { /** * 获取系统访问记录列表 */ - //@SaCheckPermission("monitor:logininfor:list") + @SaCheckPermission("monitor:logininfor:list") @GetMapping("/list") public TableDataInfo list(SysLogininforBo logininfor, PageQuery pageQuery) { return logininforService.selectPageLogininforList(logininfor, pageQuery); @@ -46,7 +46,7 @@ public class SysLogininforController extends BaseController { * 导出系统访问记录列表 */ @Log(title = "登录日志", businessType = BusinessType.EXPORT) - //@SaCheckPermission("monitor:logininfor:export") + @SaCheckPermission("monitor:logininfor:export") @PostMapping("/export") public void export(SysLogininforBo logininfor, HttpServletResponse response) { List list = logininforService.selectLogininforList(logininfor); @@ -57,7 +57,7 @@ public class SysLogininforController extends BaseController { * 批量删除登录日志 * @param infoIds 日志ids */ - //@SaCheckPermission("monitor:logininfor:remove") + @SaCheckPermission("monitor:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") public R remove(@PathVariable("infoIds") Long[] infoIds) { @@ -67,7 +67,7 @@ public class SysLogininforController extends BaseController { /** * 清理系统访问记录 */ - //@SaCheckPermission("monitor:logininfor:remove") + @SaCheckPermission("monitor:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") public R clean() { @@ -75,7 +75,7 @@ public class SysLogininforController extends BaseController { return R.ok(); } - //@SaCheckPermission("monitor:logininfor:unlock") + @SaCheckPermission("monitor:logininfor:unlock") @Log(title = "账户解锁", businessType = BusinessType.OTHER) @GetMapping("/unlock/{userName}") public R unlock(@PathVariable("userName") String userName) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java index 6f10620a..a9e22b86 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java @@ -34,7 +34,7 @@ public class SysOperlogController extends BaseController { /** * 获取操作日志记录列表 */ - //@SaCheckPermission("monitor:operlog:list") + @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") public TableDataInfo list(SysOperLogBo operLog, PageQuery pageQuery) { return operLogService.selectPageOperLogList(operLog, pageQuery); @@ -44,7 +44,7 @@ public class SysOperlogController extends BaseController { * 导出操作日志记录列表 */ @Log(title = "操作日志", businessType = BusinessType.EXPORT) - //@SaCheckPermission("monitor:operlog:export") + @SaCheckPermission("monitor:operlog:export") @PostMapping("/export") public void export(SysOperLogBo operLog, HttpServletResponse response) { List list = operLogService.selectOperLogList(operLog); @@ -56,7 +56,7 @@ public class SysOperlogController extends BaseController { * @param operIds 日志ids */ @Log(title = "操作日志", businessType = BusinessType.DELETE) - //@SaCheckPermission("monitor:operlog:remove") + @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") public R remove(@PathVariable("operIds") Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); @@ -66,7 +66,7 @@ public class SysOperlogController extends BaseController { * 清理操作日志记录 */ @Log(title = "操作日志", businessType = BusinessType.CLEAN) - //@SaCheckPermission("monitor:operlog:remove") + @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/clean") public R clean() { operLogService.cleanOperLog(); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java index c6367d66..48f306cd 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -40,7 +40,7 @@ public class SysUserOnlineController extends BaseController { * @param ipaddr IP地址 * @param userName 用户名 */ - //@SaCheckPermission("monitor:online:list") + @SaCheckPermission("monitor:online:list") @GetMapping("/list") public TableDataInfo list(String ipaddr, String userName) { // 获取所有未过期的 token @@ -79,7 +79,7 @@ public class SysUserOnlineController extends BaseController { * * @param tokenId token值 */ - //@SaCheckPermission("monitor:online:forceLogout") + @SaCheckPermission("monitor:online:forceLogout") @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") public R forceLogout(@PathVariable("tokenId") String tokenId) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java index d75e3135..426665cb 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java @@ -32,7 +32,7 @@ public class SysBucketPasswordController extends BaseController { * @param newPassword 新密码 * @return 操作结果 */ - //@SaCheckPermission("system:bucket-password:reset") + @SaCheckPermission("system:bucket-password:reset") @PostMapping("/reset") public R resetBucketPassword( @RequestParam("bucketName") @NotBlank(message = "bucket名称不能为空") String bucketName, @@ -56,7 +56,7 @@ public class SysBucketPasswordController extends BaseController { * @param bucketName bucket名称 * @return bucket密码信息 */ - //@SaCheckPermission("system:bucket-password:query") + @SaCheckPermission("system:bucket-password:query") @GetMapping("/info/{bucketName}") public R getBucketPasswordInfo(@PathVariable("bucketName") String bucketName) { try { @@ -87,7 +87,7 @@ public class SysBucketPasswordController extends BaseController { * @param limit 限制数量，默认10条 * @return 访问记录列表 */ - //@SaCheckPermission("system:bucket-password:query") + @SaCheckPermission("system:bucket-password:query") @GetMapping("/records/{bucketName}") public R getBucketAccessRecords( @PathVariable("bucketName") String bucketName, @@ -102,12 +102,13 @@ public class SysBucketPasswordController extends BaseController { } /** - * 验证bucket密码 + * 验证bucket密码（须具备查询权限，防暴力猜解） * * @param bucketName bucket名称 * @param password 密码 * @return 验证结果 */ + @SaCheckPermission("system:bucket-password:query") @PostMapping("/validate") public R validateBucketPassword( @RequestParam("bucketName") @NotBlank(message = "bucket名称不能为空") String bucketName, diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index 9cd03e0c..0ab2d9c7 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -39,7 +39,7 @@ public class SysClientController extends BaseController { /** * 查询客户端管理列表 */ - //@SaCheckPermission("system:client:list") + @SaCheckPermission("system:client:list") @GetMapping("/list") public TableDataInfo list(SysClientBo bo, PageQuery pageQuery) { return sysClientService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class SysClientController extends BaseController { /** * 导出客户端管理列表 */ - //@SaCheckPermission("system:client:export") + @SaCheckPermission("system:client:export") @Log(title = "客户端管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysClientBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class SysClientController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("system:client:query") + @SaCheckPermission("system:client:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class SysClientController extends BaseController { /** * 新增客户端管理 */ - //@SaCheckPermission("system:client:add") + @SaCheckPermission("system:client:add") @Log(title = "客户端管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class SysClientController extends BaseController { /** * 修改客户端管理 */ - //@SaCheckPermission("system:client:edit") + @SaCheckPermission("system:client:edit") @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -93,7 +93,7 @@ public class SysClientController extends BaseController { /** * 状态修改 */ - //@SaCheckPermission("system:client:edit") + @SaCheckPermission("system:client:edit") @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysClientBo bo) { @@ -105,7 +105,7 @@ public class SysClientController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("system:client:remove") + @SaCheckPermission("system:client:remove") @Log(title = "客户端管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index 3f51f850..1a0ab9ff 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -34,7 +34,7 @@ public class SysConfigController extends BaseController { /** * 获取参数配置列表 */ - //@SaCheckPermission("system:config:list") + @SaCheckPermission("system:config:list") @GetMapping("/list") public TableDataInfo list(SysConfigBo config, PageQuery pageQuery) { return configService.selectPageConfigList(config, pageQuery); @@ -44,7 +44,7 @@ public class SysConfigController extends BaseController { * 导出参数配置列表 */ @Log(title = "参数管理", businessType = BusinessType.EXPORT) - //@SaCheckPermission("system:config:export") + @SaCheckPermission("system:config:export") @PostMapping("/export") public void export(SysConfigBo config, HttpServletResponse response) { List list = configService.selectConfigList(config); @@ -56,7 +56,7 @@ public class SysConfigController extends BaseController { * * @param configId 参数ID */ - //@SaCheckPermission("system:config:query") + @SaCheckPermission("system:config:query") @GetMapping(value = "/{configId}") public R getInfo(@PathVariable("configId") Long configId) { return R.ok(configService.selectConfigById(configId)); @@ -75,7 +75,7 @@ public class SysConfigController extends BaseController { /** * 新增参数配置 */ - //@SaCheckPermission("system:config:add") + @SaCheckPermission("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysConfigBo config) { @@ -89,7 +89,7 @@ public class SysConfigController extends BaseController { /** * 修改参数配置 */ - //@SaCheckPermission("system:config:edit") + @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysConfigBo config) { @@ -103,7 +103,7 @@ public class SysConfigController extends BaseController { /** * 根据参数键名修改参数配置 */ - //@SaCheckPermission("system:config:edit") + @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/updateByKey") public R updateByKey(@RequestBody SysConfigBo config) { @@ -116,7 +116,7 @@ public class SysConfigController extends BaseController { * * @param configIds 参数ID串 */ - //@SaCheckPermission("system:config:remove") + @SaCheckPermission("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") public R remove(@PathVariable("configIds") Long[] configIds) { @@ -127,7 +127,7 @@ public class SysConfigController extends BaseController { /** * 刷新参数缓存 */ - //@SaCheckPermission("system:config:remove") + @SaCheckPermission("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") public R refreshCache() { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 7460be2b..6b05f54f 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -35,7 +35,7 @@ public class SysDeptController extends BaseController { /** * 获取部门列表 */ - //@SaCheckPermission("system:dept:list") + @SaCheckPermission("system:dept:list") @GetMapping("/list") public R> list(SysDeptBo dept) { List depts = deptService.selectDeptList(dept); @@ -47,7 +47,7 @@ public class SysDeptController extends BaseController { * * @param deptId 部门ID */ - //@SaCheckPermission("system:dept:list") + @SaCheckPermission("system:dept:list") @GetMapping("/list/exclude/{deptId}") public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { List depts = deptService.selectDeptList(new SysDeptBo()); @@ -61,7 +61,7 @@ public class SysDeptController extends BaseController { * * @param deptId 部门ID */ - //@SaCheckPermission("system:dept:query") + @SaCheckPermission("system:dept:query") @GetMapping(value = "/{deptId}") public R getInfo(@PathVariable("deptId") Long deptId) { deptService.checkDeptDataScope(deptId); @@ -71,7 +71,7 @@ public class SysDeptController extends BaseController { /** * 新增部门 */ - //@SaCheckPermission("system:dept:add") + @SaCheckPermission("system:dept:add") @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysDeptBo dept) { @@ -84,7 +84,7 @@ public class SysDeptController extends BaseController { /** * 修改部门 */ - //@SaCheckPermission("system:dept:edit") + @SaCheckPermission("system:dept:edit") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysDeptBo dept) { @@ -109,7 +109,7 @@ public class SysDeptController extends BaseController { * * @param deptId 部门ID */ - //@SaCheckPermission("system:dept:remove") + @SaCheckPermission("system:dept:remove") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") public R remove(@PathVariable("deptId") Long deptId) { @@ -131,7 +131,7 @@ public class SysDeptController extends BaseController { * * @param deptIds 部门ID串 */ - //@SaCheckPermission("system:dept:query") + @SaCheckPermission("system:dept:query") @GetMapping("/optionselect") public R> optionselect(@RequestParam(value = "deptIds", required = false) Long[] deptIds) { return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds))); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index a7ca0621..375702e0 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -38,7 +38,7 @@ public class SysDictDataController extends BaseController { /** * 查询字典数据列表 */ - //@SaCheckPermission("system:dict:list") + @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo list(SysDictDataBo dictData, PageQuery pageQuery) { return dictDataService.selectPageDictDataList(dictData, pageQuery); @@ -48,7 +48,7 @@ public class SysDictDataController extends BaseController { * 导出字典数据列表 */ @Log(title = "字典数据", businessType = BusinessType.EXPORT) - //@SaCheckPermission("system:dict:export") + @SaCheckPermission("system:dict:export") @PostMapping("/export") public void export(SysDictDataBo dictData, HttpServletResponse response) { List list = dictDataService.selectDictDataList(dictData); @@ -60,7 +60,7 @@ public class SysDictDataController extends BaseController { * * @param dictCode 字典code */ - //@SaCheckPermission("system:dict:query") + @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictCode}") public R getInfo(@PathVariable("dictCode") Long dictCode) { return R.ok(dictDataService.selectDictDataById(dictCode)); @@ -83,7 +83,7 @@ public class SysDictDataController extends BaseController { /** * 新增字典类型 */ - //@SaCheckPermission("system:dict:add") + @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysDictDataBo dict) { @@ -97,7 +97,7 @@ public class SysDictDataController extends BaseController { /** * 修改保存字典类型 */ - //@SaCheckPermission("system:dict:edit") + @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysDictDataBo dict) { @@ -113,7 +113,7 @@ public class SysDictDataController extends BaseController { * * @param dictCodes 字典code串 */ - //@SaCheckPermission("system:dict:remove") + @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") public R remove(@PathVariable("dictCodes") Long[] dictCodes) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index 8d4ca842..20f3f89b 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -34,7 +34,7 @@ public class SysDictTypeController extends BaseController { /** * 查询字典类型列表 */ - //@SaCheckPermission("system:dict:list") + @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo list(SysDictTypeBo dictType, PageQuery pageQuery) { return dictTypeService.selectPageDictTypeList(dictType, pageQuery); @@ -44,7 +44,7 @@ public class SysDictTypeController extends BaseController { * 导出字典类型列表 */ @Log(title = "字典类型", businessType = BusinessType.EXPORT) - //@SaCheckPermission("system:dict:export") + @SaCheckPermission("system:dict:export") @PostMapping("/export") public void export(SysDictTypeBo dictType, HttpServletResponse response) { List list = dictTypeService.selectDictTypeList(dictType); @@ -56,7 +56,7 @@ public class SysDictTypeController extends BaseController { * * @param dictId 字典ID */ - //@SaCheckPermission("system:dict:query") + @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictId}") public R getInfo(@PathVariable("dictId") Long dictId) { return R.ok(dictTypeService.selectDictTypeById(dictId)); @@ -65,7 +65,7 @@ public class SysDictTypeController extends BaseController { /** * 新增字典类型 */ - //@SaCheckPermission("system:dict:add") + @SaCheckPermission("system:dict:add") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysDictTypeBo dict) { @@ -79,7 +79,7 @@ public class SysDictTypeController extends BaseController { /** * 修改字典类型 */ - //@SaCheckPermission("system:dict:edit") + @SaCheckPermission("system:dict:edit") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysDictTypeBo dict) { @@ -95,7 +95,7 @@ public class SysDictTypeController extends BaseController { * * @param dictIds 字典ID串 */ - //@SaCheckPermission("system:dict:remove") + @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") public R remove(@PathVariable("dictIds") Long[] dictIds) { @@ -106,7 +106,7 @@ public class SysDictTypeController extends BaseController { /** * 刷新字典缓存 */ - //@SaCheckPermission("system:dict:remove") + @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") public R refreshCache() { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index ef28f3cb..76ec9ae1 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -54,7 +54,7 @@ public class SysMenuController extends BaseController { TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY }, mode = SaMode.OR) - //@SaCheckPermission("system:menu:list") + @SaCheckPermission("system:menu:list") @GetMapping("/list") public R> list(SysMenuBo menu) { List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); @@ -70,7 +70,7 @@ public class SysMenuController extends BaseController { TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY }, mode = SaMode.OR) - //@SaCheckPermission("system:menu:query") + @SaCheckPermission("system:menu:query") @GetMapping(value = "/{menuId}") public R getInfo(@PathVariable("menuId") Long menuId) { return R.ok(menuService.selectMenuById(menuId)); @@ -79,7 +79,7 @@ public class SysMenuController extends BaseController { /** * 获取菜单下拉树列表 */ - //@SaCheckPermission("system:menu:query") + @SaCheckPermission("system:menu:query") @GetMapping("/treeselect") public R>> treeselect(SysMenuBo menu) { List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); @@ -91,7 +91,7 @@ public class SysMenuController extends BaseController { * * @param roleId 角色ID */ - //@SaCheckPermission("system:menu:query") + @SaCheckPermission("system:menu:query") @GetMapping(value = "/roleMenuTreeselect/{roleId}") public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { List menus = menuService.selectMenuList(LoginHelper.getUserId()); @@ -107,7 +107,7 @@ public class SysMenuController extends BaseController { * @param packageId 租户套餐ID */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:menu:query") + @SaCheckPermission("system:menu:query") @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}") public R tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) { List menus = menuService.selectMenuList(LoginHelper.getUserId()); @@ -121,7 +121,7 @@ public class SysMenuController extends BaseController { * 新增菜单 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:menu:add") + @SaCheckPermission("system:menu:add") @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysMenuBo menu) { @@ -137,7 +137,7 @@ public class SysMenuController extends BaseController { * 修改菜单 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:menu:edit") + @SaCheckPermission("system:menu:edit") @Log(title = "菜单管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysMenuBo menu) { @@ -157,7 +157,7 @@ public class SysMenuController extends BaseController { * @param menuId 菜单ID */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:menu:remove") + @SaCheckPermission("system:menu:remove") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") public R remove(@PathVariable("menuId") Long menuId) { @@ -179,7 +179,7 @@ public class SysMenuController extends BaseController { * @param menuIds 菜单ID串 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:menu:remove") + @SaCheckPermission("system:menu:remove") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/cascade/{menuIds}") public R remove(@PathVariable("menuIds") Long[] menuIds) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index fcb9ac25..6b3de3cf 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -33,7 +33,7 @@ public class SysNoticeController extends BaseController { /** * 获取通知公告列表 */ - //@SaCheckPermission("system:notice:list") + @SaCheckPermission("system:notice:list") @GetMapping("/list") public TableDataInfo list(SysNoticeBo notice, PageQuery pageQuery) { return noticeService.selectPageNoticeList(notice, pageQuery); @@ -44,7 +44,7 @@ public class SysNoticeController extends BaseController { * * @param noticeId 公告ID */ - //@SaCheckPermission("system:notice:query") + @SaCheckPermission("system:notice:query") @GetMapping(value = "/{noticeId}") public R getInfo(@PathVariable("noticeId") Long noticeId) { return R.ok(noticeService.selectNoticeById(noticeId)); @@ -53,7 +53,7 @@ public class SysNoticeController extends BaseController { /** * 新增通知公告 */ - //@SaCheckPermission("system:notice:add") + @SaCheckPermission("system:notice:add") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysNoticeBo notice) { @@ -69,7 +69,7 @@ public class SysNoticeController extends BaseController { /** * 修改通知公告 */ - //@SaCheckPermission("system:notice:edit") + @SaCheckPermission("system:notice:edit") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysNoticeBo notice) { @@ -81,7 +81,7 @@ public class SysNoticeController extends BaseController { * * @param noticeIds 公告ID串 */ - //@SaCheckPermission("system:notice:remove") + @SaCheckPermission("system:notice:remove") @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") public R remove(@PathVariable("noticeIds") Long[] noticeIds) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java index 8ef0a94f..ed705344 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java @@ -40,7 +40,7 @@ public class SysOssConfigController extends BaseController { /** * 查询对象存储配置列表 */ - //@SaCheckPermission("system:ossConfig:list") + @SaCheckPermission("system:ossConfig:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { return ossConfigService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class SysOssConfigController extends BaseController { * * @param ossConfigId OSS配置ID */ - //@SaCheckPermission("system:ossConfig:list") + @SaCheckPermission("system:ossConfig:list") @GetMapping("/{ossConfigId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("ossConfigId") Long ossConfigId) { @@ -61,7 +61,7 @@ public class SysOssConfigController extends BaseController { /** * 新增对象存储配置 */ - //@SaCheckPermission("system:ossConfig:add") + @SaCheckPermission("system:ossConfig:add") @Log(title = "对象存储配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -72,7 +72,7 @@ public class SysOssConfigController extends BaseController { /** * 修改对象存储配置 */ - //@SaCheckPermission("system:ossConfig:edit") + @SaCheckPermission("system:ossConfig:edit") @Log(title = "对象存储配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -85,7 +85,7 @@ public class SysOssConfigController extends BaseController { * * @param ossConfigIds OSS配置ID串 */ - //@SaCheckPermission("system:ossConfig:remove") + @SaCheckPermission("system:ossConfig:remove") @Log(title = "对象存储配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ossConfigIds}") public R remove(@NotEmpty(message = "主键不能为空") @@ -96,7 +96,7 @@ public class SysOssConfigController extends BaseController { /** * 状态修改 */ - //@SaCheckPermission("system:ossConfig:edit") + @SaCheckPermission("system:ossConfig:edit") @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysOssConfigBo bo) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index dceb091a..79c46895 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.file.MimeTypeUtils; import org.dromara.common.core.validate.QueryGroup; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; @@ -47,7 +48,7 @@ public class SysOssController extends BaseController { /** * 查询OSS对象存储列表 */ - //@SaCheckPermission("system:oss:list") + @SaCheckPermission("system:oss:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { return ossService.queryPageList(bo, pageQuery); @@ -55,10 +56,11 @@ public class SysOssController extends BaseController { /** * 查询OSS对象基于id串 + *

业务附件回显广泛使用，仅需登录；全量列表见 /list 的 system:oss:list。

* * @param ossIds OSS对象ID串 */ - //@SaCheckPermission("system:oss:query") + @SaCheckPermission("system:oss:query") @GetMapping("/listByIds/{ossIds}") public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable("ossIds") Long[] ossIds) { List list = ossService.listByIds(Arrays.asList(ossIds)); @@ -67,16 +69,32 @@ public class SysOssController extends BaseController { /** * 上传OSS对象存储 + *

请假/宿检等业务共用此接口，不能强制 system:oss:upload；已在 Service 做扩展名白名单。

* * @param file 文件 */ - //@SaCheckPermission("system:oss:upload") + @SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R upload(@RequestPart("file") MultipartFile file) { if (ObjectUtil.isNull(file)) { return R.fail("上传文件不能为空"); } + String originalName = file.getOriginalFilename(); + if (StringUtils.isBlank(originalName) || !originalName.contains(".")) { + return R.fail("文件名非法，缺少扩展名"); + } + String ext = originalName.substring(originalName.lastIndexOf('.') + 1).toLowerCase(); + boolean allowed = false; + for (String a : MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION) { + if (a.equalsIgnoreCase(ext)) { + allowed = true; + break; + } + } + if (!allowed) { + return R.fail("不允许的文件类型: " + ext); + } SysOssVo oss = ossService.upload(file); SysOssUploadVo uploadVo = new SysOssUploadVo(); uploadVo.setUrl(oss.getUrl()); @@ -92,7 +110,7 @@ public class SysOssController extends BaseController { * @param ossId 文件ID * @param response HTTP响应对象 */ - //@SaCheckPermission("system:oss:download") + @SaCheckPermission("system:oss:download") @GetMapping("/download/{ossId}") public void secureDownload(@PathVariable("ossId") Long ossId, HttpServletResponse response) { try { @@ -115,7 +133,7 @@ public class SysOssController extends BaseController { * @param ossId 文件ID * @return 安全访问URL */ - //@SaCheckPermission("system:oss:access") + @SaCheckPermission("system:oss:access") @GetMapping("/secure-url/{ossId}") public R getSecureFileUrl(@PathVariable("ossId") Long ossId) { try { @@ -152,7 +170,7 @@ public class SysOssController extends BaseController { * * @param ossIds OSS对象ID串 */ - //@SaCheckPermission("system:oss:remove") + @SaCheckPermission("system:oss:remove") @Log(title = "OSS对象存储", businessType = BusinessType.DELETE) @DeleteMapping("/{ossIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ossIds") Long[] ossIds) { @@ -163,7 +181,7 @@ public class SysOssController extends BaseController { * 🚀 获取文件缓存统计信息 * 包含缓存大小、命中率、缓存条目数量等统计信息 */ - //@SaCheckPermission("system:oss:cache:stats") + @SaCheckPermission("system:oss:cache:stats") @GetMapping("/cache/stats") public R> getCacheStats() { Map stats = ossService.getCacheStats(); @@ -174,7 +192,7 @@ public class SysOssController extends BaseController { * 🚀 清空文件缓存 * 清除所有缓存的文件数据，释放内存空间 */ - //@SaCheckPermission("system:oss:cache:clear") + @SaCheckPermission("system:oss:cache:clear") @Log(title = "文件缓存管理", businessType = BusinessType.DELETE) @DeleteMapping("/cache/clear") public R clearCache() { @@ -188,7 +206,7 @@ public class SysOssController extends BaseController { * * @param ossId 文件ID */ - //@SaCheckPermission("system:oss:cache:remove") + @SaCheckPermission("system:oss:cache:remove") @Log(title = "文件缓存管理", businessType = BusinessType.DELETE) @DeleteMapping("/cache/{ossId}") public R removeFromCache(@PathVariable("ossId") Long ossId) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index e15f28cd..0130aa78 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -37,7 +37,7 @@ public class SysPostController extends BaseController { /** * 获取岗位列表 */ - //@SaCheckPermission("system:post:list") + @SaCheckPermission("system:post:list") @GetMapping("/list") public TableDataInfo list(SysPostBo post, PageQuery pageQuery) { return postService.selectPagePostList(post, pageQuery); @@ -47,7 +47,7 @@ public class SysPostController extends BaseController { * 导出岗位列表 */ @Log(title = "岗位管理", businessType = BusinessType.EXPORT) - //@SaCheckPermission("system:post:export") + @SaCheckPermission("system:post:export") @PostMapping("/export") public void export(SysPostBo post, HttpServletResponse response) { List list = postService.selectPostList(post); @@ -59,7 +59,7 @@ public class SysPostController extends BaseController { * * @param postId 岗位ID */ - //@SaCheckPermission("system:post:query") + @SaCheckPermission("system:post:query") @GetMapping(value = "/{postId}") public R getInfo(@PathVariable("postId") Long postId) { return R.ok(postService.selectPostById(postId)); @@ -68,7 +68,7 @@ public class SysPostController extends BaseController { /** * 新增岗位 */ - //@SaCheckPermission("system:post:add") + @SaCheckPermission("system:post:add") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysPostBo post) { @@ -83,7 +83,7 @@ public class SysPostController extends BaseController { /** * 修改岗位 */ - //@SaCheckPermission("system:post:edit") + @SaCheckPermission("system:post:edit") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysPostBo post) { @@ -103,7 +103,7 @@ public class SysPostController extends BaseController { * * @param postIds 岗位ID串 */ - //@SaCheckPermission("system:post:remove") + @SaCheckPermission("system:post:remove") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") public R remove(@PathVariable("postIds") Long[] postIds) { @@ -116,7 +116,7 @@ public class SysPostController extends BaseController { * @param postIds 岗位ID串 * @param deptId 部门id */ - //@SaCheckPermission("system:post:query") + @SaCheckPermission("system:post:query") @GetMapping("/optionselect") public R> optionselect(@RequestParam(value = "postIds", required = false) Long[] postIds, @RequestParam(value = "deptId", required = false) Long deptId) { List list = new ArrayList<>(); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index eab93199..2eea8a01 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -43,7 +43,7 @@ public class SysRoleController extends BaseController { /** * 获取角色信息列表 */ - //@SaCheckPermission("system:role:list") + @SaCheckPermission("system:role:list") @GetMapping("/list") public TableDataInfo list(SysRoleBo role, PageQuery pageQuery) { return roleService.selectPageRoleList(role, pageQuery); @@ -53,7 +53,7 @@ public class SysRoleController extends BaseController { * 导出角色信息列表 */ @Log(title = "角色管理", businessType = BusinessType.EXPORT) - //@SaCheckPermission("system:role:export") + @SaCheckPermission("system:role:export") @PostMapping("/export") public void export(SysRoleBo role, HttpServletResponse response) { List list = roleService.selectRoleList(role); @@ -65,7 +65,7 @@ public class SysRoleController extends BaseController { * * @param roleId 角色ID */ - //@SaCheckPermission("system:role:query") + @SaCheckPermission("system:role:query") @GetMapping(value = "/{roleId}") public R getInfo(@PathVariable("roleId") Long roleId) { roleService.checkRoleDataScope(roleId); @@ -75,7 +75,7 @@ public class SysRoleController extends BaseController { /** * 新增角色 */ - //@SaCheckPermission("system:role:add") + @SaCheckPermission("system:role:add") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysRoleBo role) { @@ -92,7 +92,7 @@ public class SysRoleController extends BaseController { /** * 修改保存角色 */ - //@SaCheckPermission("system:role:edit") + @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysRoleBo role) { @@ -114,7 +114,7 @@ public class SysRoleController extends BaseController { /** * 修改保存数据权限 */ - //@SaCheckPermission("system:role:edit") + @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") public R dataScope(@RequestBody SysRoleBo role) { @@ -126,7 +126,7 @@ public class SysRoleController extends BaseController { /** * 状态修改 */ - //@SaCheckPermission("system:role:edit") + @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysRoleBo role) { @@ -140,7 +140,7 @@ public class SysRoleController extends BaseController { * * @param roleIds 角色ID串 */ - //@SaCheckPermission("system:role:remove") + @SaCheckPermission("system:role:remove") @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") public R remove(@PathVariable("roleIds") Long[] roleIds) { @@ -152,7 +152,7 @@ public class SysRoleController extends BaseController { * * @param roleIds 角色ID串 */ - //@SaCheckPermission("system:role:query") + @SaCheckPermission("system:role:query") @GetMapping("/optionselect") public R> optionselect(@RequestParam(value = "roleIds", required = false) Long[] roleIds) { return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds))); @@ -161,7 +161,7 @@ public class SysRoleController extends BaseController { /** * 查询已分配用户角色列表 */ - //@SaCheckPermission("system:role:list") + @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") public TableDataInfo allocatedList(SysUserBo user, PageQuery pageQuery) { return userService.selectAllocatedList(user, pageQuery); @@ -170,7 +170,7 @@ public class SysRoleController extends BaseController { /** * 查询未分配用户角色列表 */ - //@SaCheckPermission("system:role:list") + @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") public TableDataInfo unallocatedList(SysUserBo user, PageQuery pageQuery) { return userService.selectUnallocatedList(user, pageQuery); @@ -179,7 +179,7 @@ public class SysRoleController extends BaseController { /** * 取消授权用户 */ - //@SaCheckPermission("system:role:edit") + @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") public R cancelAuthUser(@RequestBody SysUserRole userRole) { @@ -192,7 +192,7 @@ public class SysRoleController extends BaseController { * @param roleId 角色ID * @param userIds 用户ID串 */ - //@SaCheckPermission("system:role:edit") + @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") public R cancelAuthUserAll(@RequestParam("roleId") Long roleId, @RequestParam("userIds") Long[] userIds) { @@ -205,7 +205,7 @@ public class SysRoleController extends BaseController { * @param roleId 角色ID * @param userIds 用户ID串 */ - //@SaCheckPermission("system:role:edit") + @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") public R selectAuthUserAll(@RequestParam("roleId") Long roleId, @RequestParam("userIds") Long[] userIds) { @@ -218,7 +218,7 @@ public class SysRoleController extends BaseController { * * @param roleId 角色ID */ - //@SaCheckPermission("system:role:list") + @SaCheckPermission("system:role:list") @GetMapping(value = "/deptTree/{roleId}") public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { DeptTreeSelectVo selectVo = new DeptTreeSelectVo( diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java index a861c1fb..58e653ee 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java @@ -48,7 +48,7 @@ public class SysTenantController extends BaseController { * 查询租户列表 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:list") + @SaCheckPermission("system:tenant:list") @GetMapping("/list") public TableDataInfo list(SysTenantBo bo, PageQuery pageQuery) { return tenantService.queryPageList(bo, pageQuery); @@ -58,7 +58,7 @@ public class SysTenantController extends BaseController { * 导出租户列表 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:export") + @SaCheckPermission("system:tenant:export") @Log(title = "租户管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysTenantBo bo, HttpServletResponse response) { @@ -72,7 +72,7 @@ public class SysTenantController extends BaseController { * @param id 主键 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:query") + @SaCheckPermission("system:tenant:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -84,7 +84,7 @@ public class SysTenantController extends BaseController { */ @ApiEncrypt @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:add") + @SaCheckPermission("system:tenant:add") @Log(title = "租户管理", businessType = BusinessType.INSERT) @Lock4j @RepeatSubmit() @@ -100,7 +100,7 @@ public class SysTenantController extends BaseController { * 修改租户 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:edit") + @SaCheckPermission("system:tenant:edit") @Log(title = "租户管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -116,7 +116,7 @@ public class SysTenantController extends BaseController { * 状态修改 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:edit") + @SaCheckPermission("system:tenant:edit") @Log(title = "租户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysTenantBo bo) { @@ -130,7 +130,7 @@ public class SysTenantController extends BaseController { * @param ids 主键串 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:remove") + @SaCheckPermission("system:tenant:remove") @Log(title = "租户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -168,7 +168,7 @@ public class SysTenantController extends BaseController { * @param packageId 套餐id */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenant:edit") + @SaCheckPermission("system:tenant:edit") @Log(title = "租户管理", businessType = BusinessType.UPDATE) @GetMapping("/syncTenantPackage") public R syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java index 8fbe2f75..f2a80b06 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java @@ -44,7 +44,7 @@ public class SysTenantPackageController extends BaseController { * 查询租户套餐列表 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:list") + @SaCheckPermission("system:tenantPackage:list") @GetMapping("/list") public TableDataInfo list(SysTenantPackageBo bo, PageQuery pageQuery) { return tenantPackageService.queryPageList(bo, pageQuery); @@ -54,7 +54,7 @@ public class SysTenantPackageController extends BaseController { * 查询租户套餐下拉选列表 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:list") + @SaCheckPermission("system:tenantPackage:list") @GetMapping("/selectList") public R> selectList() { return R.ok(tenantPackageService.selectList()); @@ -64,7 +64,7 @@ public class SysTenantPackageController extends BaseController { * 导出租户套餐列表 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:export") + @SaCheckPermission("system:tenantPackage:export") @Log(title = "租户套餐", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysTenantPackageBo bo, HttpServletResponse response) { @@ -78,7 +78,7 @@ public class SysTenantPackageController extends BaseController { * @param packageId 主键 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:query") + @SaCheckPermission("system:tenantPackage:query") @GetMapping("/{packageId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("packageId") Long packageId) { @@ -89,7 +89,7 @@ public class SysTenantPackageController extends BaseController { * 新增租户套餐 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:add") + @SaCheckPermission("system:tenantPackage:add") @Log(title = "租户套餐", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -104,7 +104,7 @@ public class SysTenantPackageController extends BaseController { * 修改租户套餐 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:edit") + @SaCheckPermission("system:tenantPackage:edit") @Log(title = "租户套餐", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -119,7 +119,7 @@ public class SysTenantPackageController extends BaseController { * 状态修改 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:edit") + @SaCheckPermission("system:tenantPackage:edit") @Log(title = "租户套餐", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysTenantPackageBo bo) { @@ -132,7 +132,7 @@ public class SysTenantPackageController extends BaseController { * @param packageIds 主键串 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - //@SaCheckPermission("system:tenantPackage:remove") + @SaCheckPermission("system:tenantPackage:remove") @Log(title = "租户套餐", businessType = BusinessType.DELETE) @DeleteMapping("/{packageIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index b5d1090d..0b6c9d83 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -59,7 +59,7 @@ public class SysUserController extends BaseController { /** * 获取用户列表 */ - //@SaCheckPermission("system:user:list") + @SaCheckPermission("system:user:list") @GetMapping("/list") public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { return userService.selectPageUserList(user, pageQuery); @@ -68,7 +68,7 @@ public class SysUserController extends BaseController { /** * 获取用户列表 通过or条件查询 */ - //@SaCheckPermission("system:user:list") + @SaCheckPermission("system:user:list") @GetMapping("/listByOr") public TableDataInfo listByOr(SysUserBo user, PageQuery pageQuery) { return userService.selectPageUserListByOr(user, pageQuery); @@ -78,7 +78,7 @@ public class SysUserController extends BaseController { * 导出用户列表 */ @Log(title = "用户管理", businessType = BusinessType.EXPORT) - //@SaCheckPermission("system:user:export") + @SaCheckPermission("system:user:export") @PostMapping("/export") public void export(SysUserBo user, HttpServletResponse response) { List list = userService.selectUserExportList(user); @@ -92,7 +92,7 @@ public class SysUserController extends BaseController { * @param updateSupport 是否更新已存在数据 */ @Log(title = "用户管理", businessType = BusinessType.IMPORT) - //@SaCheckPermission("system:user:import") + @SaCheckPermission("system:user:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, @@ -136,7 +136,7 @@ public class SysUserController extends BaseController { * * @param userId 用户ID */ - //@SaCheckPermission("system:user:query") + @SaCheckPermission("system:user:query") @GetMapping(value = { "/", "/{userId}" }) public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { SysUserInfoVo userInfoVo = new SysUserInfoVo(); @@ -164,7 +164,7 @@ public class SysUserController extends BaseController { /** * 新增用户 */ - //@SaCheckPermission("system:user:add") + @SaCheckPermission("system:user:add") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping public R add(@Validated @RequestBody SysUserBo user) { @@ -188,7 +188,7 @@ public class SysUserController extends BaseController { /** * 修改用户 */ - //@SaCheckPermission("system:user:edit") + @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysUserBo user) { @@ -210,7 +210,7 @@ public class SysUserController extends BaseController { * * @param userIds 角色ID串 */ - //@SaCheckPermission("system:user:remove") + @SaCheckPermission("system:user:remove") @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") public R remove(@PathVariable("userIds") Long[] userIds) { @@ -226,7 +226,7 @@ public class SysUserController extends BaseController { * @param userIds 用户ID串 * @param deptId 部门ID */ - //@SaCheckPermission("system:user:query") + @SaCheckPermission("system:user:query") @GetMapping("/optionselect") public R> optionselect(@RequestParam(value = "userIds", required = false) Long[] userIds, @RequestParam(value = "deptId", required = false) Long deptId) { @@ -237,7 +237,7 @@ public class SysUserController extends BaseController { * 重置密码 */ @ApiEncrypt - //@SaCheckPermission("system:user:resetPwd") + @SaCheckPermission("system:user:resetPwd") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") public R resetPwd(@RequestBody SysUserBo user) { @@ -250,7 +250,7 @@ public class SysUserController extends BaseController { /** * 状态修改 */ - //@SaCheckPermission("system:user:edit") + @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysUserBo user) { @@ -264,7 +264,7 @@ public class SysUserController extends BaseController { * * @param userId 用户ID */ - //@SaCheckPermission("system:user:query") + @SaCheckPermission("system:user:query") @GetMapping("/authRole/{userId}") public R authRole(@PathVariable("userId") Long userId) { userService.checkUserDataScope(userId); @@ -283,7 +283,7 @@ public class SysUserController extends BaseController { * @param userId 用户Id * @param roleIds 角色ID串 */ - //@SaCheckPermission("system:user:edit") + @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.GRANT) @PutMapping("/authRole") public R insertAuthRole(@RequestParam("userId") Long userId, @RequestParam("roleIds") Long[] roleIds) { @@ -295,7 +295,7 @@ public class SysUserController extends BaseController { /** * 获取部门树列表 */ - //@SaCheckPermission("system:user:list") + @SaCheckPermission("system:user:list") @GetMapping("/deptTree") public R>> deptTree(SysDeptBo dept) { return R.ok(deptService.selectDeptTreeList(dept)); @@ -304,7 +304,7 @@ public class SysUserController extends BaseController { /** * 获取部门下的所有用户信息 */ - //@SaCheckPermission("system:user:list") + @SaCheckPermission("system:user:list") @GetMapping("/list/dept/{deptId}") public R> listByDept(@PathVariable("deptId") @NotNull Long deptId) { return R.ok(userService.selectUserListByDept(deptId)); @@ -313,7 +313,7 @@ public class SysUserController extends BaseController { /** * 根据权限标识获取用户列表 */ - //@SaCheckPermission("system:user:list") + @SaCheckPermission("system:user:list") @GetMapping("/list-by-permission") public R> listUsersByPermission( @RequestParam("permission") String permission, diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java index ee8b6595..705fedca 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java @@ -35,7 +35,7 @@ public class SysWeChatController extends BaseController { * @param bo 配置请求参数 * @return 微信JS-SDK配置信息 */ - //@SaCheckPermission("system:wechat:config") + @SaCheckPermission("system:wechat:config") @Log(title = "微信JS-SDK配置", businessType = BusinessType.OTHER) @PostMapping("/config") public R getWeChatConfig(@Validated @RequestBody SysWeChatConfigBo bo) { @@ -56,7 +56,7 @@ public class SysWeChatController extends BaseController { * @param bo 上传请求参数 * @return 上传结果 */ - //@SaCheckPermission("system:wechat:upload") + @SaCheckPermission("system:wechat:upload") @Log(title = "微信媒体文件上传", businessType = BusinessType.OTHER) @PostMapping("/upload") public R uploadWeChatMedia(@Validated @RequestBody SysWeChatConfigBo bo) { @@ -77,7 +77,7 @@ public class SysWeChatController extends BaseController { * @param mediaId 媒体文件ID * @return 文件下载 */ - //@SaCheckPermission("system:wechat:download") + @SaCheckPermission("system:wechat:download") @Log(title = "微信媒体文件下载", businessType = BusinessType.OTHER) @GetMapping("/download") public R downloadWeChatMedia(@RequestParam("mediaId") String mediaId) { @@ -98,7 +98,7 @@ public class SysWeChatController extends BaseController { * @param code 微信授权码 * @return 用户信息 */ - //@SaCheckPermission("system:wechat:userinfo") + @SaCheckPermission("system:wechat:userinfo") @Log(title = "获取微信用户信息", businessType = BusinessType.OTHER) @GetMapping("/userinfo") public R getWeChatUserInfo(@RequestParam("code") String code) { @@ -119,7 +119,7 @@ public class SysWeChatController extends BaseController { * @param bo 支付请求参数 * @return 支付配置 */ - //@SaCheckPermission("system:wechat:pay") + @SaCheckPermission("system:wechat:pay") @Log(title = "创建微信支付订单", businessType = BusinessType.OTHER) @PostMapping("/pay/create") public R createWeChatPay(@Validated @RequestBody SysWeChatConfigBo bo) { @@ -140,7 +140,7 @@ public class SysWeChatController extends BaseController { * @param orderId 订单ID * @return 支付状态 */ - //@SaCheckPermission("system:wechat:pay") + @SaCheckPermission("system:wechat:pay") @Log(title = "查询微信支付状态", businessType = BusinessType.OTHER) @GetMapping("/pay/query") public R queryWeChatPayStatus(@RequestParam("orderId") String orderId) { @@ -161,7 +161,7 @@ public class SysWeChatController extends BaseController { * @param mediaId 微信媒体文件ID * @return OSS存储结果 */ - //@SaCheckPermission("system:wechat:downloadToOss") + @SaCheckPermission("system:wechat:downloadToOss") @Log(title = "下载微信媒体文件到OSS", businessType = BusinessType.OTHER) @GetMapping("/downloadToOss") public R downloadWeChatMediaToOss(@RequestParam("mediaId") String mediaId) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index 114ed5ca..56eed402 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -17,6 +17,7 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; +import org.dromara.common.core.utils.file.MimeTypeUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.oss.core.OssClient; @@ -52,6 +53,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.satoken.utils.LoginHelper; +import cn.dev33.satoken.stp.StpUtil; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -278,8 +280,15 @@ public class SysOssServiceImpl implements ISysOssService, OssService { @Override public SysOssVo upload(MultipartFile file) { String originalfileName = file.getOriginalFilename(); + if (StringUtils.isBlank(originalfileName) || !originalfileName.contains(".")) { + throw new ServiceException("文件名非法，缺少扩展名"); + } String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); + String ext = StringUtils.substringAfterLast(originalfileName, ".").toLowerCase(); + if (!isAllowedExtension(ext)) { + throw new ServiceException("不允许的文件类型: " + ext); + } OssClient storage = OssFactory.instance(); UploadResult uploadResult; try { @@ -291,6 +300,18 @@ public class SysOssServiceImpl implements ISysOssService, OssService { return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult); } + private boolean isAllowedExtension(String extension) { + if (StringUtils.isBlank(extension)) { + return false; + } + for (String allowed : MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION) { + if (allowed.equalsIgnoreCase(extension)) { + return true; + } + } + return false; + } + /** * 上传文件到对象存储服务，并保存文件信息到数据库 * @@ -300,11 +321,17 @@ public class SysOssServiceImpl implements ISysOssService, OssService { @Override public SysOssVo upload(File file) { String originalfileName = file.getName(); + if (StringUtils.isBlank(originalfileName) || !originalfileName.contains(".")) { + throw new ServiceException("文件名非法，缺少扩展名"); + } String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); + String ext = StringUtils.substringAfterLast(originalfileName, ".").toLowerCase(); + if (!isAllowedExtension(ext)) { + throw new ServiceException("不允许的文件类型: " + ext); + } OssClient storage = OssFactory.instance(); UploadResult uploadResult = storage.uploadSuffix(file, suffix); - // 保存文件信息 return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult); } @@ -812,7 +839,20 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * @param zipOut ZIP输出流 */ private void addFileToZip(SysOssVo sysOss, ZipOutputStream zipOut) throws IOException { - ZipEntry zipEntry = new ZipEntry(sysOss.getOriginalName()); + // 防止 Zip Slip：剥离路径分隔符，仅保留文件名 + String entryName = sysOss.getOriginalName(); + if (StringUtils.isBlank(entryName)) { + entryName = sysOss.getFileName(); + } + entryName = entryName.replace("\\", "/"); + int slash = entryName.lastIndexOf('/'); + if (slash >= 0) { + entryName = entryName.substring(slash + 1); + } + if (StringUtils.isBlank(entryName) || entryName.contains("..")) { + entryName = "file_" + sysOss.getOssId(); + } + ZipEntry zipEntry = new ZipEntry(entryName); zipOut.putNextEntry(zipEntry); OssClient storage = OssFactory.instance(sysOss.getService()); @@ -847,8 +887,9 @@ public class SysOssServiceImpl implements ISysOssService, OssService { } // 2. 用户身份验证：必须已登录 + Long userId; try { - Long userId = LoginHelper.getUserId(); + userId = LoginHelper.getUserId(); if (ObjectUtil.isNull(userId)) { return false; } @@ -856,22 +897,27 @@ public class SysOssServiceImpl implements ISysOssService, OssService { return false; } - // 3. 文件所有者检查：只有文件上传者可以访问 - // 可以根据业务需求调整此逻辑 - // if (ObjectUtil.isNotNull(oss.getCreateBy())) { - // Long currentUserId = LoginHelper.getUserId(); - // if (!oss.getCreateBy().equals(currentUserId)) { - // // 如果不是文件所有者，检查是否有超级管理员权限 - // if (!LoginHelper.isSuperAdmin()) { - // return false; - // } - // } - // } + // 3. 超级管理员 + if (LoginHelper.isSuperAdmin()) { + return true; + } - // 4. 业务权限检查（可根据具体业务需求扩展） - // 例如：检查用户是否有访问该文件所属模块的权限 - // 这里可以添加更复杂的业务逻辑 + // 4. 文件所有者 + if (ObjectUtil.isNotNull(oss.getCreateBy()) && oss.getCreateBy().equals(userId)) { + return true; + } + // 5. 具备 OSS 管理/下载类权限的用户 + if (StpUtil.hasPermission("system:oss:download") + || StpUtil.hasPermission("system:oss:list") + || StpUtil.hasPermission("system:oss:query") + || StpUtil.hasPermission("system:oss:upload")) { + return true; + } + + // 6. 业务场景（请假/宿检等）：审批人需查看申请人附件。 + // 全量列表已由 system:oss:list 约束；此处允许任意已登录用户按 ossId 访问单个文件。 + // 后续应按业务单据做归属校验以消除枚举 IDOR。 return true; } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java index 61fe7453..877b72d0 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java @@ -63,7 +63,7 @@ public class XgClassMsgController extends BaseController { /** * 查询班级信息-新版列表 */ - // @SaCheckPermission("classMsg:classMsg:list") + @SaCheckPermission("classMsg:classMsg:list") @GetMapping("/list") public TableDataInfo list(XgClassMsgBo bo, PageQuery pageQuery) { // Disable the framework default ordering (create_time desc) so the service's @@ -78,7 +78,7 @@ public class XgClassMsgController extends BaseController { /** * 导出班级信息-新版列表 */ - // @SaCheckPermission("classMsg:classMsg:export") + @SaCheckPermission("classMsg:classMsg:export") @Log(title = "班级信息-新版", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgClassMsgBo bo, HttpServletResponse response) { @@ -91,7 +91,7 @@ public class XgClassMsgController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("classMsg:classMsg:query") + @SaCheckPermission("classMsg:classMsg:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgClassMsgService.queryById(id)); @@ -100,7 +100,7 @@ public class XgClassMsgController extends BaseController { /** * 新增班级信息-新版 */ - // @SaCheckPermission("classMsg:classMsg:add") + @SaCheckPermission("classMsg:classMsg:add") @Log(title = "班级信息-新版", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -111,7 +111,7 @@ public class XgClassMsgController extends BaseController { /** * 修改班级信息-新版 */ - // @SaCheckPermission("classMsg:classMsg:edit") + @SaCheckPermission("classMsg:classMsg:edit") @Log(title = "班级信息-新版", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -122,7 +122,7 @@ public class XgClassMsgController extends BaseController { /** * 更新班级状态（仅更新 classStatus） */ - // @SaCheckPermission("classMsg:classMsg:edit") + @SaCheckPermission("classMsg:classMsg:edit") @Log(title = "班级信息-新版", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/status") @@ -133,7 +133,7 @@ public class XgClassMsgController extends BaseController { /** * 批量更新班级状态（仅更新 classStatus） */ - // @SaCheckPermission("classMsg:classMsg:edit") + @SaCheckPermission("classMsg:classMsg:edit") @Log(title = "班级信息-新版", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/status/batch") @@ -144,7 +144,7 @@ public class XgClassMsgController extends BaseController { /** * 批量设置班级所在校区 */ - // @SaCheckPermission("classMsg:classMsg:edit") + @SaCheckPermission("classMsg:classMsg:edit") @Log(title = "班级信息-新版", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/campus/batch") @@ -157,7 +157,7 @@ public class XgClassMsgController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("classMsg:classMsg:remove") + @SaCheckPermission("classMsg:classMsg:remove") @Log(title = "班级信息-新版", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -167,7 +167,7 @@ public class XgClassMsgController extends BaseController { /** * 获取当前登录人作为班主任所管理的班级列表 */ - // @SaCheckPermission("classMsg:classMsg:list") + @SaCheckPermission("classMsg:classMsg:list") @GetMapping("/myClassListAsTeacher") public R> myClassListAsTeacher() { Long userId = LoginHelper.getUserId(); @@ -182,7 +182,7 @@ public class XgClassMsgController extends BaseController { /** * 下载班级信息导入模板（含字典下拉、学院-专业联动下拉） */ - // @SaCheckPermission("classMsg:classMsg:import") + @SaCheckPermission("classMsg:classMsg:import") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { try { @@ -214,7 +214,7 @@ public class XgClassMsgController extends BaseController { /** * 导入班级信息 */ - // @SaCheckPermission("classMsg:classMsg:import") + @SaCheckPermission("classMsg:classMsg:import") @Log(title = "班级信息-新版", businessType = BusinessType.IMPORT) @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file) throws Exception { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java index 4da47094..aff4d010 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java @@ -39,7 +39,7 @@ public class XgClassPosDictController extends BaseController { /** * 查询班级干部职务配置列表 */ - // @SaCheckPermission("xgClassPosDict:xgClassPosDict:list") + @SaCheckPermission("xgClassPosDict:xgClassPosDict:list") @GetMapping("/list") public TableDataInfo list(XgClassPosDictBo bo, PageQuery pageQuery) { return xgClassPosDictService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgClassPosDictController extends BaseController { /** * 导出班级干部职务配置列表 */ - // @SaCheckPermission("xgClassPosDict:xgClassPosDict:export") + @SaCheckPermission("xgClassPosDict:xgClassPosDict:export") @Log(title = "班级干部职务配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgClassPosDictBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgClassPosDictController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xgClassPosDict:xgClassPosDict:query") + @SaCheckPermission("xgClassPosDict:xgClassPosDict:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgClassPosDictService.queryById(id)); @@ -70,7 +70,7 @@ public class XgClassPosDictController extends BaseController { /** * 新增班级干部职务配置 */ - // @SaCheckPermission("xgClassPosDict:xgClassPosDict:add") + @SaCheckPermission("xgClassPosDict:xgClassPosDict:add") @Log(title = "班级干部职务配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +81,7 @@ public class XgClassPosDictController extends BaseController { /** * 修改班级干部职务配置 */ - // @SaCheckPermission("xgClassPosDict:xgClassPosDict:edit") + @SaCheckPermission("xgClassPosDict:xgClassPosDict:edit") @Log(title = "班级干部职务配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class XgClassPosDictController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("xgClassPosDict:xgClassPosDict:remove") + @SaCheckPermission("xgClassPosDict:xgClassPosDict:remove") @Log(title = "班级干部职务配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -107,7 +107,7 @@ public class XgClassPosDictController extends BaseController { * @param positionName 职务名称（非必填，支持模糊查询） * @return 有效的职务信息列表 */ - // @SaCheckPermission("xgClassPosDict:xgClassPosDict:list") + @SaCheckPermission("xgClassPosDict:xgClassPosDict:list") @GetMapping("/validPositions") public R> getValidPositions(@RequestParam(value = "positionName", required = false) String positionName) { XgClassPosDictBo bo = new XgClassPosDictBo(); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java index cc2ef981..84a7611c 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java @@ -42,7 +42,7 @@ public class XgClassPosMsgController extends BaseController { * 查询班级干部信息列表 * 增加一个参数 deptId */ - // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:list") + @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:list") @GetMapping("/list") public TableDataInfo list(XgClassPosMsgBo bo, PageQuery pageQuery, @RequestParam(value = "deptId", required = false) Long deptId) { @@ -52,7 +52,7 @@ public class XgClassPosMsgController extends BaseController { /** * 导出班级干部信息列表 */ - // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:export") + @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:export") @Log(title = "班级干部信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgClassPosMsgBo bo, HttpServletResponse response) { @@ -65,7 +65,7 @@ public class XgClassPosMsgController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:query") + @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgClassPosMsgService.queryById(id)); @@ -74,7 +74,7 @@ public class XgClassPosMsgController extends BaseController { /** * 新增班级干部信息 */ - // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:add") + @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:add") @Log(title = "班级干部信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -85,7 +85,7 @@ public class XgClassPosMsgController extends BaseController { /** * 修改班级干部信息 */ - // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit") + @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit") @Log(title = "班级干部信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -98,7 +98,7 @@ public class XgClassPosMsgController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:remove") + @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:remove") @Log(title = "班级干部信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -114,7 +114,7 @@ public class XgClassPosMsgController extends BaseController { * @param dismissalReason 离任原因 * @return 操作结果 */ - // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit") + @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit") @Log(title = "学生干部离任", businessType = BusinessType.UPDATE) @PostMapping("/dismiss/{id}") public R dismissCadre( diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java index e9ecde90..c3666fd6 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java @@ -39,7 +39,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { /** * 查询班级班主任辅导员关联列表 */ - // @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:list") + @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:list") @GetMapping("/list") public TableDataInfo list(XgClassTeacherCounselorRelBo bo, PageQuery pageQuery) { return xgClassTeacherCounselorRelService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { /** * 导出班级班主任辅导员关联列表 */ - // @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:export") + @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:export") @Log(title = "班级班主任辅导员关联", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgClassTeacherCounselorRelBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:query") + @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { /** * 新增班级班主任辅导员关联 */ - // @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:add") + @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:add") @Log(title = "班级班主任辅导员关联", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { /** * 修改班级班主任辅导员关联 */ - // @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:edit") + @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:edit") @Log(title = "班级班主任辅导员关联", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:remove") + @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:remove") @Log(title = "班级班主任辅导员关联", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java index a7b0b4c5..8628fa16 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java @@ -43,7 +43,7 @@ public class XgCollegeLeaderController extends BaseController { * 查询二级学院分管领导配置列表 */ @Operation(summary = "查询二级学院分管领导配置列表") - // @SaCheckPermission("xg:ejxyfgld:list") + @SaCheckPermission("xg:ejxyfgld:list") @GetMapping("/list") public TableDataInfo list(XgCollegeLeaderBo bo, PageQuery pageQuery) { return xgCollegeLeaderService.queryPageList(bo, pageQuery); @@ -53,7 +53,7 @@ public class XgCollegeLeaderController extends BaseController { * 根据学院ID查询分管领导列表 */ @Operation(summary = "根据学院ID查询分管领导列表") - // @SaCheckPermission("xg:ejxyfgld:list") + @SaCheckPermission("xg:ejxyfgld:list") @GetMapping("/listByCollege/{collegeId}") public R> listByCollege(@PathVariable("collegeId") Long collegeId) { List list = xgCollegeLeaderService.queryByCollegeId(collegeId); @@ -64,7 +64,7 @@ public class XgCollegeLeaderController extends BaseController { * 导出二级学院分管领导配置列表 */ @Operation(summary = "导出二级学院分管领导配置列表") - // @SaCheckPermission("xg:ejxyfgld:export") + @SaCheckPermission("xg:ejxyfgld:export") @Log(title = "二级学院分管领导配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgCollegeLeaderBo bo, HttpServletResponse response) { @@ -78,7 +78,7 @@ public class XgCollegeLeaderController extends BaseController { * @param id 主键 */ @Operation(summary = "获取二级学院分管领导配置详细信息") - // @SaCheckPermission("xg:ejxyfgld:query") + @SaCheckPermission("xg:ejxyfgld:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgCollegeLeaderService.queryById(id)); @@ -88,7 +88,7 @@ public class XgCollegeLeaderController extends BaseController { * 新增二级学院分管领导配置 */ @Operation(summary = "新增二级学院分管领导配置") - // @SaCheckPermission("xg:ejxyfgld:add") + @SaCheckPermission("xg:ejxyfgld:add") @Log(title = "二级学院分管领导配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -100,7 +100,7 @@ public class XgCollegeLeaderController extends BaseController { * 修改二级学院分管领导配置 */ @Operation(summary = "修改二级学院分管领导配置") - // @SaCheckPermission("xg:ejxyfgld:edit") + @SaCheckPermission("xg:ejxyfgld:edit") @Log(title = "二级学院分管领导配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -114,7 +114,7 @@ public class XgCollegeLeaderController extends BaseController { * @param ids 主键串 */ @Operation(summary = "删除二级学院分管领导配置") - // @SaCheckPermission("xg:ejxyfgld:remove") + @SaCheckPermission("xg:ejxyfgld:remove") @Log(title = "二级学院分管领导配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java index d587a9e3..bc41f161 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java @@ -39,7 +39,7 @@ public class XgConductScoreAuditController extends BaseController { /** * 查询操行分审核列表 */ - // @SaCheckPermission("xg:conductScoreAudit:list") + @SaCheckPermission("xg:conductScoreAudit:list") @GetMapping("/list") public TableDataInfo list(XgConductScoreAuditQueryBo bo, PageQuery pageQuery) { return xgConductScoreAuditService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XgConductScoreAuditController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xg:conductScoreAudit:query") + @SaCheckPermission("xg:conductScoreAudit:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgConductScoreAuditService.queryById(id)); @@ -59,7 +59,7 @@ public class XgConductScoreAuditController extends BaseController { /** * 审核通过 */ - // @SaCheckPermission("xg:conductScoreAudit:approve") + @SaCheckPermission("xg:conductScoreAudit:approve") @Log(title = "操行分审核", businessType = BusinessType.UPDATE) @PostMapping("/approve/{id}") public R approve(@NotNull(message = "审核ID不能为空") @PathVariable("id") Long id, @@ -70,7 +70,7 @@ public class XgConductScoreAuditController extends BaseController { /** * 审核驳回 */ - // @SaCheckPermission("xg:conductScoreAudit:reject") + @SaCheckPermission("xg:conductScoreAudit:reject") @Log(title = "操行分审核", businessType = BusinessType.UPDATE) @PostMapping("/reject/{id}") public R reject(@NotNull(message = "审核ID不能为空") @PathVariable("id") Long id, @@ -81,7 +81,7 @@ public class XgConductScoreAuditController extends BaseController { /** * 批量审核通过 */ - // @SaCheckPermission("xg:conductScoreAudit:batchApprove") + @SaCheckPermission("xg:conductScoreAudit:batchApprove") @Log(title = "操行分审核", businessType = BusinessType.UPDATE) @PostMapping("/batch-approve") public R batchApprove(@Validated @RequestBody XgConductScoreAuditBatchBo bo) { @@ -91,7 +91,7 @@ public class XgConductScoreAuditController extends BaseController { /** * 批量审核驳回 */ - // @SaCheckPermission("xg:conductScoreAudit:batchReject") + @SaCheckPermission("xg:conductScoreAudit:batchReject") @Log(title = "操行分审核", businessType = BusinessType.UPDATE) @PostMapping("/batch-reject") public R batchReject(@Validated @RequestBody XgConductScoreAuditBatchBo bo) { @@ -101,7 +101,7 @@ public class XgConductScoreAuditController extends BaseController { /** * 删除操行分审核 */ - // @SaCheckPermission("xg:conductScoreAudit:remove") + @SaCheckPermission("xg:conductScoreAudit:remove") @Log(title = "操行分审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java index 64ee8675..561fa208 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java @@ -56,7 +56,7 @@ public class XgConductScoreController extends BaseController { /** * 获取班主任负责的班级学生列表（用于录入） */ - // @SaCheckPermission("xg:conductScore:classStudents") + @SaCheckPermission("xg:conductScore:classStudents") @GetMapping("/class-students") public R classStudents( @NotNull(message = "学年不能为空") Integer academicYear, @@ -98,7 +98,7 @@ public class XgConductScoreController extends BaseController { /** * 批量录入操行分 */ - // @SaCheckPermission("xg:conductScore:batchAdd") + @SaCheckPermission("xg:conductScore:batchAdd") @RepeatSubmit() @Log(title = "学生操行分", businessType = BusinessType.INSERT) @PostMapping("/batch") @@ -109,7 +109,7 @@ public class XgConductScoreController extends BaseController { /** * 批量提交修改审核 */ - // @SaCheckPermission("xg:conductScore:batchUpdate") + @SaCheckPermission("xg:conductScore:batchUpdate") @RepeatSubmit() @Log(title = "学生操行分", businessType = BusinessType.UPDATE) @PostMapping("/batch-update") @@ -120,7 +120,7 @@ public class XgConductScoreController extends BaseController { /** * 查询学生操行分列表 */ - // @SaCheckPermission("xg:conductScore:list") + @SaCheckPermission("xg:conductScore:list") @GetMapping("/list") public TableDataInfo list(XgConductScoreQueryBo bo, PageQuery pageQuery) { return xgConductScoreService.queryPageList(bo, pageQuery); @@ -129,7 +129,7 @@ public class XgConductScoreController extends BaseController { /** * 根据组织ID查询学生操行分列表 */ - // @SaCheckPermission("xg:conductScore:list") + @SaCheckPermission("xg:conductScore:list") @PostMapping("/listByDeptId") public TableDataInfo listByDeptId(@RequestBody Map requestBody, PageQuery pageQuery) { @@ -230,7 +230,7 @@ public class XgConductScoreController extends BaseController { /** * 导出学生操行分列表 */ - // @SaCheckPermission("xg:conductScore:export") + @SaCheckPermission("xg:conductScore:export") @Log(title = "学生操行分", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(@RequestParam("requestBody") Map requestBody, HttpServletResponse response) { @@ -394,7 +394,7 @@ public class XgConductScoreController extends BaseController { /** * 查询学期平均分统计 */ - // @SaCheckPermission("xg:conductScore:semesterAverage") + @SaCheckPermission("xg:conductScore:semesterAverage") @GetMapping("/semester-average") public TableDataInfo semesterAverage( @NotNull(message = "学年不能为空") Integer academicYear, @@ -406,7 +406,7 @@ public class XgConductScoreController extends BaseController { /** * 根据部门ID查询学期平均分统计（带权限过滤） */ - // @SaCheckPermission("xg:conductScore:semesterAverage") + @SaCheckPermission("xg:conductScore:semesterAverage") @PostMapping("/semester-average-by-dept-id") public TableDataInfo semesterAverageByDeptId( @RequestBody Map requestBody) { @@ -514,7 +514,7 @@ public class XgConductScoreController extends BaseController { /** * 导出学期平均分统计 */ - // @SaCheckPermission("xg:conductScore:exportSemester") + @SaCheckPermission("xg:conductScore:exportSemester") @Log(title = "学期平均分统计", businessType = BusinessType.EXPORT) @PostMapping("/export-semester") public void exportSemester(@RequestParam("requestBody") Map requestBody, HttpServletResponse response) { @@ -696,7 +696,7 @@ public class XgConductScoreController extends BaseController { /** * 获取单个学生操行分记录详情 */ - // @SaCheckPermission("xg:conductScore:studentRecords") + @SaCheckPermission("xg:conductScore:studentRecords") @GetMapping("/student-records/{studentId}") public R getStudentRecords( @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId, @@ -707,7 +707,7 @@ public class XgConductScoreController extends BaseController { /** * 获取班级详细统计数据 */ - // @SaCheckPermission("xg:conductScore:classDetail") + @SaCheckPermission("xg:conductScore:classDetail") @GetMapping("/class-detail/{classId}") public R getClassDetail( @NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId, @@ -719,7 +719,7 @@ public class XgConductScoreController extends BaseController { /** * 修改单个操行分记录 */ - // @SaCheckPermission("xg:conductScore:update") + @SaCheckPermission("xg:conductScore:update") @RepeatSubmit() @Log(title = "学生操行分", businessType = BusinessType.UPDATE) @PutMapping("/{id}") @@ -731,7 +731,7 @@ public class XgConductScoreController extends BaseController { /** * 删除学生操行分 */ - // @SaCheckPermission("xg:conductScore:remove") + @SaCheckPermission("xg:conductScore:remove") @Log(title = "学生操行分", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -741,7 +741,7 @@ public class XgConductScoreController extends BaseController { /** * 验证录入权限 */ - // @SaCheckPermission("xg:conductScore:checkPermission") + @SaCheckPermission("xg:conductScore:checkPermission") @GetMapping("/check-permission") public R checkPermission() { return R.ok(xgConductScoreService.checkInputPermission()); @@ -750,7 +750,7 @@ public class XgConductScoreController extends BaseController { /** * 下载操行分导入模板 */ - // @SaCheckPermission("xg:conductScore:importTemplate") + @SaCheckPermission("xg:conductScore:importTemplate") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { try { @@ -778,7 +778,7 @@ public class XgConductScoreController extends BaseController { /** * 导入操行分数据 */ - // @SaCheckPermission("xg:conductScore:importData") + @SaCheckPermission("xg:conductScore:importData") @Log(title = "学生操行分", businessType = BusinessType.IMPORT) @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java index e14539b9..bbc4e010 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java @@ -43,7 +43,7 @@ public class XgDormApplicationController extends BaseController { /** * 查询学生宿舍申请单表（调宿+退宿）列表 */ - // @SaCheckPermission("dormApplication:dormApplication:list") + @SaCheckPermission("dormApplication:dormApplication:list") @GetMapping("/list") public TableDataInfo list(XgDormApplicationBo bo, PageQuery pageQuery) { return xgDormApplicationService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class XgDormApplicationController extends BaseController { /** * 获取学生选择器选项列表（支持按学号、姓名检索） */ - // @SaCheckPermission("dormApplication:dormApplication:list") + @SaCheckPermission("dormApplication:dormApplication:list") @GetMapping("/studentOptions") public TableDataInfo getStudentOptions(StudentOptionBo bo, PageQuery pageQuery) { return xgDormApplicationService.getStudentOptions(bo, pageQuery); @@ -61,7 +61,7 @@ public class XgDormApplicationController extends BaseController { /** * 导出学生宿舍申请单表（调宿+退宿）列表 */ - // @SaCheckPermission("dormApplication:dormApplication:export") + @SaCheckPermission("dormApplication:dormApplication:export") @Log(title = "学生宿舍申请单表（调宿+退宿）", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormApplicationBo bo, HttpServletResponse response) { @@ -74,7 +74,7 @@ public class XgDormApplicationController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("dormApplication:dormApplication:query") + @SaCheckPermission("dormApplication:dormApplication:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormApplicationService.queryById(id)); @@ -83,7 +83,7 @@ public class XgDormApplicationController extends BaseController { /** * 新增学生宿舍申请单表（调宿+退宿） */ - // @SaCheckPermission("dormApplication:dormApplication:add") + @SaCheckPermission("dormApplication:dormApplication:add") @Log(title = "学生宿舍申请单表（调宿+退宿）", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -95,7 +95,7 @@ public class XgDormApplicationController extends BaseController { /** * 修改学生宿舍申请单表（调宿+退宿） */ - // @SaCheckPermission("dormApplication:dormApplication:edit") + @SaCheckPermission("dormApplication:dormApplication:edit") @Log(title = "学生宿舍申请单表（调宿+退宿）", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -108,7 +108,7 @@ public class XgDormApplicationController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("dormApplication:dormApplication:remove") + @SaCheckPermission("dormApplication:dormApplication:remove") @Log(title = "学生宿舍申请单表（调宿+退宿）", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -120,7 +120,7 @@ public class XgDormApplicationController extends BaseController { * * @param collegeId 学院ID */ - // @SaCheckPermission("dormApplication:dormApplication:list") + @SaCheckPermission("dormApplication:dormApplication:list") @GetMapping("/getCollegeApprovers") public R>> getCollegeApprovers(@RequestParam("collegeId") Long collegeId) { List> approvers = xgDormApplicationService.getCollegeApprovers(collegeId); @@ -130,7 +130,7 @@ public class XgDormApplicationController extends BaseController { /** * 获取学工处审批人列表 */ - // @SaCheckPermission("dormApplication:dormApplication:list") + @SaCheckPermission("dormApplication:dormApplication:list") @GetMapping("/getStudentAffairsApprovers") public R>> getStudentAffairsApprovers() { List> approvers = xgDormApplicationService.getStudentAffairsApprovers(); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java index 869a3d8d..86aaa92b 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java @@ -40,7 +40,7 @@ public class XgDormAreaController extends BaseController { /** * 查询宿舍区信息列表 */ - // @SaCheckPermission("ssqxx:dormArea:list") + @SaCheckPermission("ssqxx:dormArea:list") @GetMapping("/list") public TableDataInfo list(XgDormAreaBo bo, PageQuery pageQuery) { return xgDormAreaService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XgDormAreaController extends BaseController { /** * 导出宿舍区信息列表 */ - // @SaCheckPermission("ssqxx:dormArea:export") + @SaCheckPermission("ssqxx:dormArea:export") @Log(title = "宿舍区信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormAreaBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XgDormAreaController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("ssqxx:dormArea:query") + @SaCheckPermission("ssqxx:dormArea:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormAreaService.queryById(id)); @@ -71,7 +71,7 @@ public class XgDormAreaController extends BaseController { /** * 新增宿舍区信息 */ - // @SaCheckPermission("ssqxx:dormArea:add") + @SaCheckPermission("ssqxx:dormArea:add") @Log(title = "宿舍区信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgDormAreaController extends BaseController { /** * 修改宿舍区信息 */ - // @SaCheckPermission("ssqxx:dormArea:edit") + @SaCheckPermission("ssqxx:dormArea:edit") @Log(title = "宿舍区信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgDormAreaController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("ssqxx:dormArea:remove") + @SaCheckPermission("ssqxx:dormArea:remove") @Log(title = "宿舍区信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -106,7 +106,7 @@ public class XgDormAreaController extends BaseController { * 获取宿舍区树形结构数据 * 以校区为根节点，宿舍区为子节点 */ - // @SaCheckPermission("ssqxx:dormArea:query") + @SaCheckPermission("ssqxx:dormArea:query") @GetMapping("/tree") public R> getAreaTree() { return R.ok(xgDormAreaService.getAreaTree()); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java index 63a65c24..6169218c 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java @@ -40,7 +40,7 @@ public class XgDormBedController extends BaseController { /** * 查询宿舍床位信息列表 */ - // @SaCheckPermission("dormbed:dormBed:list") + @SaCheckPermission("dormbed:dormBed:list") @GetMapping("/list") public TableDataInfo list(XgDormBedBo bo, PageQuery pageQuery) { return xgDormBedService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XgDormBedController extends BaseController { /** * 导出宿舍床位信息列表 */ - // @SaCheckPermission("dormbed:dormBed:export") + @SaCheckPermission("dormbed:dormBed:export") @Log(title = "宿舍床位信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormBedBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XgDormBedController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("dormbed:dormBed:query") + @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormBedService.queryById(id)); @@ -71,7 +71,7 @@ public class XgDormBedController extends BaseController { /** * 新增宿舍床位信息 */ - // @SaCheckPermission("dormbed:dormBed:add") + @SaCheckPermission("dormbed:dormBed:add") @Log(title = "宿舍床位信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgDormBedController extends BaseController { /** * 修改宿舍床位信息 */ - // @SaCheckPermission("dormbed:dormBed:edit") + @SaCheckPermission("dormbed:dormBed:edit") @Log(title = "宿舍床位信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgDormBedController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("dormbed:dormBed:remove") + @SaCheckPermission("dormbed:dormBed:remove") @Log(title = "宿舍床位信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -107,7 +107,7 @@ public class XgDormBedController extends BaseController { * * @param roomId 房间ID */ - // @SaCheckPermission("dormbed:dormBed:query") + @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/room/{roomId}") public R> getBedDetailsByRoomId(@NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId) { List list = xgDormBedService.queryBedDetailsByRoomId(roomId); @@ -119,7 +119,7 @@ public class XgDormBedController extends BaseController { * * @param roomId 房间ID */ - // @SaCheckPermission("dormbed:dormBed:query") + @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/college/room/{roomId}") public R> getBedDetailsByRoomIdForCurrentUserCollege( @NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId) { @@ -132,7 +132,7 @@ public class XgDormBedController extends BaseController { * * @param buildingId 宿舍楼ID */ - // @SaCheckPermission("dormbed:dormBed:query") + @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/building/{buildingId}") public R> getBedDetailsByBuildingId( @NotNull(message = "宿舍楼ID不能为空") @PathVariable("buildingId") Long buildingId) { @@ -146,7 +146,7 @@ public class XgDormBedController extends BaseController { * @param roomId 房间ID * @param classId 班级ID */ - // @SaCheckPermission("dormbed:dormBed:query") + @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/room/{roomId}/class/{classId}") public R> getBedDetailsByRoomIdAndClassId( @NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId, diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java index 58a24fdb..806e61af 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java @@ -44,7 +44,7 @@ public class XgDormBedStudentController extends BaseController { /** * 查询床位学生分配关系列表 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/list") public TableDataInfo list(XgDormBedStudentBo bo, PageQuery pageQuery) { return xgDormBedStudentService.queryPageList(bo, pageQuery); @@ -53,7 +53,7 @@ public class XgDormBedStudentController extends BaseController { /** * 导出床位学生分配关系列表 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:export") + @SaCheckPermission("dormBedStudent:dormBedStudent:export") @Log(title = "床位学生分配关系", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormBedStudentBo bo, HttpServletResponse response) { @@ -66,7 +66,7 @@ public class XgDormBedStudentController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:query") + @SaCheckPermission("dormBedStudent:dormBedStudent:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormBedStudentService.queryById(id)); @@ -75,7 +75,7 @@ public class XgDormBedStudentController extends BaseController { /** * 新增床位学生分配关系 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @SaCheckPermission("dormBedStudent:dormBedStudent:add") @Log(title = "床位学生分配关系", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -86,7 +86,7 @@ public class XgDormBedStudentController extends BaseController { /** * 修改床位学生分配关系 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "床位学生分配关系", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -99,7 +99,7 @@ public class XgDormBedStudentController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:remove") + @SaCheckPermission("dormBedStudent:dormBedStudent:remove") @Log(title = "床位学生分配关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -111,7 +111,7 @@ public class XgDormBedStudentController extends BaseController { * * @param bo 批量分配参数 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @SaCheckPermission("dormBedStudent:dormBedStudent:add") @Log(title = "批量分配床位给二级学院", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batchAllocate") @@ -124,7 +124,7 @@ public class XgDormBedStudentController extends BaseController { * * @param bo 批量分配给班级参数 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @SaCheckPermission("dormBedStudent:dormBedStudent:add") @Log(title = "批量分配床位给班级", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batchAllocateToClass") @@ -136,7 +136,7 @@ public class XgDormBedStudentController extends BaseController { /** * 批量收回宿舍床位 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "批量收回宿舍床位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batchRecall") @@ -147,7 +147,7 @@ public class XgDormBedStudentController extends BaseController { /** * 批量回收班级分配床位（保留学院分配） */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "批量回收班级分配床位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batchRecallClassAllocation") @@ -159,7 +159,7 @@ public class XgDormBedStudentController extends BaseController { * 获取当前用户二级学院的宿舍楼树形结构 * 校区-宿舍楼二级结构，校区不可选，只有宿舍楼可以选择 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/currentUserCollegeDormTree") public R> getCurrentUserCollegeDormBuildingTree() { List treeData = xgDormBedStudentService.getCurrentUserCollegeDormBuildingTree(); @@ -170,7 +170,7 @@ public class XgDormBedStudentController extends BaseController { * 获取班主任管理的班级宿舍楼树形结构 * 校区-宿舍楼二级结构，只显示班主任管理班级分配到的宿舍楼 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassTeacherDormTree") public R> getClassTeacherDormTree(@RequestParam(value = "classId", required = false) Long classId) { List treeData = xgDormBedStudentService.getClassTeacherDormTree(classId); @@ -180,7 +180,7 @@ public class XgDormBedStudentController extends BaseController { /** * 获取班主任管理班级的房间床位详情（带学生信息） */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassTeacherBedDetails") public R> getClassTeacherBedDetails(@RequestParam(value = "buildingId", required = false) Long buildingId, @RequestParam(value = "classId", required = false) Long classId) { @@ -191,7 +191,7 @@ public class XgDormBedStudentController extends BaseController { /** * 获取班主任管理的未分配床位学生列表 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassTeacherUnallocatedStudents") public R> getClassTeacherUnallocatedStudents(@RequestParam(value = "classId", required = false) Long classId) { List students = xgDormBedStudentService.getClassTeacherUnallocatedStudents(classId); @@ -201,7 +201,7 @@ public class XgDormBedStudentController extends BaseController { /** * 班主任一键随机分配床位 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @SaCheckPermission("dormBedStudent:dormBedStudent:add") @Log(title = "班主任随机分配床位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/classTeacherRandomAllocation") @@ -213,7 +213,7 @@ public class XgDormBedStudentController extends BaseController { /** * 班主任一键按学号分配床位 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @SaCheckPermission("dormBedStudent:dormBedStudent:add") @Log(title = "班主任按学号分配床位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/classTeacherStudentNoAllocation") @@ -225,7 +225,7 @@ public class XgDormBedStudentController extends BaseController { /** * 班主任选择性分配床位（弹窗模式） */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:add") + @SaCheckPermission("dormBedStudent:dormBedStudent:add") @Log(title = "班主任选择性分配床位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/classTeacherSelectiveAllocation") @@ -237,7 +237,7 @@ public class XgDormBedStudentController extends BaseController { /** * 班主任一键收回床位 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "班主任收回床位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherRecallBeds") @@ -249,7 +249,7 @@ public class XgDormBedStudentController extends BaseController { /** * 班主任收回选中床位 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "班主任收回选中床位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherRecallSelectedBeds") @@ -261,7 +261,7 @@ public class XgDormBedStudentController extends BaseController { /** * 班主任批量退宿 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "班主任批量退宿", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherStayawaySelectedBeds") @@ -274,7 +274,7 @@ public class XgDormBedStudentController extends BaseController { * 班主任床位互换 * 将两个学生的床位进行互换 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "班主任床位互换", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherExchangeBeds") @@ -288,7 +288,7 @@ public class XgDormBedStudentController extends BaseController { * 班主任床位移动 * 将学生从当前床位移动到指定的空闲床位 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:edit") + @SaCheckPermission("dormBedStudent:dormBedStudent:edit") @Log(title = "班主任床位移动", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherMoveBed") @@ -303,7 +303,7 @@ public class XgDormBedStudentController extends BaseController { * 包含床位信息（校区名称、宿舍区名称、楼栋名称、房间名称、床位名称） * 和学生信息（学生姓名、学号、性别） */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassOccupiedBedDetails") public R> getClassOccupiedBedDetails(@RequestParam(value = "classId", required = false) Long classId) { List occupiedBedDetails = xgDormBedStudentService.getClassOccupiedBedDetails(classId); @@ -314,7 +314,7 @@ public class XgDormBedStudentController extends BaseController { * 获取班级所有未安排学生的床位信息 * 包含床位信息（校区名称、宿舍区名称、楼栋名称、房间名称、床位名称） */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassUnoccupiedBedDetails") public R> getClassUnoccupiedBedDetails(@RequestParam(value = "classId", required = false) Long classId) { List unoccupiedBedDetails = xgDormBedStudentService.getClassUnoccupiedBedDetails(classId); @@ -325,7 +325,7 @@ public class XgDormBedStudentController extends BaseController { * 根据房间ID获取住在当前房间的所有学生信息 * 包含学生姓名、学号、性别、学院名称、专业名称、班级名称、床位编码、床位ID */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getRoomStudents") public R> getRoomStudents(@RequestParam("roomId") Long roomId) { List roomStudents = xgDormBedStudentService.getRoomStudents(roomId); @@ -336,7 +336,7 @@ public class XgDormBedStudentController extends BaseController { * 根据学生ID获取当前宿舍信息 * 包含校区、宿舍楼、房间号、床位号等信息 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/currentDormInfo/{studentId}") public R getCurrentDormInfo(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { Object currentDormInfo = xgDormBedStudentService.getCurrentDormInfo(studentId); @@ -347,7 +347,7 @@ public class XgDormBedStudentController extends BaseController { * 根据床位ID获取该床位的学生信息 * 包含学生基本信息、学院、专业、班级等信息 */ - // @SaCheckPermission("dormBedStudent:dormBedStudent:list") + @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/bedStudentInfo/{bedId}") public R getBedStudentInfo(@NotNull(message = "床位ID不能为空") @PathVariable("bedId") Long bedId) { Object bedStudentInfo = xgDormBedStudentService.getBedStudentInfo(bedId); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java index d921cd27..338b6a36 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java @@ -41,7 +41,7 @@ public class XgDormBuildingController extends BaseController { /** * 查询宿舍楼信息列表 */ - // @SaCheckPermission("sslxx:dormBuilding:list") + @SaCheckPermission("sslxx:dormBuilding:list") @GetMapping("/list") public TableDataInfo list(XgDormBuildingBo bo, PageQuery pageQuery) { return xgDormBuildingService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XgDormBuildingController extends BaseController { /** * 导出宿舍楼信息列表 */ - // @SaCheckPermission("sslxx:dormBuilding:export") + @SaCheckPermission("sslxx:dormBuilding:export") @Log(title = "宿舍楼信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormBuildingBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class XgDormBuildingController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("sslxx:dormBuilding:query") + @SaCheckPermission("sslxx:dormBuilding:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormBuildingService.queryById(id)); @@ -72,7 +72,7 @@ public class XgDormBuildingController extends BaseController { /** * 新增宿舍楼信息 */ - // @SaCheckPermission("sslxx:dormBuilding:add") + @SaCheckPermission("sslxx:dormBuilding:add") @Log(title = "宿舍楼信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class XgDormBuildingController extends BaseController { /** * 修改宿舍楼信息 */ - // @SaCheckPermission("sslxx:dormBuilding:edit") + @SaCheckPermission("sslxx:dormBuilding:edit") @Log(title = "宿舍楼信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class XgDormBuildingController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("sslxx:dormBuilding:remove") + @SaCheckPermission("sslxx:dormBuilding:remove") @Log(title = "宿舍楼信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -107,7 +107,7 @@ public class XgDormBuildingController extends BaseController { * 获取宿舍楼树形结构数据 * 校区-宿舍楼二级结构，校区不可选，只有宿舍楼可以选择 */ - // @SaCheckPermission("sslxx:dormBuilding:list") + @SaCheckPermission("sslxx:dormBuilding:list") @GetMapping("/buildingTree") public R> getBuildingTree() { List treeData = xgDormBuildingService.getBuildingTreeData(); @@ -118,7 +118,7 @@ public class XgDormBuildingController extends BaseController { * 查询宿舍楼信息简化列表 * 用于简化界面显示，隐藏宿舍区层级，直接显示校区→宿舍楼结构 */ - // @SaCheckPermission("sslxx:dormBuilding:list") + @SaCheckPermission("sslxx:dormBuilding:list") @GetMapping("/simplifiedList") public TableDataInfo getSimplifiedList(XgDormBuildingBo bo, PageQuery pageQuery) { return xgDormBuildingService.querySimplifiedPageList(bo, pageQuery); @@ -128,7 +128,7 @@ public class XgDormBuildingController extends BaseController { * 查询宿舍楼信息简化列表（不分页） * 用于下拉选择等场景 */ - // @SaCheckPermission("sslxx:dormBuilding:list") + @SaCheckPermission("sslxx:dormBuilding:list") @GetMapping("/simplifiedListAll") public R> getSimplifiedListAll(XgDormBuildingBo bo) { List list = xgDormBuildingService.querySimplifiedList(bo); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingTreeController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingTreeController.java index 1ad00397..a1cf2805 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingTreeController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingTreeController.java @@ -31,7 +31,7 @@ public class XgDormBuildingTreeController extends BaseController { * 获取宿舍楼树形结构数据 * 校区-宿舍楼二级结构，校区不可选，只有宿舍楼可以选择 */ - // @SaCheckPermission("xgss:dormBuildingTree:list") + @SaCheckPermission("xgss:dormBuildingTree:list") @GetMapping("/list") public R> getDormBuildingTree(DormBuildingTreeBo bo) { List treeData = xgDormBuildingTreeService.getSimplifiedDormBuildingTree(bo); @@ -42,7 +42,7 @@ public class XgDormBuildingTreeController extends BaseController { * 获取所有宿舍楼树形结构数据（不考虑权限） * 校区-宿舍楼二级结构，校区不可选，只有宿舍楼可以选择 */ - // @SaCheckPermission("xgss:dormBuildingTree:list") + @SaCheckPermission("xgss:dormBuildingTree:list") @GetMapping("/listAll") public R> getAllDormBuildingTree(DormBuildingTreeBo bo) { List treeData = xgDormBuildingTreeService.getAllSimplifiedDormBuildingTree(bo); @@ -54,7 +54,7 @@ public class XgDormBuildingTreeController extends BaseController { * 校区-宿舍区-宿舍楼三级结构，校区和宿舍区不可选，只有宿舍楼可以选择 * 注意：此接口仅用于特殊需求，一般情况请使用/list接口 */ - // @SaCheckPermission("xgss:dormBuildingTree:list") + @SaCheckPermission("xgss:dormBuildingTree:list") @GetMapping("/fullList") public R> getFullDormBuildingTree(DormBuildingTreeBo bo) { List treeData = xgDormBuildingTreeService.getDormBuildingTree(bo); @@ -66,7 +66,7 @@ public class XgDormBuildingTreeController extends BaseController { * 校区-宿舍区-宿舍楼三级结构，校区和宿舍区不可选，只有宿舍楼可以选择 * 注意：此接口仅用于特殊需求，一般情况请使用/listAll接口 */ - // @SaCheckPermission("xgss:dormBuildingTree:list") + @SaCheckPermission("xgss:dormBuildingTree:list") @GetMapping("/fullListAll") public R> getAllFullDormBuildingTree(DormBuildingTreeBo bo) { List treeData = xgDormBuildingTreeService.getAllDormBuildingTree(bo); @@ -77,7 +77,7 @@ public class XgDormBuildingTreeController extends BaseController { * 获取宿舍楼树形结构简化数据 * 校区-宿舍楼二级结构，隐藏宿舍区层级，校区不可选，只有宿舍楼可以选择 */ - // @SaCheckPermission("xgss:dormBuildingTree:list") + @SaCheckPermission("xgss:dormBuildingTree:list") @GetMapping("/simplifiedList") public R> getSimplifiedDormBuildingTree(DormBuildingTreeBo bo) { List treeData = xgDormBuildingTreeService.getSimplifiedDormBuildingTree(bo); @@ -88,7 +88,7 @@ public class XgDormBuildingTreeController extends BaseController { * 获取所有宿舍楼树形结构简化数据（不考虑权限） * 校区-宿舍楼二级结构，隐藏宿舍区层级，校区不可选，只有宿舍楼可以选择 */ - // @SaCheckPermission("xgss:dormBuildingTree:list") + @SaCheckPermission("xgss:dormBuildingTree:list") @GetMapping("/simplifiedListAll") public R> getAllSimplifiedDormBuildingTree(DormBuildingTreeBo bo) { List treeData = xgDormBuildingTreeService.getAllSimplifiedDormBuildingTree(bo); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java index a79b6ec9..f40f0483 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java @@ -39,7 +39,7 @@ public class XgDormCampusController extends BaseController { /** * 查询校区信息列表 */ - // @SaCheckPermission("xqxx:dormCampus:list") + @SaCheckPermission("xqxx:dormCampus:list") @GetMapping("/list") public TableDataInfo list(XgDormCampusBo bo, PageQuery pageQuery) { return xgDormCampusService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgDormCampusController extends BaseController { /** * 导出校区信息列表 */ - // @SaCheckPermission("xqxx:dormCampus:export") + @SaCheckPermission("xqxx:dormCampus:export") @Log(title = "校区信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormCampusBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgDormCampusController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xqxx:dormCampus:query") + @SaCheckPermission("xqxx:dormCampus:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class XgDormCampusController extends BaseController { /** * 新增校区信息 */ - // @SaCheckPermission("xqxx:dormCampus:add") + @SaCheckPermission("xqxx:dormCampus:add") @Log(title = "校区信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgDormCampusController extends BaseController { /** * 修改校区信息 */ - // @SaCheckPermission("xqxx:dormCampus:edit") + @SaCheckPermission("xqxx:dormCampus:edit") @Log(title = "校区信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgDormCampusController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("xqxx:dormCampus:remove") + @SaCheckPermission("xqxx:dormCampus:remove") @Log(title = "校区信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java index dda765db..a48649e2 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java @@ -42,7 +42,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 查询宿舍卫生检查列表 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:list") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:list") @GetMapping("/list") public TableDataInfo list(XgDormHygieneCheckBo bo, PageQuery pageQuery) { return xgDormHygieneCheckService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 导出宿舍卫生检查列表 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:export") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:export") @Log(title = "宿舍卫生检查", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormHygieneCheckBo bo, HttpServletResponse response) { @@ -64,7 +64,7 @@ public class XgDormHygieneCheckController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormHygieneCheckService.queryById(id)); @@ -73,7 +73,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 新增宿舍卫生检查 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:add") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:add") @Log(title = "宿舍卫生检查", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 新增宿舍卫生检查（包含学生评分数据） */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:add") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:add") @Log(title = "宿舍卫生检查", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/addWithStudentScores") @@ -95,7 +95,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 修改宿舍卫生检查 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:edit") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:edit") @Log(title = "宿舍卫生检查", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -106,7 +106,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 修改宿舍卫生检查（包含学生评分数据） */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:edit") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:edit") @Log(title = "宿舍卫生检查", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/updateWithStudentScores") @@ -119,7 +119,7 @@ public class XgDormHygieneCheckController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:remove") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:remove") @Log(title = "宿舍卫生检查", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -129,7 +129,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 导出宿舍卫生检查列表（包含学生卫生情况） */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:export") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:export") @Log(title = "宿舍卫生检查", businessType = BusinessType.EXPORT) @PostMapping("/advancedExport") public void advancedExport(XgDormHygieneCheckBo bo, HttpServletResponse response) { @@ -142,7 +142,7 @@ public class XgDormHygieneCheckController extends BaseController { * * @param studentId 学生ID */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/student/{studentId}") public R> getHygieneChecksByStudentId( @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { @@ -157,7 +157,7 @@ public class XgDormHygieneCheckController extends BaseController { * @param bo 查询条件 * @param pageQuery 分页参数 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/student/{studentId}/page") public TableDataInfo getHygieneChecksByStudentIdPage( @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId, @@ -168,7 +168,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 保存完整的宿舍卫生检查数据（包含学生评分和违纪记录） */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:add") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:add") @Log(title = "宿舍卫生检查", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/saveCompleteData") @@ -184,7 +184,7 @@ public class XgDormHygieneCheckController extends BaseController { /** * 更新完整的宿舍卫生检查数据（包含学生评分和违纪记录） */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:edit") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:edit") @Log(title = "宿舍卫生检查", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/updateCompleteData") @@ -198,7 +198,7 @@ public class XgDormHygieneCheckController extends BaseController { * @param hygieneCheckId 卫生检查ID * @return 违纪记录列表 */ - // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") + @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/getViolations/{hygieneCheckId}") public R> getViolations( @NotNull(message = "卫生检查ID不能为空") @PathVariable("hygieneCheckId") Long hygieneCheckId) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java index ab7e0cf3..e4767298 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java @@ -39,7 +39,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { /** * 查询宿舍卫生检查学生评分列表 */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:list") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:list") @GetMapping("/list") public TableDataInfo list(XgDormHygieneStudentScoreBo bo, PageQuery pageQuery) { return xgDormHygieneStudentScoreService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { /** * 导出宿舍卫生检查学生评分列表 */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:export") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:export") @Log(title = "宿舍卫生检查学生评分", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormHygieneStudentScoreBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:query") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormHygieneStudentScoreService.queryById(id)); @@ -70,7 +70,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { /** * 新增宿舍卫生检查学生评分 */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:add") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:add") @Log(title = "宿舍卫生检查学生评分", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +81,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { /** * 修改宿舍卫生检查学生评分 */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:edit") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:edit") @Log(title = "宿舍卫生检查学生评分", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:remove") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:remove") @Log(title = "宿舍卫生检查学生评分", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -106,7 +106,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { * * @param hygieneCheckId 卫生检查ID */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:query") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:query") @GetMapping("/getByCheckId/{hygieneCheckId}") public R> getByCheckId( @NotNull(message = "卫生检查ID不能为空") @PathVariable("hygieneCheckId") Long hygieneCheckId) { @@ -118,7 +118,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { * * @param hygieneCheckId 卫生检查ID */ - // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:remove") + @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:remove") @Log(title = "批量删除学生评分", businessType = BusinessType.DELETE) @DeleteMapping("/deleteByCheckId/{hygieneCheckId}") public R deleteByCheckId(@NotNull(message = "卫生检查ID不能为空") @PathVariable("hygieneCheckId") Long hygieneCheckId) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java index a694def8..89bbfee0 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java @@ -39,7 +39,7 @@ public class XgDormManagerBuildingController extends BaseController { /** * 查询管理员宿舍楼权限关系列表 */ - // @SaCheckPermission("glysslqxgx:dormManagerBuilding:list") + @SaCheckPermission("glysslqxgx:dormManagerBuilding:list") @GetMapping("/list") public TableDataInfo list(XgDormManagerBuildingBo bo, PageQuery pageQuery) { return xgDormManagerBuildingService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgDormManagerBuildingController extends BaseController { /** * 导出管理员宿舍楼权限关系列表 */ - // @SaCheckPermission("glysslqxgx:dormManagerBuilding:export") + @SaCheckPermission("glysslqxgx:dormManagerBuilding:export") @Log(title = "管理员宿舍楼权限关系", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormManagerBuildingBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgDormManagerBuildingController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("glysslqxgx:dormManagerBuilding:query") + @SaCheckPermission("glysslqxgx:dormManagerBuilding:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class XgDormManagerBuildingController extends BaseController { /** * 新增管理员宿舍楼权限关系 */ - // @SaCheckPermission("glysslqxgx:dormManagerBuilding:add") + @SaCheckPermission("glysslqxgx:dormManagerBuilding:add") @Log(title = "管理员宿舍楼权限关系", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgDormManagerBuildingController extends BaseController { /** * 修改管理员宿舍楼权限关系 */ - // @SaCheckPermission("glysslqxgx:dormManagerBuilding:edit") + @SaCheckPermission("glysslqxgx:dormManagerBuilding:edit") @Log(title = "管理员宿舍楼权限关系", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgDormManagerBuildingController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("glysslqxgx:dormManagerBuilding:remove") + @SaCheckPermission("glysslqxgx:dormManagerBuilding:remove") @Log(title = "管理员宿舍楼权限关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java index d1e296d0..56da4c06 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java @@ -40,7 +40,7 @@ public class XgDormManagerController extends BaseController { /** * 查询宿舍管理员信息列表 */ - // @SaCheckPermission("ssglyxx:dormManager:list") + @SaCheckPermission("ssglyxx:dormManager:list") @GetMapping("/list") public TableDataInfo list(XgDormManagerBo bo, PageQuery pageQuery) { return xgDormManagerService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XgDormManagerController extends BaseController { /** * 导出宿舍管理员信息列表 */ - // @SaCheckPermission("ssglyxx:dormManager:export") + @SaCheckPermission("ssglyxx:dormManager:export") @Log(title = "宿舍管理员信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormManagerBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XgDormManagerController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("ssglyxx:dormManager:query") + @SaCheckPermission("ssglyxx:dormManager:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormManagerService.queryById(id)); @@ -74,7 +74,7 @@ public class XgDormManagerController extends BaseController { * @param name 教师姓名（可选，用于模糊查询） * @param managerType 管理员类型（可选，用于查询不同类型的管理员） */ - // @SaCheckPermission("ssglyxx:dormManager:list") + @SaCheckPermission("ssglyxx:dormManager:list") @GetMapping("/teachers") public R>> listTeachers(@RequestParam(value = "name", required = false) String name, @RequestParam(value = "managerType", required = false) String managerType) { @@ -84,7 +84,7 @@ public class XgDormManagerController extends BaseController { /** * 新增宿舍管理员信息 */ - // @SaCheckPermission("ssglyxx:dormManager:add") + @SaCheckPermission("ssglyxx:dormManager:add") @Log(title = "宿舍管理员信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -95,7 +95,7 @@ public class XgDormManagerController extends BaseController { /** * 修改宿舍管理员信息 */ - // @SaCheckPermission("ssglyxx:dormManager:edit") + @SaCheckPermission("ssglyxx:dormManager:edit") @Log(title = "宿舍管理员信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -108,7 +108,7 @@ public class XgDormManagerController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("ssglyxx:dormManager:remove") + @SaCheckPermission("ssglyxx:dormManager:remove") @Log(title = "宿舍管理员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java index db3ec4a0..581ac174 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java @@ -39,7 +39,7 @@ public class XgDormManagerSourceController extends BaseController { /** * 查询管理员授权关系列表 */ - // @SaCheckPermission("glysqgx:dormManagerSource:list") + @SaCheckPermission("glysqgx:dormManagerSource:list") @GetMapping("/list") public TableDataInfo list(XgDormManagerSourceBo bo, PageQuery pageQuery) { return xgDormManagerSourceService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgDormManagerSourceController extends BaseController { /** * 导出管理员授权关系列表 */ - // @SaCheckPermission("glysqgx:dormManagerSource:export") + @SaCheckPermission("glysqgx:dormManagerSource:export") @Log(title = "管理员授权关系", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormManagerSourceBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgDormManagerSourceController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("glysqgx:dormManagerSource:query") + @SaCheckPermission("glysqgx:dormManagerSource:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormManagerSourceService.queryById(id)); @@ -70,7 +70,7 @@ public class XgDormManagerSourceController extends BaseController { /** * 新增管理员授权关系 */ - // @SaCheckPermission("glysqgx:dormManagerSource:add") + @SaCheckPermission("glysqgx:dormManagerSource:add") @Log(title = "管理员授权关系", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +81,7 @@ public class XgDormManagerSourceController extends BaseController { /** * 修改管理员授权关系 */ - // @SaCheckPermission("glysqgx:dormManagerSource:edit") + @SaCheckPermission("glysqgx:dormManagerSource:edit") @Log(title = "管理员授权关系", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class XgDormManagerSourceController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("glysqgx:dormManagerSource:remove") + @SaCheckPermission("glysqgx:dormManagerSource:remove") @Log(title = "管理员授权关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -108,7 +108,7 @@ public class XgDormManagerSourceController extends BaseController { * @param authType 授权类型(1全校级 2校区级 3宿舍区级 4楼栋级) * @param authSourceIds 授权来源ID列表 */ - // @SaCheckPermission("glysqgx:dormManagerSource:edit") + @SaCheckPermission("glysqgx:dormManagerSource:edit") @Log(title = "分配管理员数据范围", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/assignScope") @@ -125,7 +125,7 @@ public class XgDormManagerSourceController extends BaseController { * @param managerType 管理员类型(1全校级 2校区级 3宿舍区级 4楼栋级) * @return 授权范围名称（逗号分隔字符串） */ - // @SaCheckPermission("glysqgx:dormManagerSource:query") + @SaCheckPermission("glysqgx:dormManagerSource:query") @GetMapping("/getScopeNames") public R getScopeNames(@RequestParam("managerId") @NotNull(message = "管理员ID不能为空") Long managerId, @RequestParam("managerType") @NotNull(message = "管理员类型不能为空") Integer managerType) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java index c70aeba3..af51401f 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java @@ -5,6 +5,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -30,33 +31,39 @@ public class XgDormRollCallController extends BaseController { private final IXgDormRollCallService xgDormRollCallService; + @SaCheckPermission("dormRollCall:dormRollCall:list1") @GetMapping("/list") public TableDataInfo list(XgDormRollCallBo bo, PageQuery pageQuery) { return xgDormRollCallService.queryPageList(bo, pageQuery); } + @SaCheckPermission("dormRollCall:dormRollCall:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormRollCallService.queryById(id)); } + @SaCheckPermission("dormRollCall:dormRollCall:add") @PostMapping() @RepeatSubmit() public R add(@Validated(AddGroup.class) @RequestBody XgDormRollCallBo bo) { return toAjax(xgDormRollCallService.insertByBo(bo)); } + @SaCheckPermission("dormRollCall:dormRollCall:edit") @PutMapping() @RepeatSubmit() public R edit(@Validated(EditGroup.class) @RequestBody XgDormRollCallBo bo) { return toAjax(xgDormRollCallService.updateByBo(bo)); } + @SaCheckPermission("dormRollCall:dormRollCall:remove") @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormRollCallService.deleteWithValidByIds(List.of(ids), true)); } + @SaCheckPermission("dormRollCall:dormRollCall:export") @PostMapping("/export") @Log(title = "宿舍点名", businessType = BusinessType.EXPORT) public void export(XgDormRollCallBo bo, HttpServletResponse response) { @@ -64,11 +71,13 @@ public class XgDormRollCallController extends BaseController { ExcelUtil.exportExcel(list, "宿舍点名记录", XgDormRollCallVo.class, response); } + @SaCheckPermission("dormRollCall:dormRollCall:add") @GetMapping("/generateBatchNo") public R generateBatchNo() { return R.ok(xgDormRollCallService.generateBatchNo()); } + @SaCheckPermission("dormRollCall:dormRollCall:list1") @GetMapping("/buildingRoomsStatus") public R> getBuildingRoomsStatus( @RequestParam("buildingId") Long buildingId, @@ -76,6 +85,7 @@ public class XgDormRollCallController extends BaseController { return R.ok(xgDormRollCallService.getBuildingRoomsStatus(buildingId, batchNo)); } + @SaCheckPermission("dormRollCall:dormRollCall:add") @PostMapping("/submit") @RepeatSubmit() public R submit(@Validated(AddGroup.class) @RequestBody XgDormRollCallBo bo) { @@ -86,6 +96,7 @@ public class XgDormRollCallController extends BaseController { return R.fail("提交点名记录失败"); } + @SaCheckPermission("dormRollCall:dormRollCall:query") @GetMapping("/roomHistory/{roomId}") public TableDataInfo roomHistory( @NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId, diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java index ebb0f26c..337a57f7 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java @@ -41,7 +41,7 @@ public class XgDormRoomController extends BaseController { /** * 查询宿舍房间信息列表 */ - // @SaCheckPermission("xgss:dormRoom:list") + @SaCheckPermission("xgss:dormRoom:list") @GetMapping("/list") public TableDataInfo list(XgDormRoomBo bo, PageQuery pageQuery) { return xgDormRoomService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XgDormRoomController extends BaseController { /** * 查询当前用户所在学院的宿舍房间信息列表 */ - // @SaCheckPermission("xgss:dormRoom:list") + @SaCheckPermission("xgss:dormRoom:list") @GetMapping("/college/list") public TableDataInfo collegeList(XgDormRoomBo bo, PageQuery pageQuery) { return xgDormRoomService.queryPageListByCurrentUserCollege(bo, pageQuery); @@ -59,7 +59,7 @@ public class XgDormRoomController extends BaseController { /** * 查询指定班级的宿舍房间信息列表 */ - // @SaCheckPermission("xgss:dormRoom:list") + @SaCheckPermission("xgss:dormRoom:list") @GetMapping("/class/{classId}/list") public TableDataInfo classRoomList( @NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId, @@ -71,7 +71,7 @@ public class XgDormRoomController extends BaseController { /** * 导出宿舍房间信息列表 */ - // @SaCheckPermission("xgss:dormRoom:export") + @SaCheckPermission("xgss:dormRoom:export") @Log(title = "宿舍房间信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormRoomBo bo, HttpServletResponse response) { @@ -82,7 +82,7 @@ public class XgDormRoomController extends BaseController { /** * 导出住宿清单（宿舍卡片式布局） */ - // @SaCheckPermission("xgss:dormRoom:export") + @SaCheckPermission("xgss:dormRoom:export") @Log(title = "住宿清单", businessType = BusinessType.EXPORT) @PostMapping("/exportAccommodationList") public void exportAccommodationList( @@ -111,7 +111,7 @@ public class XgDormRoomController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xgss:dormRoom:query") + @SaCheckPermission("xgss:dormRoom:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormRoomService.queryById(id)); @@ -120,7 +120,7 @@ public class XgDormRoomController extends BaseController { /** * 新增宿舍房间信息 */ - // @SaCheckPermission("xgss:dormRoom:add") + @SaCheckPermission("xgss:dormRoom:add") @Log(title = "宿舍房间信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -131,7 +131,7 @@ public class XgDormRoomController extends BaseController { /** * 修改宿舍房间信息 */ - // @SaCheckPermission("xgss:dormRoom:edit") + @SaCheckPermission("xgss:dormRoom:edit") @Log(title = "宿舍房间信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -144,7 +144,7 @@ public class XgDormRoomController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("xgss:dormRoom:remove") + @SaCheckPermission("xgss:dormRoom:remove") @Log(title = "宿舍房间信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java index b4d452e7..cbefa164 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java @@ -49,7 +49,7 @@ public class XgDormViolationController extends BaseController { /** * 查询宿舍违纪记录列表 */ - // @SaCheckPermission("dormViolation:dormViolation:list") + @SaCheckPermission("dormViolation:dormViolation:list") @GetMapping("/list") public TableDataInfo list(XgDormViolationBo bo, PageQuery pageQuery) { return xgDormViolationService.queryPageList(bo, pageQuery); @@ -58,7 +58,7 @@ public class XgDormViolationController extends BaseController { /** * 导出宿舍违纪记录列表 */ - // @SaCheckPermission("dormViolation:dormViolation:export") + @SaCheckPermission("dormViolation:dormViolation:export") @Log(title = "宿舍违纪记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgDormViolationBo bo, HttpServletResponse response) { @@ -77,7 +77,7 @@ public class XgDormViolationController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("dormViolation:dormViolation:query") + @SaCheckPermission("dormViolation:dormViolation:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormViolationService.queryById(id)); @@ -86,7 +86,7 @@ public class XgDormViolationController extends BaseController { /** * 新增宿舍违纪记录 */ - // @SaCheckPermission("dormViolation:dormViolation:add") + @SaCheckPermission("dormViolation:dormViolation:add") @Log(title = "宿舍违纪记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -97,7 +97,7 @@ public class XgDormViolationController extends BaseController { /** * 修改宿舍违纪记录 */ - // @SaCheckPermission("dormViolation:dormViolation:edit") + @SaCheckPermission("dormViolation:dormViolation:edit") @Log(title = "宿舍违纪记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -110,7 +110,7 @@ public class XgDormViolationController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("dormViolation:dormViolation:remove") + @SaCheckPermission("dormViolation:dormViolation:remove") @Log(title = "宿舍违纪记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -120,7 +120,7 @@ public class XgDormViolationController extends BaseController { /** * 获取学生选择器选项列表（支持按学号、姓名检索） */ - // @SaCheckPermission("dormViolation:dormViolation:list") + @SaCheckPermission("dormViolation:dormViolation:list") @GetMapping("/studentOptions") public TableDataInfo getStudentOptions(StudentOptionBo bo, PageQuery pageQuery) { return xgDormViolationService.getStudentOptions(bo, pageQuery); @@ -131,7 +131,7 @@ public class XgDormViolationController extends BaseController { * * @param studentId 学生ID */ - // @SaCheckPermission("dormViolation:dormViolation:list") + @SaCheckPermission("dormViolation:dormViolation:list") @GetMapping("/student/{studentId}") public R getStudentById(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { return R.ok(xgDormViolationService.getStudentById(studentId)); @@ -141,7 +141,7 @@ public class XgDormViolationController extends BaseController { * 下载宿舍违纪记录导入模板 */ @Log(title = "宿舍违纪记录", businessType = BusinessType.EXPORT) - // @SaCheckPermission("dormViolation:dormViolation:import") + @SaCheckPermission("dormViolation:dormViolation:import") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { // ExcelUtil.exportExcel( @@ -195,7 +195,7 @@ public class XgDormViolationController extends BaseController { * @param updateSupport 是否更新支持，如果已存在，则进行更新数据 */ @Log(title = "宿舍违纪记录", businessType = BusinessType.IMPORT) - // @SaCheckPermission("dormViolation:dormViolation:import") + @SaCheckPermission("dormViolation:dormViolation:import") @PostMapping("/importData") public R importData(MultipartFile file, boolean updateSupport) throws Exception { List violationList = ExcelUtil.importExcel(file.getInputStream(), diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java index 69ac754d..2e9d2139 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java @@ -5,6 +5,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -41,7 +42,7 @@ public class XgHolidayStayController extends BaseController { /** * 查询假期留宿管理列表 */ - // @SaCheckPermission("holidayStay:holidayStay:list") + @SaCheckPermission("holidayStay:holidayStay:list") @GetMapping("/list") public TableDataInfo list(XgHolidayStayBo bo, PageQuery pageQuery) { return xgHolidayStayService.queryPageList(bo, pageQuery); @@ -50,7 +51,7 @@ public class XgHolidayStayController extends BaseController { /** * 导出假期留宿管理列表（可按 applyStatus 筛选） */ - // @SaCheckPermission("holidayStay:holidayStay:export") + @SaCheckPermission("holidayStay:holidayStay:export") @Log(title = "假期留宿管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgHolidayStayBo bo, HttpServletResponse response) { @@ -61,7 +62,7 @@ public class XgHolidayStayController extends BaseController { /** * 获取学生选择器选项列表（支持按学号、姓名检索） */ - // @SaCheckPermission("holidayStay:holidayStay:list") + @SaCheckPermission("holidayStay:holidayStay:list") @GetMapping("/studentOptions") public TableDataInfo getStudentOptions(StudentOptionBo bo, PageQuery pageQuery) { return xgHolidayStayService.getStudentOptions(bo, pageQuery); @@ -70,7 +71,7 @@ public class XgHolidayStayController extends BaseController { /** * 查询单人留宿有效数据 */ - // @SaCheckPermission("holidayStay:holidayStay:list") + @SaCheckPermission("holidayStay:holidayStay:list") @GetMapping("/singlePersonValidStay") public R> getSinglePersonValidStay() { return R.ok(xgHolidayStayService.querySinglePersonValidStay()); @@ -79,7 +80,7 @@ public class XgHolidayStayController extends BaseController { /** * 学生本人提交留宿申请 */ - // @SaCheckPermission("holidayStay:holidayStay:apply") + @SaCheckPermission("holidayStay:holidayStay:apply") @Log(title = "假期留宿申请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/apply") @@ -90,7 +91,7 @@ public class XgHolidayStayController extends BaseController { /** * 当前学生的申请列表 */ - // @SaCheckPermission("holidayStay:holidayStay:apply") + @SaCheckPermission("holidayStay:holidayStay:apply") @GetMapping("/myList") public TableDataInfo myList(XgHolidayStayBo bo, PageQuery pageQuery) { return xgHolidayStayService.queryMyApplyPage(bo, pageQuery); @@ -99,7 +100,7 @@ public class XgHolidayStayController extends BaseController { /** * 班主任本班申请列表 */ - // @SaCheckPermission("holidayStay:holidayStay:list1") + @SaCheckPermission("holidayStay:holidayStay:list1") @GetMapping("/teacherList") public TableDataInfo teacherList(XgHolidayStayBo bo, PageQuery pageQuery) { return xgHolidayStayService.queryTeacherPage(bo, pageQuery); @@ -108,7 +109,7 @@ public class XgHolidayStayController extends BaseController { /** * 班主任审批通过 */ - // @SaCheckPermission("holidayStay:holidayStay:audit") + @SaCheckPermission("holidayStay:holidayStay:audit") @Log(title = "假期留宿审批通过", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/approve") @@ -119,7 +120,7 @@ public class XgHolidayStayController extends BaseController { /** * 班主任驳回 */ - // @SaCheckPermission("holidayStay:holidayStay:audit") + @SaCheckPermission("holidayStay:holidayStay:audit") @Log(title = "假期留宿驳回", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/reject") @@ -130,7 +131,7 @@ public class XgHolidayStayController extends BaseController { /** * 班主任撤销已通过申请 */ - // @SaCheckPermission("holidayStay:holidayStay:revoke") + @SaCheckPermission("holidayStay:holidayStay:revoke") @Log(title = "假期留宿撤销", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/revoke") @@ -141,7 +142,7 @@ public class XgHolidayStayController extends BaseController { /** * 获取假期留宿管理详细信息 */ - // @SaCheckPermission("holidayStay:holidayStay:query") + @SaCheckPermission("holidayStay:holidayStay:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgHolidayStayService.queryById(id)); @@ -150,7 +151,7 @@ public class XgHolidayStayController extends BaseController { /** * 新增假期留宿管理（宿管登记，默认已通过） */ - // @SaCheckPermission("holidayStay:holidayStay:add") + @SaCheckPermission("holidayStay:holidayStay:add") @Log(title = "假期留宿管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -161,7 +162,7 @@ public class XgHolidayStayController extends BaseController { /** * 修改假期留宿管理 */ - // @SaCheckPermission("holidayStay:holidayStay:edit") + @SaCheckPermission("holidayStay:holidayStay:edit") @Log(title = "假期留宿管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -172,7 +173,7 @@ public class XgHolidayStayController extends BaseController { /** * 删除假期留宿管理 */ - // @SaCheckPermission("holidayStay:holidayStay:remove") + @SaCheckPermission("holidayStay:holidayStay:remove") @Log(title = "假期留宿管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java index 26e5d284..5f55335f 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java @@ -39,7 +39,7 @@ public class XgLeaveTypeConfigController extends BaseController { /** * 查询学生请假类型配置列表 */ - // @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:list") + @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:list") @GetMapping("/list") public TableDataInfo list(XgLeaveTypeConfigBo bo, PageQuery pageQuery) { return xgLeaveTypeConfigService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgLeaveTypeConfigController extends BaseController { /** * 导出学生请假类型配置列表 */ - // @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:export") + @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:export") @Log(title = "学生请假类型配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgLeaveTypeConfigBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgLeaveTypeConfigController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:query") + @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class XgLeaveTypeConfigController extends BaseController { /** * 新增学生请假类型配置 */ - // @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:add") + @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:add") @Log(title = "学生请假类型配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgLeaveTypeConfigController extends BaseController { /** * 修改学生请假类型配置 */ - // @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:edit") + @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:edit") @Log(title = "学生请假类型配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgLeaveTypeConfigController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:remove") + @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:remove") @Log(title = "学生请假类型配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java index 90638de6..b59e3e91 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java @@ -52,7 +52,7 @@ public class XgStuColBatchClassController extends BaseController { /** * 查询学生信息收集批次班级权限列表 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:list") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:list") @GetMapping("/list") public TableDataInfo list(XgStuColBatchClassBo bo, PageQuery pageQuery) { return xgStuColBatchClassService.queryPageList(bo, pageQuery); @@ -61,7 +61,7 @@ public class XgStuColBatchClassController extends BaseController { /** * 导出学生信息收集批次班级权限列表 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:export") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:export") @Log(title = "学生信息收集批次班级权限", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStuColBatchClassBo bo, HttpServletResponse response) { @@ -74,7 +74,7 @@ public class XgStuColBatchClassController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStuColBatchClassService.queryById(id)); @@ -83,7 +83,7 @@ public class XgStuColBatchClassController extends BaseController { /** * 新增学生信息收集批次班级权限 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:add") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:add") @Log(title = "学生信息收集批次班级权限", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -94,7 +94,7 @@ public class XgStuColBatchClassController extends BaseController { /** * 修改学生信息收集批次班级权限 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:edit") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:edit") @Log(title = "学生信息收集批次班级权限", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -107,7 +107,7 @@ public class XgStuColBatchClassController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:remove") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:remove") @Log(title = "学生信息收集批次班级权限", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -119,7 +119,7 @@ public class XgStuColBatchClassController extends BaseController { * * @param batchId 批次ID */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getScope/{batchId}") public R> getScope(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { try { @@ -135,7 +135,7 @@ public class XgStuColBatchClassController extends BaseController { * * @param batchId 批次ID */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getScopeDetail/{batchId}") public R> getScopeDetail(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { try { @@ -152,7 +152,7 @@ public class XgStuColBatchClassController extends BaseController { * @param batchId 批次ID * @param deptIds 授权的班级ID列表 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:setScope") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:setScope") @Log(title = "设置学生信息收集批次班级权限", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/setScope") @@ -209,7 +209,7 @@ public class XgStuColBatchClassController extends BaseController { * 查询学生可参与的批次信息 * 通过xg_student_msg、xg_stu_col_batch_class、xg_stu_col_batch三张表关联查询 */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getStudentAvailableBatches") public R>> getStudentAvailableBatches( @RequestParam(value = "batchName", required = false) String batchName) { @@ -234,7 +234,7 @@ public class XgStuColBatchClassController extends BaseController { * * @param batchName 批次名称（非必要参数） */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getTeacherRelatedBatches") public R> getTeacherRelatedBatches( @RequestParam(value = "batchName", required = false) String batchName) { @@ -265,7 +265,7 @@ public class XgStuColBatchClassController extends BaseController { * * @param batchId 批次ID */ - // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") + @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getBatchAuthScope/{batchId}") public R> getBatchAuthScope( @NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java index 655ad66a..05af4814 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java @@ -39,7 +39,7 @@ public class XgStuColBatchController extends BaseController { /** * 查询学生信息收集批次列表 */ - // @SaCheckPermission("XgStuColBatch:stuColBatch:list") + @SaCheckPermission("XgStuColBatch:stuColBatch:list") @GetMapping("/list") public TableDataInfo list(XgStuColBatchBo bo, PageQuery pageQuery) { return xgStuColBatchService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgStuColBatchController extends BaseController { /** * 导出学生信息收集批次列表 */ - // @SaCheckPermission("XgStuColBatch:stuColBatch:export") + @SaCheckPermission("XgStuColBatch:stuColBatch:export") @Log(title = "学生信息收集批次", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStuColBatchBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgStuColBatchController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("XgStuColBatch:stuColBatch:query") + @SaCheckPermission("XgStuColBatch:stuColBatch:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class XgStuColBatchController extends BaseController { /** * 新增学生信息收集批次 */ - // @SaCheckPermission("XgStuColBatch:stuColBatch:add") + @SaCheckPermission("XgStuColBatch:stuColBatch:add") @Log(title = "学生信息收集批次", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgStuColBatchController extends BaseController { /** * 修改学生信息收集批次 */ - // @SaCheckPermission("XgStuColBatch:stuColBatch:edit") + @SaCheckPermission("XgStuColBatch:stuColBatch:edit") @Log(title = "学生信息收集批次", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgStuColBatchController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("XgStuColBatch:stuColBatch:remove") + @SaCheckPermission("XgStuColBatch:stuColBatch:remove") @Log(title = "学生信息收集批次", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java index 4ec32e3b..823216ec 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java @@ -39,7 +39,7 @@ public class XgStudentCancelLeaveController extends BaseController { /** * 查询学生销假列表 */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:list") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:list") @GetMapping("/list") public TableDataInfo list(XgStudentCancelLeaveBo bo, PageQuery pageQuery) { return xgStudentCancelLeaveService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgStudentCancelLeaveController extends BaseController { /** * 导出学生销假列表 */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:export") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:export") @Log(title = "学生销假", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentCancelLeaveBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgStudentCancelLeaveController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentCancelLeaveService.queryById(id)); @@ -70,7 +70,7 @@ public class XgStudentCancelLeaveController extends BaseController { /** * 新增学生销假 */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:add") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:add") @Log(title = "学生销假", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgStudentCancelLeaveController extends BaseController { /** * 修改学生销假 */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:edit") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:edit") @Log(title = "学生销假", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgStudentCancelLeaveController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:remove") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:remove") @Log(title = "学生销假", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -107,7 +107,7 @@ public class XgStudentCancelLeaveController extends BaseController { * * @param leaveId 请假ID */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") @GetMapping("/getCancelLeaveId/{leaveId}") public R getCancelLeaveIdByLeaveId(@NotNull(message = "请假ID不能为空") @PathVariable("leaveId") Long leaveId) { Long cancelLeaveId = xgStudentCancelLeaveService.getCancelLeaveIdByLeaveId(leaveId); @@ -119,7 +119,7 @@ public class XgStudentCancelLeaveController extends BaseController { * * @param cancelLeaveId 销假ID */ - // @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") + @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") @GetMapping("/getLeaveId/{cancelLeaveId}") public R getLeaveIdByCancelLeaveId(@NotNull(message = "销假ID不能为空") @PathVariable("cancelLeaveId") Long cancelLeaveId) { Long leaveId = xgStudentCancelLeaveService.getLeaveIdByCancelLeaveId(cancelLeaveId); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java index 9b0cf2d2..58a2ae5c 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java @@ -39,7 +39,7 @@ public class XgStudentClassChangeController extends BaseController { /** * 查询学生换班级列表 */ - // @SaCheckPermission("studentMsg:studentClassChange:list") + @SaCheckPermission("studentMsg:studentClassChange:list") @GetMapping("/list") public TableDataInfo list(XgStudentClassChangeBo bo, PageQuery pageQuery) { return xgStudentClassChangeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XgStudentClassChangeController extends BaseController { /** * 导出学生换班级列表 */ - // @SaCheckPermission("studentMsg:studentClassChange:export") + @SaCheckPermission("studentMsg:studentClassChange:export") @Log(title = "学生换班级", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentClassChangeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XgStudentClassChangeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("studentMsg:studentClassChange:query") + @SaCheckPermission("studentMsg:studentClassChange:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentClassChangeService.queryById(id)); @@ -70,7 +70,7 @@ public class XgStudentClassChangeController extends BaseController { /** * 新增学生换班级 */ - // @SaCheckPermission("studentMsg:studentClassChange:add") + @SaCheckPermission("studentMsg:studentClassChange:add") @Log(title = "学生换班级", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +81,7 @@ public class XgStudentClassChangeController extends BaseController { /** * 修改学生换班级 */ - // @SaCheckPermission("studentMsg:studentClassChange:edit") + @SaCheckPermission("studentMsg:studentClassChange:edit") @Log(title = "学生换班级", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class XgStudentClassChangeController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("studentMsg:studentClassChange:remove") + @SaCheckPermission("studentMsg:studentClassChange:remove") @Log(title = "学生换班级", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java index 1d29a862..0498dd6c 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java @@ -41,7 +41,7 @@ public class XgStudentController extends BaseController { /** * 查询学生信息管理列表 */ - // @SaCheckPermission("xg:student:list") + @SaCheckPermission("xg:student:list") @GetMapping("/list") public TableDataInfo list(XgStudentBo bo, PageQuery pageQuery) { return xgStudentService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XgStudentController extends BaseController { /** * 根据姓名搜索学生 */ - // @SaCheckPermission("xg:student:list") + @SaCheckPermission("xg:student:list") @GetMapping("/search") public R> searchByName(@RequestParam("name") String name, @RequestParam(value = "limit", defaultValue = "10") Integer limit) { @@ -61,7 +61,7 @@ public class XgStudentController extends BaseController { /** * 获取学院专业班级树形结构 */ - // @SaCheckPermission("xg:student:list") + @SaCheckPermission("xg:student:list") @GetMapping("/tree") public R> getTreeData() { List tree = xgStudentService.getTreeData(); @@ -71,7 +71,7 @@ public class XgStudentController extends BaseController { /** * 根据班级ID获取学生列表 */ - // @SaCheckPermission("xg:student:list") + @SaCheckPermission("xg:student:list") @GetMapping("/class/{classId}") public R> getStudentsByClassId(@PathVariable("classId") Long classId) { List list = xgStudentService.getStudentsByClassId(classId); @@ -81,7 +81,7 @@ public class XgStudentController extends BaseController { /** * 导出学生信息管理列表 */ - // @SaCheckPermission("xg:student:export") + @SaCheckPermission("xg:student:export") @Log(title = "学生信息管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentBo bo, HttpServletResponse response) { @@ -92,7 +92,7 @@ public class XgStudentController extends BaseController { /** * 获取学生信息管理详细信息 */ - // @SaCheckPermission("xg:student:query") + @SaCheckPermission("xg:student:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -102,7 +102,7 @@ public class XgStudentController extends BaseController { /** * 新增学生信息管理 */ - // @SaCheckPermission("xg:student:add") + @SaCheckPermission("xg:student:add") @Log(title = "学生信息管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -113,7 +113,7 @@ public class XgStudentController extends BaseController { /** * 修改学生信息管理 */ - // @SaCheckPermission("xg:student:edit") + @SaCheckPermission("xg:student:edit") @Log(title = "学生信息管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -124,7 +124,7 @@ public class XgStudentController extends BaseController { /** * 删除学生信息管理 */ - // @SaCheckPermission("xg:student:remove") + @SaCheckPermission("xg:student:remove") @Log(title = "学生信息管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java index 9aaa4bee..9ae78094 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java @@ -34,7 +34,7 @@ public class XgStudentDynamicsController extends BaseController { /** * 查询宿管员权限内的学生调宿退宿申请列表 */ - // @SaCheckPermission("studentDynamics:dormApplication:list") + @SaCheckPermission("studentDynamics:dormApplication:list") @GetMapping("/dormApplicationList") public TableDataInfo getDormApplicationList(XgDormApplicationBo bo, PageQuery pageQuery) { return xgStudentDynamicsService.queryDormApplicationPageList(bo, pageQuery); @@ -43,7 +43,7 @@ public class XgStudentDynamicsController extends BaseController { /** * 查询宿管员权限内的学生假期留宿信息列表 */ - // @SaCheckPermission("studentDynamics:holidayStay:list") + @SaCheckPermission("studentDynamics:holidayStay:list") @GetMapping("/holidayStayList") public TableDataInfo getHolidayStayList(XgHolidayStayBo bo, PageQuery pageQuery) { return xgStudentDynamicsService.queryHolidayStayPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class XgStudentDynamicsController extends BaseController { /** * 查询宿管员权限内的学生请假信息列表 */ - // @SaCheckPermission("studentDynamics:studentLeave:list") + @SaCheckPermission("studentDynamics:studentLeave:list") @GetMapping("/studentLeaveList") public TableDataInfo getStudentLeaveList(XgStudentLeaveBo bo, PageQuery pageQuery) { return xgStudentDynamicsService.queryStudentLeavePageList(bo, pageQuery); @@ -61,7 +61,7 @@ public class XgStudentDynamicsController extends BaseController { /** * 获取调宿退宿申请详细信息 */ - // @SaCheckPermission("studentDynamics:dormApplication:query") + @SaCheckPermission("studentDynamics:dormApplication:query") @GetMapping("/dormApplication/{id}") public R getDormApplicationInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentDynamicsService.queryDormApplicationById(id)); @@ -70,7 +70,7 @@ public class XgStudentDynamicsController extends BaseController { /** * 获取假期留宿详细信息 */ - // @SaCheckPermission("studentDynamics:holidayStay:query") + @SaCheckPermission("studentDynamics:holidayStay:query") @GetMapping("/holidayStay/{id}") public R getHolidayStayInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentDynamicsService.queryHolidayStayById(id)); @@ -79,7 +79,7 @@ public class XgStudentDynamicsController extends BaseController { /** * 获取学生请假详细信息 */ - // @SaCheckPermission("studentDynamics:studentLeave:query") + @SaCheckPermission("studentDynamics:studentLeave:query") @GetMapping("/studentLeave/{id}") public R getStudentLeaveInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentDynamicsService.queryStudentLeaveById(id)); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java index 267eedb1..d2a50c29 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java @@ -41,7 +41,7 @@ public class XgStudentLeaveController extends BaseController { /** * 查询学生请假 - 记录学生的请假申请、审批和销假信息列表 */ - // @SaCheckPermission("studentLeave:studentLeave:list") + @SaCheckPermission("studentLeave:studentLeave:list") @GetMapping("/list") public TableDataInfo list(XgStudentLeaveBo bo, PageQuery pageQuery) { return xgStudentLeaveService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XgStudentLeaveController extends BaseController { /** * 导出学生请假 - 记录学生的请假申请、审批和销假信息列表 */ - // @SaCheckPermission("studentLeave:studentLeave:export") + @SaCheckPermission("studentLeave:studentLeave:export") @Log(title = "学生请假 - 记录学生的请假申请、审批和销假信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentLeaveBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class XgStudentLeaveController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("studentLeave:studentLeave:query") + @SaCheckPermission("studentLeave:studentLeave:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentLeaveService.queryById(id)); @@ -72,7 +72,7 @@ public class XgStudentLeaveController extends BaseController { /** * 新增学生请假 - 记录学生的请假申请、审批和销假信息 */ - // @SaCheckPermission("studentLeave:studentLeave:add") + @SaCheckPermission("studentLeave:studentLeave:add") @Log(title = "学生请假 - 记录学生的请假申请、审批和销假信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class XgStudentLeaveController extends BaseController { /** * 修改学生请假 - 记录学生的请假申请、审批和销假信息 */ - // @SaCheckPermission("studentLeave:studentLeave:edit") + @SaCheckPermission("studentLeave:studentLeave:edit") @Log(title = "学生请假 - 记录学生的请假申请、审批和销假信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -97,7 +97,7 @@ public class XgStudentLeaveController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("studentLeave:studentLeave:remove") + @SaCheckPermission("studentLeave:studentLeave:remove") @Log(title = "学生请假 - 记录学生的请假申请、审批和销假信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -110,7 +110,7 @@ public class XgStudentLeaveController extends BaseController { * @param studentIds 学生ID列表（逗号分隔） * @param checkDate 检查日期 */ - // @SaCheckPermission("studentLeave:studentLeave:query") + @SaCheckPermission("studentLeave:studentLeave:query") @GetMapping("/queryByCheckDate") public R> queryByCheckDate( @RequestParam("studentIds") String studentIds, diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java index 5e38bcc7..199850b5 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java @@ -40,7 +40,7 @@ public class XgStudentManagerController extends BaseController { /** * 查询宿舍管理员信息列表 */ - // @SaCheckPermission("xgStudentManager:studentManager:list") + @SaCheckPermission("xgStudentManager:studentManager:list") @GetMapping("/list") public TableDataInfo list(XgStudentManagerBo bo, PageQuery pageQuery) { return xgStudentManagerService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XgStudentManagerController extends BaseController { /** * 导出宿舍管理员信息列表 */ - // @SaCheckPermission("xgStudentManager:studentManager:export") + @SaCheckPermission("xgStudentManager:studentManager:export") @Log(title = "宿舍管理员信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentManagerBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XgStudentManagerController extends BaseController { * * @param managerType 管理员类型(1 全校管理员 2 自定义管理员 3 班主任) */ - // @SaCheckPermission("xgStudentManager:studentManager:list") + @SaCheckPermission("xgStudentManager:studentManager:list") @GetMapping("/listAvailableTeachers") public R> listAvailableTeachers(@RequestParam("managerType") String managerType) { List teachers = xgStudentManagerService.queryAvailableTeachers(managerType); @@ -76,7 +76,7 @@ public class XgStudentManagerController extends BaseController { * @param name 姓名（可选，模糊查询） * @return 班主任信息列表 */ - // @SaCheckPermission("xgStudentManager:studentManager:list") + @SaCheckPermission("xgStudentManager:studentManager:list") @GetMapping("/listActiveClassTeachers") public R> listActiveClassTeachers( @RequestParam(value = "phone", required = false) String phone, @@ -92,7 +92,7 @@ public class XgStudentManagerController extends BaseController { * @param name 姓名（可选，模糊查询） * @return 班主任信息列表 */ - // @SaCheckPermission("xgStudentManager:studentManager:list") + @SaCheckPermission("xgStudentManager:studentManager:list") @GetMapping("/listAllClassTeachers") public R> listAllClassTeachers( @RequestParam(value = "phone", required = false) String phone, @@ -106,7 +106,7 @@ public class XgStudentManagerController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xgStudentManager:studentManager:query") + @SaCheckPermission("xgStudentManager:studentManager:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentManagerService.queryById(id)); @@ -115,7 +115,7 @@ public class XgStudentManagerController extends BaseController { /** * 新增宿舍管理员信息 */ - // @SaCheckPermission("xgStudentManager:studentManager:add") + @SaCheckPermission("xgStudentManager:studentManager:add") @Log(title = "宿舍管理员信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -126,7 +126,7 @@ public class XgStudentManagerController extends BaseController { /** * 修改宿舍管理员信息 */ - // @SaCheckPermission("xgStudentManager:studentManager:edit") + @SaCheckPermission("xgStudentManager:studentManager:edit") @Log(title = "宿舍管理员信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -139,7 +139,7 @@ public class XgStudentManagerController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("xgStudentManager:studentManager:remove") + @SaCheckPermission("xgStudentManager:studentManager:remove") @Log(title = "宿舍管理员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java index 44b20c57..d738af1f 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java @@ -40,7 +40,7 @@ public class XgStudentManagerSourceController extends BaseController { /** * 查询学生管理员授权关系列表 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:list") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:list") @GetMapping("/list") public TableDataInfo list(XgStudentManagerSourceBo bo, PageQuery pageQuery) { return xgStudentManagerSourceService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XgStudentManagerSourceController extends BaseController { /** * 导出学生管理员授权关系列表 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:export") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:export") @Log(title = "学生管理员授权关系", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentManagerSourceBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XgStudentManagerSourceController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentManagerSourceService.queryById(id)); @@ -71,7 +71,7 @@ public class XgStudentManagerSourceController extends BaseController { /** * 新增学生管理员授权关系 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:add") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:add") @Log(title = "学生管理员授权关系", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgStudentManagerSourceController extends BaseController { /** * 修改学生管理员授权关系 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:edit") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:edit") @Log(title = "学生管理员授权关系", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgStudentManagerSourceController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:remove") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:remove") @Log(title = "学生管理员授权关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -108,7 +108,7 @@ public class XgStudentManagerSourceController extends BaseController { * @param managerId 管理员ID * @param authSourceIds 资源ID列表 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:grantDeptAuth") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:grantDeptAuth") @Log(title = "学生管理员授权关系", businessType = BusinessType.UPDATE) @PostMapping("/grantDeptAuth") public R grantDeptAuth(@RequestParam("managerId") Long managerId, @RequestBody List authSourceIds) { @@ -122,7 +122,7 @@ public class XgStudentManagerSourceController extends BaseController { * @param managerId 管理员ID * @return 授权资源名称数组 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") @GetMapping("/authSourceNames") public R> getAuthSourceNames(@RequestParam("managerId") Long managerId) { return R.ok(xgStudentManagerSourceService.getAuthSourceNames(managerId)); @@ -133,7 +133,7 @@ public class XgStudentManagerSourceController extends BaseController { * * @return 部门树形结构列表 */ - // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") + @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") @GetMapping("/currentUserAuthTree") public R> getCurrentUserAuthTree() { return R.ok(xgStudentManagerSourceService.getCurrentUserAuthDeptTree()); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java index 83d4d149..930237bf 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java @@ -40,7 +40,7 @@ public class XgStudentMsgBatchController extends BaseController { /** * 查询学生信息批次收集列表 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:list") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:list") @GetMapping("/list") public TableDataInfo list(XgStudentMsgBatchBo bo, PageQuery pageQuery) { return xgStudentMsgBatchService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XgStudentMsgBatchController extends BaseController { /** * 导出学生信息批次收集列表 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:export") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:export") @Log(title = "学生信息批次收集", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentMsgBatchBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XgStudentMsgBatchController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentMsgBatchService.queryById(id)); @@ -71,7 +71,7 @@ public class XgStudentMsgBatchController extends BaseController { /** * 新增学生信息批次收集 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:add") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:add") @Log(title = "学生信息批次收集", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XgStudentMsgBatchController extends BaseController { /** * 修改学生信息批次收集 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:edit") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:edit") @Log(title = "学生信息批次收集", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XgStudentMsgBatchController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:remove") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:remove") @Log(title = "学生信息批次收集", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -107,7 +107,7 @@ public class XgStudentMsgBatchController extends BaseController { * * @param batchId 批次ID */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/history/{batchId}") public R> getStudentMsgHistory(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { return R.ok(xgStudentMsgBatchService.getStudentMsgHistory(batchId)); @@ -119,7 +119,7 @@ public class XgStudentMsgBatchController extends BaseController { * @param batchId 批次ID * @param userId 用户ID */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/history/{batchId}/{userId}") public R> getStudentMsgHistory(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId, @NotNull(message = "用户ID不能为空") @PathVariable("userId") Long userId) { @@ -131,7 +131,7 @@ public class XgStudentMsgBatchController extends BaseController { * * @param batchId 批次ID */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/userHistoryData/{batchId}") public R getUserHistoryData(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { return R.ok(xgStudentMsgBatchService.getUserHistoryData(batchId)); @@ -143,7 +143,7 @@ public class XgStudentMsgBatchController extends BaseController { * @param batchId 批次ID * @param userId 用户ID */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/userHistoryData/{batchId}/{userId}") public R getUserHistoryData(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId, @NotNull(message = "用户ID不能为空") @PathVariable("userId") Long userId) { @@ -153,7 +153,7 @@ public class XgStudentMsgBatchController extends BaseController { /** * 学生提交信息完善数据 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:add") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:add") @Log(title = "学生提交信息完善", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/submitStudentMsg") @@ -172,7 +172,7 @@ public class XgStudentMsgBatchController extends BaseController { * @param infoStatus 信息状态 * @param pageQuery 分页查询参数 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/listByDept") public TableDataInfo listByDeptId( @RequestParam(value = "batchId", required = true) Long batchId, @@ -193,7 +193,7 @@ public class XgStudentMsgBatchController extends BaseController { * @param userId 用户ID * @param remark 驳回原因 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:edit") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:edit") @Log(title = "驳回学生信息提交", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/rejectStudentMsg") @@ -210,7 +210,7 @@ public class XgStudentMsgBatchController extends BaseController { * @param userId 用户ID * @param remark 审核备注 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:edit") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:edit") @Log(title = "审核通过学生信息提交", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/approveStudentMsg") @@ -227,7 +227,7 @@ public class XgStudentMsgBatchController extends BaseController { * @param userId 用户ID * @return 变更详情信息 */ - // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") + @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/compareStudentMsg") public R> compareStudentMsg(@RequestParam("batchId") @NotNull(message = "批次ID不能为空") Long batchId, @RequestParam("userId") @NotNull(message = "用户ID不能为空") Long userId) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java index a93b0d12..580e48f2 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java @@ -16,6 +16,8 @@ import lombok.extern.slf4j.Slf4j; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.exception.NotPermissionException; +import cn.dev33.satoken.stp.StpUtil; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.multipart.MultipartFile; @@ -70,10 +72,25 @@ public class XgStudentMsgController extends BaseController { private final ISysUserService userService; private final ISysTenantService tenantService; + /** + * 本人可访问；查他人须具备学生信息 query 或 list 权限（防 IDOR） + */ + private void assertSelfOrStudentMsgAccess(Long targetUserId) { + Long currentUserId = LoginHelper.getUserId(); + if (targetUserId != null && Objects.equals(currentUserId, targetUserId)) { + return; + } + if (StpUtil.hasPermission("studentMsg:studentMsg:query") + || StpUtil.hasPermission("studentMsg:studentMsg:list")) { + return; + } + throw new NotPermissionException("studentMsg:studentMsg:query"); + } + /** * 查询学生信息列表 */ - // @SaCheckPermission("studentMsg:studentMsg:list") + @SaCheckPermission("studentMsg:studentMsg:list") @GetMapping("/list") public TableDataInfo list(XgStudentMsgBo bo, PageQuery pageQuery) { return xgStudentMsgService.queryPageList(bo, pageQuery); @@ -82,7 +99,7 @@ public class XgStudentMsgController extends BaseController { /** * 根据组织ID查询学生信息列表 */ - // @SaCheckPermission("studentMsg:studentMsg:list") + @SaCheckPermission("studentMsg:studentMsg:list") @PostMapping("/listByDeptId") public TableDataInfo listByDeptId(@RequestBody Map requestBody, PageQuery pageQuery) { @@ -141,7 +158,7 @@ public class XgStudentMsgController extends BaseController { * @param requestBody 高级检索条件 * @param response HTTP响应对象 */ - // @SaCheckPermission("studentMsg:studentMsg:export") + @SaCheckPermission("studentMsg:studentMsg:export") @Log(title = "学生信息", businessType = BusinessType.EXPORT) @PostMapping("/advancedSearchExport") public void advancedSearchExport(@RequestBody XgStudentMsgAdvancedSearchBo bo, HttpServletResponse response) { @@ -508,7 +525,7 @@ public class XgStudentMsgController extends BaseController { /** * 导出学生信息列表 */ - // @SaCheckPermission("studentMsg:studentMsg:export") + @SaCheckPermission("studentMsg:studentMsg:export") @Log(title = "学生信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(@RequestParam("requestBody") Map requestBody, HttpServletResponse response) { @@ -624,9 +641,8 @@ public class XgStudentMsgController extends BaseController { } /** - * 获取当前登录用户的学生信息 + * 获取当前登录用户的学生信息（仅本人，登录即可） */ - // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/currentUserInfo") public R getCurrentUserInfo() { // 获取当前登录用户ID @@ -649,7 +665,7 @@ public class XgStudentMsgController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("studentMsg:studentMsg:query") + @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentMsgService.queryById(id)); @@ -658,7 +674,7 @@ public class XgStudentMsgController extends BaseController { /** * 新增学生信息 */ - // @SaCheckPermission("studentMsg:studentMsg:add") + @SaCheckPermission("studentMsg:studentMsg:add") @Log(title = "学生信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -703,7 +719,7 @@ public class XgStudentMsgController extends BaseController { /** * 修改学生信息 */ - // @SaCheckPermission("studentMsg:studentMsg:edit") + @SaCheckPermission("studentMsg:studentMsg:edit") @Log(title = "学生信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -743,7 +759,7 @@ public class XgStudentMsgController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("studentMsg:studentMsg:remove") + @SaCheckPermission("studentMsg:studentMsg:remove") @Log(title = "学生信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -753,13 +769,14 @@ public class XgStudentMsgController extends BaseController { /** * 查询学生个人信息 * - * @param userId 用户ID，可为空，为空时使用当前登录用户ID + * @param userId 用户ID，可为空，为空时使用当前登录用户ID；查他人须具备管理权限 * @return 学生信息 */ - // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/personalInfo") public R getPersonalInfo(@RequestParam(value = "userId", required = false) Long userId) { - XgStudentMsgVo personalInfo = xgStudentMsgService.queryPersonalInfo(userId); + Long targetUserId = userId != null ? userId : LoginHelper.getUserId(); + assertSelfOrStudentMsgAccess(targetUserId); + XgStudentMsgVo personalInfo = xgStudentMsgService.queryPersonalInfo(targetUserId); if (personalInfo == null) { return R.fail("未找到学生信息"); } @@ -773,7 +790,7 @@ public class XgStudentMsgController extends BaseController { * @param name 学生姓名（模糊查询） * @return 学生信息列表 */ - // @SaCheckPermission("studentMsg:studentMsg:query") + @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/listByClassId") public R> getStudentsByClassId( @RequestParam(value = "classId", required = true) String classId, @@ -788,7 +805,7 @@ public class XgStudentMsgController extends BaseController { * @param bo 高级检索条件 * @return 学生信息分页列表 */ - // @SaCheckPermission("studentMsg:studentMsg:list") + @SaCheckPermission("studentMsg:studentMsg:list") @PostMapping("/advancedSearch") public TableDataInfo advancedSearch(@RequestBody XgStudentMsgAdvancedSearchBo bo) { log.info("接收到高级检索请求，检索条件: {}", bo); @@ -801,12 +818,11 @@ public class XgStudentMsgController extends BaseController { } /** - * 根据学生ID获取班主任ID + * 根据学生ID获取班主任ID（请假流程依赖，仅返回用户ID） * * @param studentId 学生ID * @return 班主任ID */ - // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/getClassTeacherId/{studentId}") public R getClassTeacherId(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { log.info("根据学生ID获取班主任ID - 学生ID: {}", studentId); @@ -818,12 +834,11 @@ public class XgStudentMsgController extends BaseController { } /** - * 根据学生ID获取学院请假审批人列表 + * 根据学生ID获取学院请假审批人列表（请假流程依赖，仅返回用户ID） * * @param studentId 学生ID * @return 请假审批人用户ID列表 */ - // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/getCollegeLeaveApprovers/{studentId}") public R> getCollegeLeaveApprovers(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { log.info("根据学生ID获取学院请假审批人列表 - 学生ID: {}", studentId); @@ -835,12 +850,11 @@ public class XgStudentMsgController extends BaseController { } /** - * 根据学生ID获取二级学院分管领导ID列表 + * 根据学生ID获取二级学院分管领导ID列表（请假流程依赖，仅返回用户ID） * * @param studentId 学生ID * @return 分管领导ID列表 */ - // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/getCollegeLeaders/{studentId}") public R> getCollegeLeaders(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { log.info("根据学生ID获取二级学院分管领导ID列表 - 学生ID: {}", studentId); @@ -859,7 +873,7 @@ public class XgStudentMsgController extends BaseController { * @param updateSupport 是否更新已存在数据 */ @Log(title = "学生信息", businessType = BusinessType.IMPORT) - // @SaCheckPermission("studentMsg:studentMsg:import") + @SaCheckPermission("studentMsg:studentMsg:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, String deptId, boolean updateSupport) throws Exception { @@ -1273,7 +1287,7 @@ public class XgStudentMsgController extends BaseController { /** * 批量申请床位 */ - // @SaCheckPermission("studentMsg:studentMsg:edit") + @SaCheckPermission("studentMsg:studentMsg:edit") @Log(title = "学生信息", businessType = BusinessType.UPDATE) @PostMapping("/batchApplyBed") public R batchApplyBed(@RequestBody Map requestBody) { @@ -1290,7 +1304,7 @@ public class XgStudentMsgController extends BaseController { /** * 批量取消床位 */ - // @SaCheckPermission("studentMsg:studentMsg:edit") + @SaCheckPermission("studentMsg:studentMsg:edit") @Log(title = "学生信息", businessType = BusinessType.UPDATE) @PostMapping("/batchCancelBed") public R batchCancelBed(@RequestBody Map requestBody) { @@ -1307,7 +1321,7 @@ public class XgStudentMsgController extends BaseController { /** * 获取学生信息树（二级学院下的学院、专业、班级统计信息） */ - // @SaCheckPermission("studentMsg:studentMsg:list") + @SaCheckPermission("studentMsg:studentMsg:list") @GetMapping("/getStudentTree") public R> getStudentTree(@RequestParam(value = "secondaryCollegeId", defaultValue = "101") Long secondaryCollegeId) { log.info("获取学生信息树，二级学院ID: {}", secondaryCollegeId); @@ -1318,7 +1332,7 @@ public class XgStudentMsgController extends BaseController { /** * 获取当前用户所在学院的学生信息树 */ - // @SaCheckPermission("studentMsg:studentMsg:list") + @SaCheckPermission("studentMsg:studentMsg:list") @GetMapping("/getCurrentUserStudentTree") public R> getCurrentUserStudentTree() { log.info("获取当前用户所在学院的学生信息树"); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java index 0fb3c901..1a8cb533 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java @@ -33,7 +33,7 @@ public class XgStudentStatisticsController extends BaseController { /** * 查询学生宿舍卫生检查、违纪记录统计数据 */ - // @SaCheckPermission("xg:studentStatistics:query") + @SaCheckPermission("xg:studentStatistics:query") @PostMapping("/statistics") public R getStatistics(@Validated @RequestBody XgStudentStatisticsBo bo) { return R.ok(studentStatisticsService.getStatistics(bo)); @@ -42,7 +42,7 @@ public class XgStudentStatisticsController extends BaseController { /** * 导出学生宿舍卫生检查、违纪记录统计数据 */ - // @SaCheckPermission("xg:studentStatistics:export") + @SaCheckPermission("xg:studentStatistics:export") @Log(title = "学生统计数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void exportStatistics(@Validated @RequestBody XgStudentStatisticsBo bo, @@ -53,7 +53,7 @@ public class XgStudentStatisticsController extends BaseController { /** * 获取二级学院列表 */ - // @SaCheckPermission("xg:studentStatistics:query") + @SaCheckPermission("xg:studentStatistics:query") @GetMapping("/colleges") public R> getColleges() { return R.ok(studentStatisticsService.getColleges()); @@ -62,7 +62,7 @@ public class XgStudentStatisticsController extends BaseController { /** * 根据学院ID获取专业列表 */ - // @SaCheckPermission("xg:studentStatistics:query") + @SaCheckPermission("xg:studentStatistics:query") @GetMapping("/majors/{collegeId}") public R> getMajorsByCollegeId( @NotNull(message = "学院ID不能为空") @PathVariable("collegeId") Long collegeId) { @@ -72,7 +72,7 @@ public class XgStudentStatisticsController extends BaseController { /** * 根据专业ID获取班级列表 */ - // @SaCheckPermission("xg:studentStatistics:query") + @SaCheckPermission("xg:studentStatistics:query") @GetMapping("/classes/{majorId}") public R> getClassesByMajorId( @NotNull(message = "专业ID不能为空") @PathVariable("majorId") Long majorId) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java index b62063ba..a3bb5de0 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java @@ -5,6 +5,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -39,7 +40,7 @@ public class XgStudentStatusChangeController extends BaseController { /** * 查询学生学籍异动列表 */ - // @SaCheckPermission("studentMsg:studentStatusChange:list") + @SaCheckPermission("studentMsg:studentStatusChange:list") @GetMapping("/list") public TableDataInfo list(XgStudentStatusChangeBo bo, PageQuery pageQuery) { return xgStudentStatusChangeService.queryPageList(bo, pageQuery); @@ -48,7 +49,7 @@ public class XgStudentStatusChangeController extends BaseController { /** * 导出学生学籍异动列表 */ - // @SaCheckPermission("studentMsg:studentStatusChange:export") + @SaCheckPermission("studentMsg:studentStatusChange:export") @Log(title = "学生学籍异动", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XgStudentStatusChangeBo bo, HttpServletResponse response) { @@ -61,7 +62,7 @@ public class XgStudentStatusChangeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("studentMsg:studentStatusChange:query") + @SaCheckPermission("studentMsg:studentStatusChange:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentStatusChangeService.queryById(id)); @@ -70,7 +71,7 @@ public class XgStudentStatusChangeController extends BaseController { /** * 新增学生学籍异动 */ - // @SaCheckPermission("studentMsg:studentStatusChange:add") + @SaCheckPermission("studentMsg:studentStatusChange:add") @Log(title = "学生学籍异动", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +82,7 @@ public class XgStudentStatusChangeController extends BaseController { /** * 批量新增学生学籍异动（用于前端提交多个学生的异动） */ - // @SaCheckPermission("studentMsg:studentStatusChange:add") + @SaCheckPermission("studentMsg:studentStatusChange:add") @Log(title = "学生学籍异动", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batch") @@ -106,7 +107,7 @@ public class XgStudentStatusChangeController extends BaseController { /** * 修改学生学籍异动 */ - // @SaCheckPermission("studentMsg:studentStatusChange:edit") + @SaCheckPermission("studentMsg:studentStatusChange:edit") @Log(title = "学生学籍异动", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -119,7 +120,7 @@ public class XgStudentStatusChangeController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("studentMsg:studentStatusChange:remove") + @SaCheckPermission("studentMsg:studentStatusChange:remove") @Log(title = "学生学籍异动", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java index c6aada3d..79f8be2c 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java @@ -31,7 +31,7 @@ public class XgSysDeptController { * 获取学院列表 */ @Operation(summary = "获取学院列表") - // @SaCheckPermission("xg:college:list") + @SaCheckPermission("xg:college:list") @GetMapping("/list") public R> list() { List depts = deptService.selectCollegeList(); @@ -42,7 +42,7 @@ public class XgSysDeptController { * 获取学院和专业的树结构 */ @Operation(summary = "获取学院和专业的树结构") - // @SaCheckPermission("xg:college:list") + @SaCheckPermission("xg:college:list") @GetMapping("/tree") public R> tree() { List depts = deptService.selectCollegeAndMajorTree(); @@ -53,7 +53,7 @@ public class XgSysDeptController { * 根据学院ID获取专业列表 */ @Operation(summary = "根据学院ID获取专业列表") - // @SaCheckPermission("xg:college:list") + @SaCheckPermission("xg:college:list") @GetMapping("/majors/{collegeId}") public R> majors(@PathVariable("collegeId") Long collegeId) { List depts = deptService.selectMajorListByCollegeId(collegeId); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysUserController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysUserController.java index 367883ea..9997dd5f 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysUserController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysUserController.java @@ -30,7 +30,7 @@ public class XgSysUserController extends BaseController { /** * 查询有效用户列表（教职工account_type=1） */ - // @SaCheckPermission("xg:sysUser:list") + @SaCheckPermission("xg:sysUser:list") @GetMapping("/activeList") public R> activeList() { List list = xgSysUserService.selectActiveUserList(); diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java index a9d6d499..39afed8b 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java @@ -28,10 +28,15 @@ import org.apache.poi.xssf.usermodel.XSSFRow; import java.io.ByteArrayOutputStream; import java.io.IOException; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.exception.NotPermissionException; +import cn.dev33.satoken.stp.StpUtil; +import org.dromara.common.satoken.utils.LoginHelper; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMethod; import jakarta.servlet.http.HttpServletResponse; +import java.util.Objects; + @RestController @RequestMapping("/xljk/consultation/appointment") public class XljkConsultationAppointmentController extends BaseController { @@ -40,11 +45,27 @@ public class XljkConsultationAppointmentController extends BaseController { @Autowired private IXljkConsultationAppointmentService service; + /** 本人学生可查；查他人须预约管理权限（防 IDOR） */ + private void assertSelfStudentOrAppointmentAccess(Long studentId) { + Long currentUserId = LoginHelper.getUserId(); + if (studentId != null && Objects.equals(currentUserId, studentId)) { + return; + } + if (StpUtil.hasPermission("xljk:consultationappointment:list") + || StpUtil.hasPermission("xljk:consultationappointment:query") + || StpUtil.hasPermission("xljk:consultationappointment:edit")) { + return; + } + throw new NotPermissionException("xljk:consultationappointment:query"); + } + + @SaCheckPermission("xljk:consultationappointment:list") @GetMapping("/list") public TableDataInfo list(XljkConsultationAppointmentBo bo, PageQuery pageQuery) { return service.selectPageList(bo, pageQuery); } + @SaCheckPermission("xljk:consultationappointment:query") @GetMapping("/{id}") public R get(@PathVariable("id") Long id) { log.info("查询预约记录详情，ID: {}", id); @@ -57,6 +78,7 @@ public class XljkConsultationAppointmentController extends BaseController { return R.ok(vo); } + @SaCheckPermission("xljk:consultationappointment:edit") @PostMapping public R add(@RequestBody XljkConsultationAppointmentBo bo) { boolean result = service.insert(bo); @@ -67,6 +89,7 @@ public class XljkConsultationAppointmentController extends BaseController { } } + @SaCheckPermission("xljk:consultationappointment:edit") @PutMapping public R edit(@RequestBody XljkConsultationAppointmentBo bo) { boolean result = service.update(bo); @@ -77,6 +100,7 @@ public class XljkConsultationAppointmentController extends BaseController { } } + @SaCheckPermission("xljk:consultationappointment:edit") @DeleteMapping("/{id}") public R remove(@PathVariable("id") Long id) { boolean result = service.deleteById(id); @@ -123,7 +147,7 @@ public class XljkConsultationAppointmentController extends BaseController { } /** - * 获取我的预约记录（学生用） + * 获取我的预约记录（学生用；查他人须管理权限） */ @GetMapping("/my-appointments/{studentId}") public R> getMyAppointments( @@ -131,6 +155,7 @@ public class XljkConsultationAppointmentController extends BaseController { @RequestParam(value = "force", required = false) Boolean force, HttpServletResponse response) { + assertSelfStudentOrAppointmentAccess(studentId); log.info("获取我的预约记录，studentId: {}, force: {}", studentId, force); // 添加缓存控制头，确保不被缓存 @@ -153,6 +178,7 @@ public class XljkConsultationAppointmentController extends BaseController { /** * 记录咨询结果 */ + @SaCheckPermission("xljk:consultationappointment:edit") @PostMapping("/record-consultation/{id}") public R recordConsultation( @PathVariable("id") Long id, @@ -237,6 +263,7 @@ public class XljkConsultationAppointmentController extends BaseController { /** * 获取院系选项 */ + @SaCheckPermission("xljk:consultationappointment:list") @GetMapping("/options/colleges") public R>> getCollegeOptions() { log.info("获取院系选项"); @@ -247,6 +274,7 @@ public class XljkConsultationAppointmentController extends BaseController { /** * 获取专业选项 */ + @SaCheckPermission("xljk:consultationappointment:list") @GetMapping("/options/majors") public R>> getMajorOptions(@RequestParam(value = "collegeName", required = false) String collegeName) { log.info("获取专业选项，院系名称: {}", collegeName); @@ -257,6 +285,7 @@ public class XljkConsultationAppointmentController extends BaseController { /** * 获取班级选项 */ + @SaCheckPermission("xljk:consultationappointment:list") @GetMapping("/options/classes") public R>> getClassOptions( @RequestParam(value = "collegeName", required = false) String collegeName, @@ -270,7 +299,7 @@ public class XljkConsultationAppointmentController extends BaseController { /** * 导出预约记录（Excel格式） */ - // @SaCheckPermission("xljk:consultationappointment:export") + @SaCheckPermission("xljk:consultationappointment:export") @CrossOrigin(origins = "*", allowedHeaders = "*", exposedHeaders = {"Content-Disposition"}, methods = {RequestMethod.GET}) @GetMapping("/list/export") public ResponseEntity export(XljkConsultationAppointmentBo bo) throws IOException { @@ -380,6 +409,7 @@ public class XljkConsultationAppointmentController extends BaseController { /** * 获取日历视图的排班数据（带预约状态） */ + @SaCheckPermission("xljk:consultationappointment:list") @GetMapping("/calendar-schedules") public R> getCalendarSchedules(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate) { List schedules = service.getCalendarSchedules(startDate, endDate); diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java index f3d9129f..5b7b6f9e 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java @@ -1,5 +1,6 @@ package org.dromara.xljk.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.xljk.domain.bo.XljkConsultationCounselorBo; import org.dromara.xljk.domain.vo.XljkConsultationCounselorVo; import org.dromara.xljk.service.IXljkConsultationCounselorService; @@ -13,6 +14,7 @@ public class XljkConsultationCounselorController { @Autowired private IXljkConsultationCounselorService service; + /** 学生预约可选咨询师：登录即可读；写操作走咨询师管理权限 */ @GetMapping("/list") public List list(XljkConsultationCounselorBo bo) { return service.selectList(bo); @@ -23,18 +25,21 @@ public class XljkConsultationCounselorController { return service.selectById(id); } + @SaCheckPermission("xljk:consulter:add") @PostMapping public boolean add(@RequestBody XljkConsultationCounselorBo bo) { return service.insert(bo); } + @SaCheckPermission("xljk:consulter:edit") @PutMapping public boolean edit(@RequestBody XljkConsultationCounselorBo bo) { return service.update(bo); } + @SaCheckPermission("xljk:consulter:remove") @DeleteMapping("/{id}") public boolean remove(@PathVariable("id") Long id) { return service.deleteById(id); } -} \ No newline at end of file +} diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java index 6be71119..040a9ad7 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java @@ -33,7 +33,7 @@ public class XljkConsultationNoShowController extends BaseController { /** * 查询未到访记录列表 */ - // @SaCheckPermission("xljk:consultationnoshow:list") + @SaCheckPermission("xljk:consultationnoshow:list") @GetMapping("/list") public TableDataInfo list(XljkConsultationNoShowBo bo, PageQuery pageQuery) { // 直接返回查询结果 @@ -44,7 +44,7 @@ public class XljkConsultationNoShowController extends BaseController { /** * 获取未到访记录详情 */ - // @SaCheckPermission("xljk:consultationnoshow:query") + @SaCheckPermission("xljk:consultationnoshow:query") @GetMapping("/{id}") public R get(@PathVariable("id") Long id) { return R.ok(service.selectById(id)); @@ -53,7 +53,7 @@ public class XljkConsultationNoShowController extends BaseController { /** * 解除预约限制 */ - // @SaCheckPermission("xljk:consultationnoshow:release") + @SaCheckPermission("xljk:consultationnoshow:release") @PutMapping("/{id}/release") public R release(@PathVariable("id") Long id) { return R.ok(service.releaseLimitation(id)); diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java index 57797719..9c7f7d45 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java @@ -1,5 +1,6 @@ package org.dromara.xljk.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.xljk.domain.bo.XljkConsultationRecordBo; import org.dromara.xljk.domain.vo.XljkConsultationRecordVo; import org.dromara.xljk.service.IXljkConsultationRecordService; @@ -13,28 +14,33 @@ public class XljkConsultationRecordController { @Autowired private IXljkConsultationRecordService service; + @SaCheckPermission("xljk:consultationappointment:query") @GetMapping("/list") public List list(XljkConsultationRecordBo bo) { return service.selectList(bo); } + @SaCheckPermission("xljk:consultationappointment:query") @GetMapping("/{id}") public XljkConsultationRecordVo get(@PathVariable("id") Long id) { return service.selectById(id); } + @SaCheckPermission("xljk:consultationappointment:edit") @PostMapping public boolean add(@RequestBody XljkConsultationRecordBo bo) { return service.insert(bo); } + @SaCheckPermission("xljk:consultationappointment:edit") @PutMapping public boolean edit(@RequestBody XljkConsultationRecordBo bo) { return service.update(bo); } + @SaCheckPermission("xljk:consultationappointment:edit") @DeleteMapping("/{id}") public boolean remove(@PathVariable("id") Long id) { return service.deleteById(id); } -} \ No newline at end of file +} diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java index 5a705170..3396fdda 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import org.dromara.xljk.domain.vo.XljkConsultationScheduleSummaryVo; +import cn.dev33.satoken.annotation.SaCheckPermission; @RestController @RequestMapping("/xljk/consultation/schedule") @@ -26,6 +27,7 @@ public class XljkConsultationScheduleController { @Autowired private JdbcTemplate jdbcTemplate; + @SaCheckPermission("xljk:consultationschedule:list") @GetMapping("/list") public TableDataInfo list(XljkConsultationScheduleBo bo) { List list = service.selectSummaryList(bo); @@ -37,11 +39,13 @@ public class XljkConsultationScheduleController { return rspData; } + @SaCheckPermission("xljk:consultationschedule:list") @GetMapping("/{id}") public XljkConsultationScheduleVo get(@PathVariable("id") Long id) { return service.selectById(id); } + @SaCheckPermission("xljk:consultationschedule:add") @PostMapping public R add(@RequestBody Object requestBody) { // 判断请求体类型 @@ -189,11 +193,13 @@ public class XljkConsultationScheduleController { return success ? R.ok(1) : R.fail("新增失败"); } + @SaCheckPermission("xljk:consultationschedule:edit") @PutMapping public boolean edit(@RequestBody XljkConsultationScheduleBo bo) { return service.update(bo); } + @SaCheckPermission("xljk:consultationschedule:remove") @DeleteMapping("/{id}") public boolean remove(@PathVariable("id") Long id) { return service.deleteById(id); @@ -204,6 +210,7 @@ public class XljkConsultationScheduleController { * * @return 咨询师选项列表 */ + @SaCheckPermission("xljk:consultationschedule:list") @GetMapping("/options/counselors") public R>> getCounselorOptions() { String sql = "SELECT u.user_id as id, u.nick_name as name, c.office as office " + diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java index 1016bdfc..0f374673 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java @@ -42,7 +42,7 @@ public class XljkConsulterController extends BaseController { /** * 查询心理咨询师配置列表 */ - // @SaCheckPermission("xljk:consulter:list") + @SaCheckPermission("xljk:consulter:list") @GetMapping("/list") public TableDataInfo list(XljkConsulterBo bo, PageQuery pageQuery) { return xljkConsulterService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class XljkConsulterController extends BaseController { /** * 导出心理咨询师配置列表 */ - // @SaCheckPermission("xljk:consulter:export") + @SaCheckPermission("xljk:consulter:export") @Log(title = "心理咨询师配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XljkConsulterBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XljkConsulterController extends BaseController { /** * 获取心理咨询师配置详细信息 */ - // @SaCheckPermission("xljk:consulter:query") + @SaCheckPermission("xljk:consulter:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class XljkConsulterController extends BaseController { /** * 新增心理咨询师配置 */ - // @SaCheckPermission("xljk:consulter:add") + @SaCheckPermission("xljk:consulter:add") @Log(title = "心理咨询师配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class XljkConsulterController extends BaseController { /** * 修改心理咨询师配置 */ - // @SaCheckPermission("xljk:consulter:edit") + @SaCheckPermission("xljk:consulter:edit") @Log(title = "心理咨询师配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class XljkConsulterController extends BaseController { /** * 删除心理咨询师配置 */ - // @SaCheckPermission("xljk:consulter:remove") + @SaCheckPermission("xljk:consulter:remove") @Log(title = "心理咨询师配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -105,7 +105,7 @@ public class XljkConsulterController extends BaseController { /** * 批量添加咨询师 */ - // @SaCheckPermission("xljk:consulter:add") + @SaCheckPermission("xljk:consulter:add") @Log(title = "批量添加咨询师", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batchAdd") @@ -116,7 +116,7 @@ public class XljkConsulterController extends BaseController { /** * 查询我配置的咨询师列表 */ - // @SaCheckPermission("xljk:consulter:list") + @SaCheckPermission("xljk:consulter:list") @GetMapping("/myConfig") public TableDataInfo myConfigList(XljkConsulterBo bo, PageQuery pageQuery) { return xljkConsulterService.queryMyConfigList(bo, pageQuery); @@ -125,7 +125,7 @@ public class XljkConsulterController extends BaseController { /** * 批量启用咨询师 */ - // @SaCheckPermission("xljk:consulter:edit") + @SaCheckPermission("xljk:consulter:edit") @Log(title = "启用咨询师", businessType = BusinessType.UPDATE) @PostMapping("/enable") public R enable(@RequestBody List ids) { @@ -135,7 +135,7 @@ public class XljkConsulterController extends BaseController { /** * 批量停用咨询师 */ - // @SaCheckPermission("xljk:consulter:edit") + @SaCheckPermission("xljk:consulter:edit") @Log(title = "停用咨询师", businessType = BusinessType.UPDATE) @PostMapping("/disable") public R disable(@RequestBody List ids) { @@ -145,7 +145,7 @@ public class XljkConsulterController extends BaseController { /** * 根据部门ID获取用户列表 */ - // @SaCheckPermission("xljk:consulter:list") + @SaCheckPermission("xljk:consulter:list") @GetMapping("/users/{deptId}") public R> listUserByDeptId(@PathVariable("deptId") String deptId) { List users = sysUserService.selectUserListByDept(Long.valueOf(deptId)); diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java index 0a4c4909..a91df274 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java @@ -43,7 +43,7 @@ public class XljkEvaluationController extends BaseController { /** * 查询心理健康测评列表 */ - // @SaCheckPermission("xljk:evaluation:list") + @SaCheckPermission("xljk:evaluation:list") @GetMapping("/list") public TableDataInfo list(XljkEvaluationBo bo, PageQuery pageQuery) { return evaluationService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class XljkEvaluationController extends BaseController { /** * 导出心理健康测评列表 */ - // @SaCheckPermission("xljk:evaluation:export") + @SaCheckPermission("xljk:evaluation:export") @Log(title = "心理健康测评", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XljkEvaluationBo bo, HttpServletResponse response) { @@ -82,7 +82,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取心理健康测评详细信息 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(evaluationService.queryById(id)); @@ -91,7 +91,7 @@ public class XljkEvaluationController extends BaseController { /** * 新增心理健康测评 */ - // @SaCheckPermission("xljk:evaluation:add") + @SaCheckPermission("xljk:evaluation:add") @Log(title = "心理健康测评", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -107,7 +107,7 @@ public class XljkEvaluationController extends BaseController { /** * 修改心理健康测评 */ - // @SaCheckPermission("xljk:evaluation:edit") + @SaCheckPermission("xljk:evaluation:edit") @Log(title = "心理健康测评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -118,7 +118,7 @@ public class XljkEvaluationController extends BaseController { /** * 删除心理健康测评 */ - // @SaCheckPermission("xljk:evaluation:remove") + @SaCheckPermission("xljk:evaluation:remove") @Log(title = "心理健康测评", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -128,7 +128,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取院系选项 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/department") public R>> getDepartmentOptions() { return R.ok(evaluationService.getDepartmentOptions()); @@ -137,7 +137,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取专业和班级选项 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/majorAndClass") public R>>> getMajorAndClassOptions( @RequestParam(value = "departmentId", required = false) Long departmentId @@ -148,7 +148,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取学期选项 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/semester") public R> getSemesterOptions() { return R.ok(evaluationService.getSemesterOptions()); @@ -157,7 +157,7 @@ public class XljkEvaluationController extends BaseController { /** * 发布测评（已废弃，改为提交功能） */ - // @SaCheckPermission("xljk:evaluation:publish") + @SaCheckPermission("xljk:evaluation:publish") @Log(title = "提交测评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/publish") @@ -168,7 +168,7 @@ public class XljkEvaluationController extends BaseController { /** * 提交测评 */ - // @SaCheckPermission("xljk:evaluation:complete") + @SaCheckPermission("xljk:evaluation:complete") @Log(title = "提交测评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/complete") @@ -179,7 +179,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取测评统计数据 */ - // @SaCheckPermission("xljk:evaluation:statistics") + @SaCheckPermission("xljk:evaluation:statistics") @GetMapping("/{id}/statistics") public R> getEvaluationStatistics(@NotNull(message = "测评ID不能为空") @PathVariable("id") Long id) { return R.ok(evaluationService.getEvaluationStatistics(id)); @@ -188,7 +188,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取重点关注学生统计 */ - // @SaCheckPermission("xljk:evaluation:statistics") + @SaCheckPermission("xljk:evaluation:statistics") @GetMapping("/statistics/focus") public R> getFocusStudentsStatistics(XljkEvaluationBo bo) { return R.ok(evaluationService.getFocusStudentsStatistics(bo)); @@ -197,7 +197,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取院系列表 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/colleges") public R>> getCollegeOptions() { return R.ok(evaluationService.getCollegeOptions()); @@ -206,7 +206,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取专业列表 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/majors") public R>> getMajorOptions(@RequestParam(value = "collegeName", required = false) String collegeName) { return R.ok(evaluationService.getMajorOptions(collegeName)); @@ -215,7 +215,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取班级列表 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/classes") public R>> getClassOptions( @RequestParam(value = "collegeName", required = false) String collegeName, @@ -227,7 +227,7 @@ public class XljkEvaluationController extends BaseController { /** * 获取班级学生列表 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/students") public R>> getStudentsByClass( @RequestParam(value = "collegeName", required = false) String collegeName, diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java index d9cfd83f..10fb59a7 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java @@ -42,7 +42,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 查询心理健康测评明细列表 */ - // @SaCheckPermission("xljk:evaluation:list") + @SaCheckPermission("xljk:evaluation:list") @GetMapping("/list") public TableDataInfo list(XljkEvaluationDetailBo bo, PageQuery pageQuery) { return detailService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 导出心理健康测评明细列表 */ - // @SaCheckPermission("xljk:evaluation:export") + @SaCheckPermission("xljk:evaluation:export") @Log(title = "心理健康测评明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XljkEvaluationDetailBo bo, HttpServletResponse response) { @@ -131,7 +131,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 获取心理健康测评明细详细信息 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(detailService.queryById(id)); @@ -140,7 +140,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 新增心理健康测评明细 */ - // @SaCheckPermission("xljk:evaluation:add") + @SaCheckPermission("xljk:evaluation:add") @Log(title = "心理健康测评明细", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -156,7 +156,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 批量新增心理健康测评明细 */ - // @SaCheckPermission("xljk:evaluation:add") + @SaCheckPermission("xljk:evaluation:add") @Log(title = "批量新增心理健康测评明细", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batch") @@ -167,7 +167,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 修改心理健康测评明细 */ - // @SaCheckPermission("xljk:evaluation:edit") + @SaCheckPermission("xljk:evaluation:edit") @Log(title = "心理健康测评明细", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -178,7 +178,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 删除心理健康测评明细 */ - // @SaCheckPermission("xljk:evaluation:remove") + @SaCheckPermission("xljk:evaluation:remove") @Log(title = "心理健康测评明细", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -188,7 +188,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 根据测评ID查询明细列表 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/evaluation/{evaluationId}") public R> getDetailsByEvaluationId(@NotNull(message = "测评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(detailService.queryByEvaluationId(evaluationId)); @@ -197,7 +197,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 获取学生信息 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/students/{classId}") public R>> getStudentsByClassId(@NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId) { return R.ok(detailService.getStudentsByClassId(classId)); @@ -206,7 +206,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 批量更新学生心理状态 */ - // @SaCheckPermission("xljk:evaluation:edit") + @SaCheckPermission("xljk:evaluation:edit") @Log(title = "批量更新心理状态", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/batch/mentalStatus") @@ -217,7 +217,7 @@ public class XljkEvaluationDetailController extends BaseController { /** * 获取重点关注学生列表 */ - // @SaCheckPermission("xljk:evaluation:query") + @SaCheckPermission("xljk:evaluation:query") @GetMapping("/focus") public TableDataInfo getFocusStudents(XljkEvaluationDetailBo bo, PageQuery pageQuery) { return detailService.queryFocusStudents(bo, pageQuery); diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java index 7ff12ffc..6ed1e939 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java @@ -39,7 +39,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 查询学生考核申请、班主任审核列表 */ - // @SaCheckPermission("assessment:application:list") + @SaCheckPermission("assessment:application:list") @GetMapping("/list") public TableDataInfo list(XskhAssessmentApplicationApprovalBo bo, PageQuery pageQuery) { @@ -51,7 +51,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController * * @param id 主键 */ - // @SaCheckPermission("assessment:application:query") + @SaCheckPermission("assessment:application:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentApplicationApprovalService.queryById(id)); @@ -60,7 +60,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 新增学生考核申请、班主任审核 */ - // @SaCheckPermission("assessment:application:add") + @SaCheckPermission("assessment:application:add") @Log(title = "学生考核申请、班主任审核", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -71,7 +71,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 修改学生考核申请、班主任审核 */ - // @SaCheckPermission("assessment:application:edit") + @SaCheckPermission("assessment:application:edit") @Log(title = "学生考核申请、班主任审核", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -84,7 +84,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController * * @param ids 主键串 */ - // @SaCheckPermission("assessment:application:remove") + @SaCheckPermission("assessment:application:remove") @Log(title = "学生考核申请、班主任审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -94,7 +94,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 保存考核申请（草稿状态） */ - // @SaCheckPermission("assessment:application:save") + @SaCheckPermission("assessment:application:save") @Log(title = "保存考核申请", businessType = BusinessType.INSERT) @PostMapping("/save") public R saveApplication(@Validated @RequestBody XskhAssessmentApplicationApprovalBo bo) { @@ -104,7 +104,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 提交考核申请 */ - // @SaCheckPermission("assessment:application:submit") + @SaCheckPermission("assessment:application:submit") @Log(title = "提交考核申请", businessType = BusinessType.UPDATE) @PutMapping("/submit/{id}") public R submitApplication(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -114,7 +114,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 删除考核申请 */ - // @SaCheckPermission("assessment:application:delete") + @SaCheckPermission("assessment:application:delete") @Log(title = "删除考核申请", businessType = BusinessType.DELETE) @DeleteMapping("/delete/{id}") public R deleteApplication(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -124,7 +124,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 获取可申请的考核计划列表 */ - // @SaCheckPermission("assessment:application:available") + @SaCheckPermission("assessment:application:available") @GetMapping("/available") public R> getAvailableSchedules() { return R.ok(xskhAssessmentApplicationApprovalService.getAvailableSchedules()); @@ -133,7 +133,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 根据学生ID和考核计划ID查询申请 */ - // @SaCheckPermission("assessment:application:query") + @SaCheckPermission("assessment:application:query") @GetMapping("/student/{studentId}/schedule/{scheduleId}") public R getByStudentAndSchedule( @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId, @@ -144,7 +144,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController /** * 根据考核计划ID获取关联的指标数据 */ - // @SaCheckPermission("assessment:application:query") + @SaCheckPermission("assessment:application:query") @GetMapping("/indicators/{scheduleId}") public R> getIndicatorsByScheduleId( @NotNull(message = "考核计划ID不能为空") @PathVariable("scheduleId") Long scheduleId) { diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java index c1ba5892..55541a3b 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java @@ -39,7 +39,7 @@ public class XskhAssessmentApprovalController extends BaseController { /** * 查询学生考核审核列表 */ - // @SaCheckPermission("assessment:approval:list") + @SaCheckPermission("assessment:approval:list") @GetMapping("/list") public TableDataInfo list(XskhAssessmentApprovalBo bo, PageQuery pageQuery) { return xskhAssessmentApprovalService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XskhAssessmentApprovalController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("assessment:approval:query") + @SaCheckPermission("assessment:approval:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentApprovalService.queryById(id)); @@ -59,7 +59,7 @@ public class XskhAssessmentApprovalController extends BaseController { /** * 新增学生考核审核 */ - // @SaCheckPermission("assessment:approval:add") + @SaCheckPermission("assessment:approval:add") @Log(title = "学生考核审核", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -70,7 +70,7 @@ public class XskhAssessmentApprovalController extends BaseController { /** * 修改学生考核审核 */ - // @SaCheckPermission("assessment:approval:edit") + @SaCheckPermission("assessment:approval:edit") @Log(title = "学生考核审核", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -83,7 +83,7 @@ public class XskhAssessmentApprovalController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("assessment:approval:remove") + @SaCheckPermission("assessment:approval:remove") @Log(title = "学生考核审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -93,7 +93,7 @@ public class XskhAssessmentApprovalController extends BaseController { /** * 审核考核申请 */ - // @SaCheckPermission("assessment:approval:approve") + @SaCheckPermission("assessment:approval:approve") @Log(title = "审核考核申请", businessType = BusinessType.UPDATE) @PutMapping("/approve") public R approveApplication(@Validated @RequestBody XskhAssessmentApprovalBo bo) { @@ -110,7 +110,7 @@ public class XskhAssessmentApprovalController extends BaseController { * @param pageQuery 分页参数 * @return 班主任班级下的考核申请列表（仅包含已提交、班主任审核、已完成的申请） */ - // @SaCheckPermission("assessment:approval:teacherClass") + @SaCheckPermission("assessment:approval:teacherClass") @GetMapping("/teacherClass") public TableDataInfo getTeacherClassApplications( @RequestParam(value = "scheduleId", required = false) Long scheduleId, @@ -127,7 +127,7 @@ public class XskhAssessmentApprovalController extends BaseController { * * @return 可用的考核计划列表，包含进行中和已结束的计划 */ - // @SaCheckPermission("assessment:approval:available") + @SaCheckPermission("assessment:approval:available") @GetMapping("/available") public R> getAvailableSchedules() { return R.ok(xskhAssessmentApprovalService.getAvailableSchedules()); diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java index fe762308..a8f69894 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java @@ -39,7 +39,7 @@ public class XskhAssessmentIndicatorController extends BaseController { /** * 查询学生考核指标体系列表 */ - // @SaCheckPermission("assessment:indicator:list") + @SaCheckPermission("assessment:indicator:list") @GetMapping("/list") public TableDataInfo list(XskhAssessmentIndicatorBo bo, PageQuery pageQuery) { return xskhAssessmentIndicatorService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XskhAssessmentIndicatorController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("assessment:indicator:query") + @SaCheckPermission("assessment:indicator:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentIndicatorService.getIndicatorWithRelations(id)); @@ -59,7 +59,7 @@ public class XskhAssessmentIndicatorController extends BaseController { /** * 新增学生考核指标体系 */ - // @SaCheckPermission("assessment:indicator:add") + @SaCheckPermission("assessment:indicator:add") @Log(title = "学生考核指标体系", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -70,7 +70,7 @@ public class XskhAssessmentIndicatorController extends BaseController { /** * 修改学生考核指标体系 */ - // @SaCheckPermission("assessment:indicator:edit") + @SaCheckPermission("assessment:indicator:edit") @Log(title = "学生考核指标体系", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -83,7 +83,7 @@ public class XskhAssessmentIndicatorController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("assessment:indicator:remove") + @SaCheckPermission("assessment:indicator:remove") @Log(title = "学生考核指标体系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -93,7 +93,7 @@ public class XskhAssessmentIndicatorController extends BaseController { /** * 获取启用的指标列表（用于下拉选择） */ - // @SaCheckPermission("assessment:indicator:list") + @SaCheckPermission("assessment:indicator:list") @GetMapping("/enabled") public R> getEnabledList() { XskhAssessmentIndicatorBo bo = new XskhAssessmentIndicatorBo(); diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java index 4ce774bf..a6ba9f31 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java @@ -39,7 +39,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { /** * 查询学生考核指标体系类型列表 */ - // @SaCheckPermission("assessment:indicatorType:list") + @SaCheckPermission("assessment:indicatorType:list") @GetMapping("/list") public TableDataInfo list(XskhAssessmentIndicatorTypeBo bo, PageQuery pageQuery) { return xskhAssessmentIndicatorTypeService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("assessment:indicatorType:query") + @SaCheckPermission("assessment:indicatorType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentIndicatorTypeService.queryById(id)); @@ -59,7 +59,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { /** * 新增学生考核指标体系类型 */ - // @SaCheckPermission("assessment:indicatorType:add") + @SaCheckPermission("assessment:indicatorType:add") @Log(title = "学生考核指标体系类型", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -70,7 +70,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { /** * 修改学生考核指标体系类型 */ - // @SaCheckPermission("assessment:indicatorType:edit") + @SaCheckPermission("assessment:indicatorType:edit") @Log(title = "学生考核指标体系类型", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -83,7 +83,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("assessment:indicatorType:remove") + @SaCheckPermission("assessment:indicatorType:remove") @Log(title = "学生考核指标体系类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -93,7 +93,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { /** * 获取启用的指标类型列表（用于下拉选择） */ - // @SaCheckPermission("assessment:indicatorType:list") + @SaCheckPermission("assessment:indicatorType:list") @GetMapping("/enabled") public R> getEnabledList() { XskhAssessmentIndicatorTypeBo bo = new XskhAssessmentIndicatorTypeBo(); diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java index ea083df0..bb245f0e 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java @@ -39,7 +39,7 @@ public class XskhAssessmentPlanController extends BaseController { /** * 查询学生考核方案列表 */ - // @SaCheckPermission("assessment:plan:list") + @SaCheckPermission("assessment:plan:list") @GetMapping("/list") public TableDataInfo list(XskhAssessmentPlanBo bo, PageQuery pageQuery) { return xskhAssessmentPlanService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XskhAssessmentPlanController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("assessment:plan:query") + @SaCheckPermission("assessment:plan:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentPlanService.getPlanWithRelations(id)); @@ -59,7 +59,7 @@ public class XskhAssessmentPlanController extends BaseController { /** * 新增学生考核方案 */ - // @SaCheckPermission("assessment:plan:add") + @SaCheckPermission("assessment:plan:add") @Log(title = "学生考核方案", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -70,7 +70,7 @@ public class XskhAssessmentPlanController extends BaseController { /** * 修改学生考核方案 */ - // @SaCheckPermission("assessment:plan:edit") + @SaCheckPermission("assessment:plan:edit") @Log(title = "学生考核方案", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -83,7 +83,7 @@ public class XskhAssessmentPlanController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("assessment:plan:remove") + @SaCheckPermission("assessment:plan:remove") @Log(title = "学生考核方案", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -93,7 +93,7 @@ public class XskhAssessmentPlanController extends BaseController { /** * 获取启用的方案列表（用于下拉选择） */ - // @SaCheckPermission("assessment:plan:list") + @SaCheckPermission("assessment:plan:list") @GetMapping("/enabled") public R> getEnabledList() { XskhAssessmentPlanBo bo = new XskhAssessmentPlanBo(); diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java index 0916b2d2..a946d3c9 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java @@ -40,7 +40,7 @@ public class XskhAssessmentScheduleController extends BaseController { /** * 查询学生考核计划列表 */ - // @SaCheckPermission("assessment:schedule:list") + @SaCheckPermission("assessment:schedule:list") @GetMapping("/list") public TableDataInfo list(XskhAssessmentScheduleBo bo, PageQuery pageQuery) { return xskhAssessmentScheduleService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XskhAssessmentScheduleController extends BaseController { /** * 根据状态列表查询学生考核计划列表 */ - // @SaCheckPermission("assessment:schedule:list") + @SaCheckPermission("assessment:schedule:list") @GetMapping("/listByStatus") public TableDataInfo listByStatus(XskhAssessmentScheduleQueryBo bo, PageQuery pageQuery) { return xskhAssessmentScheduleService.queryPageListByStatusList(bo, pageQuery); @@ -60,7 +60,7 @@ public class XskhAssessmentScheduleController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("assessment:schedule:query") + @SaCheckPermission("assessment:schedule:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentScheduleService.queryById(id)); @@ -69,7 +69,7 @@ public class XskhAssessmentScheduleController extends BaseController { /** * 新增学生考核计划 */ - // @SaCheckPermission("assessment:schedule:add") + @SaCheckPermission("assessment:schedule:add") @Log(title = "学生考核计划", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -80,7 +80,7 @@ public class XskhAssessmentScheduleController extends BaseController { /** * 修改学生考核计划 */ - // @SaCheckPermission("assessment:schedule:edit") + @SaCheckPermission("assessment:schedule:edit") @Log(title = "学生考核计划", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -93,7 +93,7 @@ public class XskhAssessmentScheduleController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("assessment:schedule:remove") + @SaCheckPermission("assessment:schedule:remove") @Log(title = "学生考核计划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -103,7 +103,7 @@ public class XskhAssessmentScheduleController extends BaseController { /** * 上线考核计划 */ - // @SaCheckPermission("assessment:schedule:online") + @SaCheckPermission("assessment:schedule:online") @Log(title = "上线考核计划", businessType = BusinessType.UPDATE) @PutMapping("/online/{id}") public R online(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -113,7 +113,7 @@ public class XskhAssessmentScheduleController extends BaseController { /** * 下线考核计划 */ - // @SaCheckPermission("assessment:schedule:offline") + @SaCheckPermission("assessment:schedule:offline") @Log(title = "下线考核计划", businessType = BusinessType.UPDATE) @PutMapping("/offline/{id}") public R offline(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -123,7 +123,7 @@ public class XskhAssessmentScheduleController extends BaseController { /** * 完成考核计划 */ - // @SaCheckPermission("assessment:schedule:complete") + @SaCheckPermission("assessment:schedule:complete") @Log(title = "完成考核计划", businessType = BusinessType.UPDATE) @PutMapping("/complete/{id}") public R complete(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java index 421d2b39..fe7f6e44 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java @@ -41,7 +41,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 查询学生违纪处分记录列表 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:list") + @SaCheckPermission("disciplineRecord:disciplineRecord:list") @GetMapping("/list") public TableDataInfo list(XskhDisciplineRecordBo bo, PageQuery pageQuery) { return xskhDisciplineRecordService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 导出学生违纪处分记录列表 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:export") + @SaCheckPermission("disciplineRecord:disciplineRecord:export") @Log(title = "学生违纪处分记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XskhDisciplineRecordBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class XskhDisciplineRecordController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhDisciplineRecordService.queryById(id)); @@ -72,7 +72,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 新增学生违纪处分记录 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:add") + @SaCheckPermission("disciplineRecord:disciplineRecord:add") @Log(title = "学生违纪处分记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 修改学生违纪处分记录 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:edit") + @SaCheckPermission("disciplineRecord:disciplineRecord:edit") @Log(title = "学生违纪处分记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class XskhDisciplineRecordController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:remove") + @SaCheckPermission("disciplineRecord:disciplineRecord:remove") @Log(title = "学生违纪处分记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -106,7 +106,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 查询学生选项列表（用于下拉框） */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/studentOptions") public R> getStudentOptions(@RequestParam(value = "keyword", required = false) String keyword) { return R.ok(xskhDisciplineRecordService.getStudentOptions(keyword)); @@ -115,7 +115,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 分页查询学生选项列表（用于移动端） */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/studentOptionsPage") public R> getStudentOptionsPage( @RequestParam(value = "keyword", required = false) String keyword, @@ -127,7 +127,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 查询当前登录学生的违纪处分记录列表 */ - // @SaCheckPermission("disciplineRecord:student:list") + @SaCheckPermission("disciplineRecord:student:list") @GetMapping("/my") public TableDataInfo getMyDisciplineRecords(XskhDisciplineRecordBo bo, PageQuery pageQuery) { @@ -137,7 +137,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 查询班主任班级的违纪处分记录列表（班主任专用） */ - // @SaCheckPermission("disciplineRecord:classTeacher:list") + @SaCheckPermission("disciplineRecord:classTeacher:list") @GetMapping("/classTeacherList") public TableDataInfo getClassTeacherDisciplineRecords(XskhDisciplineRecordBo bo, PageQuery pageQuery) { @@ -147,7 +147,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 获取指标关联的违纪处分类型和奖励类型 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/getIndicatorTypes/{indicatorId}") public R> getIndicatorTypes(@NotNull(message = "指标ID不能为空") @PathVariable("indicatorId") Long indicatorId) { return R.ok(xskhDisciplineRecordService.getIndicatorTypes(indicatorId)); @@ -156,7 +156,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 获取学生在指定时间范围内的违纪处分记录 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/getStudentDisciplineRecords") public R> getStudentDisciplineRecords( @RequestParam("studentId") Long studentId, @@ -170,7 +170,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 获取指定违纪类型在指定时间范围内所有学生的最高总扣分 */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/getMaxScoreByTypeAndPeriod/{typeId}") public R getMaxScoreByTypeAndPeriod( @NotNull(message = "违纪类型ID不能为空") @PathVariable("typeId") Long typeId, @@ -182,7 +182,7 @@ public class XskhDisciplineRecordController extends BaseController { /** * 查询当前用户创建的违纪记录列表（支持按学生姓名或学号搜索） */ - // @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/myCreated") public TableDataInfo getMyCreatedDisciplineRecords(XskhDisciplineRecordBo bo, PageQuery pageQuery) { diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java index f9957430..7fa93e94 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java @@ -39,7 +39,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 查询违纪处分撤销申请审批列表 */ - // @SaCheckPermission("disciplineRevoke:disciplineRevoke:list") + @SaCheckPermission("disciplineRevoke:disciplineRevoke:list") @GetMapping("/list") public TableDataInfo list(XskhDisciplineRevokeBo bo, PageQuery pageQuery) { return xskhDisciplineRevokeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 导出违纪处分撤销申请审批列表 */ - // @SaCheckPermission("disciplineRevoke:disciplineRevoke:export") + @SaCheckPermission("disciplineRevoke:disciplineRevoke:export") @Log(title = "违纪处分撤销申请审批", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XskhDisciplineRevokeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XskhDisciplineRevokeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("disciplineRevoke:disciplineRevoke:query") + @SaCheckPermission("disciplineRevoke:disciplineRevoke:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhDisciplineRevokeService.queryById(id)); @@ -70,7 +70,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 新增违纪处分撤销申请审批 */ - // @SaCheckPermission("disciplineRevoke:disciplineRevoke:add") + @SaCheckPermission("disciplineRevoke:disciplineRevoke:add") @Log(title = "违纪处分撤销申请审批", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +81,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 修改违纪处分撤销申请审批 */ - // @SaCheckPermission("disciplineRevoke:disciplineRevoke:edit") + @SaCheckPermission("disciplineRevoke:disciplineRevoke:edit") @Log(title = "违纪处分撤销申请审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class XskhDisciplineRevokeController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("disciplineRevoke:disciplineRevoke:remove") + @SaCheckPermission("disciplineRevoke:disciplineRevoke:remove") @Log(title = "违纪处分撤销申请审批", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -106,7 +106,7 @@ public class XskhDisciplineRevokeController extends BaseController { * * @param disciplineRecordId 违纪记录ID */ - // @SaCheckPermission("disciplineRevoke:student:query") + @SaCheckPermission("disciplineRevoke:student:query") @GetMapping("/byDisciplineRecord/{disciplineRecordId}") public R getByDisciplineRecordId( @NotNull(message = "违纪记录ID不能为空") @PathVariable("disciplineRecordId") Long disciplineRecordId) { @@ -116,7 +116,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 查询当前登录学生的撤销申请列表 */ - // @SaCheckPermission("disciplineRevoke:student:list") + @SaCheckPermission("disciplineRevoke:student:list") @GetMapping("/my") public TableDataInfo getMyRevokeApplications(XskhDisciplineRevokeBo bo, PageQuery pageQuery) { @@ -126,7 +126,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 学生申请撤销违纪记录 */ - // @SaCheckPermission("disciplineRevoke:student:apply") + @SaCheckPermission("disciplineRevoke:student:apply") @Log(title = "学生申请撤销违纪记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/apply") @@ -137,7 +137,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 查询班主任班级的违纪撤销申请列表（班主任专用） */ - // @SaCheckPermission("disciplineRevoke:classTeacher:list") + @SaCheckPermission("disciplineRevoke:classTeacher:list") @GetMapping("/classTeacherList") public TableDataInfo getClassTeacherRevokeApplications(XskhDisciplineRevokeBo bo, PageQuery pageQuery) { @@ -147,7 +147,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 查询班主任已审核的违纪撤销申请列表（根据审核人查询历史记录） */ - // @SaCheckPermission("disciplineRevoke:classTeacher:list") + @SaCheckPermission("disciplineRevoke:classTeacher:list") @GetMapping("/classTeacherReviewedList") public TableDataInfo getClassTeacherReviewedRevokeApplications(XskhDisciplineRevokeBo bo, PageQuery pageQuery) { @@ -157,7 +157,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 班主任审核撤销申请 */ - // @SaCheckPermission("disciplineRevoke:classTeacher:approve") + @SaCheckPermission("disciplineRevoke:classTeacher:approve") @Log(title = "班主任审核撤销申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/teacherApprove") @@ -168,7 +168,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 查询学工处待审核的撤销申请列表（学工处专用） */ - // @SaCheckPermission("disciplineRevoke:studentAffairs:list") + @SaCheckPermission("disciplineRevoke:studentAffairs:list") @GetMapping("/studentAffairsList") public TableDataInfo getStudentAffairsRevokeApplications(XskhDisciplineRevokeBo bo, PageQuery pageQuery) { @@ -178,7 +178,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 学工处审核撤销申请 */ - // @SaCheckPermission("disciplineRevoke:studentAffairs:approve") + @SaCheckPermission("disciplineRevoke:studentAffairs:approve") @Log(title = "学工处审核撤销申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/studentAffairsApprove") @@ -189,7 +189,7 @@ public class XskhDisciplineRevokeController extends BaseController { /** * 查询学工处已审核的撤销申请列表（学工处专用） */ - // @SaCheckPermission("disciplineRevoke:studentAffairs:list") + @SaCheckPermission("disciplineRevoke:studentAffairs:list") @GetMapping("/studentAffairsReviewedList") public TableDataInfo getStudentAffairsReviewedRevokeApplications(XskhDisciplineRevokeBo bo, PageQuery pageQuery) { diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java index 149d2f20..5df49ff9 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java @@ -39,7 +39,7 @@ public class XskhDisciplineTypeController extends BaseController { /** * 查询学生违纪处分类型列表 */ - // @SaCheckPermission("disciplineType:disciplineType:list") + @SaCheckPermission("disciplineType:disciplineType:list") @GetMapping("/list") public TableDataInfo list(XskhDisciplineTypeBo bo, PageQuery pageQuery) { return xskhDisciplineTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XskhDisciplineTypeController extends BaseController { /** * 导出学生违纪处分类型列表 */ - // @SaCheckPermission("disciplineType:disciplineType:export") + @SaCheckPermission("disciplineType:disciplineType:export") @Log(title = "学生违纪处分类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XskhDisciplineTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XskhDisciplineTypeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("disciplineType:disciplineType:query") + @SaCheckPermission("disciplineType:disciplineType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhDisciplineTypeService.queryById(id)); @@ -70,7 +70,7 @@ public class XskhDisciplineTypeController extends BaseController { /** * 新增学生违纪处分类型 */ - // @SaCheckPermission("disciplineType:disciplineType:add") + @SaCheckPermission("disciplineType:disciplineType:add") @Log(title = "学生违纪处分类型", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,7 +81,7 @@ public class XskhDisciplineTypeController extends BaseController { /** * 修改学生违纪处分类型 */ - // @SaCheckPermission("disciplineType:disciplineType:edit") + @SaCheckPermission("disciplineType:disciplineType:edit") @Log(title = "学生违纪处分类型", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +94,7 @@ public class XskhDisciplineTypeController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("disciplineType:disciplineType:remove") + @SaCheckPermission("disciplineType:disciplineType:remove") @Log(title = "学生违纪处分类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -108,7 +108,7 @@ public class XskhDisciplineTypeController extends BaseController { * @param status 状态(0-正常 1-停用) * @return 学生违纪处分类型列表 */ - // @SaCheckPermission("disciplineType:disciplineType:list") + @SaCheckPermission("disciplineType:disciplineType:list") @GetMapping("/listByAreaType") public R> listByAreaType(@RequestParam("areaType") String areaType, @RequestParam(value = "status", required = false) String status) { diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java index 95ef530e..0530de8e 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java @@ -40,7 +40,7 @@ public class XskhRewardRecordController extends BaseController { /** * 查询学生奖励记录列表 */ - // @SaCheckPermission("rewardRecord:rewardRecord:list") + @SaCheckPermission("rewardRecord:rewardRecord:list") @GetMapping("/list") public TableDataInfo list(XskhRewardRecordBo bo, PageQuery pageQuery) { return xskhRewardRecordService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class XskhRewardRecordController extends BaseController { /** * 导出学生奖励记录列表 */ - // @SaCheckPermission("rewardRecord:rewardRecord:export") + @SaCheckPermission("rewardRecord:rewardRecord:export") @Log(title = "学生奖励记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XskhRewardRecordBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class XskhRewardRecordController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("rewardRecord:rewardRecord:query") + @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhRewardRecordService.queryById(id)); @@ -71,7 +71,7 @@ public class XskhRewardRecordController extends BaseController { /** * 新增学生奖励记录 */ - // @SaCheckPermission("rewardRecord:rewardRecord:add") + @SaCheckPermission("rewardRecord:rewardRecord:add") @Log(title = "学生奖励记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XskhRewardRecordController extends BaseController { /** * 修改学生奖励记录 */ - // @SaCheckPermission("rewardRecord:rewardRecord:edit") + @SaCheckPermission("rewardRecord:rewardRecord:edit") @Log(title = "学生奖励记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XskhRewardRecordController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("rewardRecord:rewardRecord:remove") + @SaCheckPermission("rewardRecord:rewardRecord:remove") @Log(title = "学生奖励记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -105,7 +105,7 @@ public class XskhRewardRecordController extends BaseController { /** * 查询学生选项列表（用于下拉框） */ - // @SaCheckPermission("rewardRecord:rewardRecord:query") + @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/studentOptions") public R> getStudentOptions(@RequestParam(value = "keyword", required = false) String keyword) { return R.ok(xskhRewardRecordService.getStudentOptions(keyword)); @@ -114,7 +114,7 @@ public class XskhRewardRecordController extends BaseController { /** * 查询当前登录学生的奖励记录列表 */ - // @SaCheckPermission("rewardRecord:student:list") + @SaCheckPermission("rewardRecord:student:list") @GetMapping("/my") public TableDataInfo getMyRewardRecords(XskhRewardRecordBo bo, PageQuery pageQuery) { @@ -124,7 +124,7 @@ public class XskhRewardRecordController extends BaseController { /** * 查询班主任班级的奖励记录列表（班主任专用） */ - // @SaCheckPermission("rewardRecord:classTeacher:list") + @SaCheckPermission("rewardRecord:classTeacher:list") @GetMapping("/classTeacherList") public TableDataInfo getClassTeacherRewardRecords(XskhRewardRecordBo bo, PageQuery pageQuery) { @@ -134,7 +134,7 @@ public class XskhRewardRecordController extends BaseController { /** * 获取学生在指定时间范围内的奖励记录 */ - // @SaCheckPermission("rewardRecord:rewardRecord:query") + @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/getStudentRewardRecords") public R> getStudentRewardRecords( @RequestParam("studentId") Long studentId, @@ -147,7 +147,7 @@ public class XskhRewardRecordController extends BaseController { /** * 获取指定奖励类型在指定时间范围内所有学生的最高总加分 */ - // @SaCheckPermission("rewardRecord:rewardRecord:query") + @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/getMaxScoreByTypeAndPeriod/{typeId}") public R getMaxScoreByTypeAndPeriod( @NotNull(message = "奖励类型ID不能为空") @PathVariable("typeId") Long typeId, diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java index 40ef1039..d66ba109 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java @@ -39,7 +39,7 @@ public class XskhRewardTypeController extends BaseController { /** * 查询学生奖励类型列表 */ - // @SaCheckPermission("rewardType:rewardType:list") + @SaCheckPermission("rewardType:rewardType:list") @GetMapping("/list") public TableDataInfo list(XskhRewardTypeBo bo, PageQuery pageQuery) { return xskhRewardTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class XskhRewardTypeController extends BaseController { /** * 导出学生奖励类型列表 */ - // @SaCheckPermission("rewardType:rewardType:export") + @SaCheckPermission("rewardType:rewardType:export") @Log(title = "学生奖励类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(XskhRewardTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class XskhRewardTypeController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("rewardType:rewardType:query") + @SaCheckPermission("rewardType:rewardType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public class XskhRewardTypeController extends BaseController { /** * 新增学生奖励类型 */ - // @SaCheckPermission("rewardType:rewardType:add") + @SaCheckPermission("rewardType:rewardType:add") @Log(title = "学生奖励类型", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class XskhRewardTypeController extends BaseController { /** * 修改学生奖励类型 */ - // @SaCheckPermission("rewardType:rewardType:edit") + @SaCheckPermission("rewardType:rewardType:edit") @Log(title = "学生奖励类型", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class XskhRewardTypeController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("rewardType:rewardType:remove") + @SaCheckPermission("rewardType:rewardType:remove") @Log(title = "学生奖励类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java index 246b4acb..e6a6cad4 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java @@ -44,7 +44,7 @@ public class InternshipInfoController extends BaseController { * 查询学生实习信息列表（班主任专用） */ @Operation(summary = "查询学生实习信息列表", description = "班主任查看本班学生实习情况") - // @SaCheckPermission("zsjy:internship:list") + @SaCheckPermission("zsjy:internship:list") @GetMapping("/list") public TableDataInfo list(@Validated InternshipInfoQueryBO queryBO, PageQuery pageQuery) { log.info("=== Controller层调试 ==="); @@ -65,7 +65,7 @@ public class InternshipInfoController extends BaseController { * 获取学生实习信息详细信息 */ @Operation(summary = "获取学生实习详情", description = "查看单个学生的实习详细信息") - // @SaCheckPermission("zsjy:internship:query") + @SaCheckPermission("zsjy:internship:query") @GetMapping("/{studentId}") public R getInfo( @Parameter(description = "学生ID", required = true) @@ -77,7 +77,7 @@ public class InternshipInfoController extends BaseController { * 导出学生实习信息列表 */ @Operation(summary = "导出学生实习信息", description = "导出班级学生实习情况数据") - // @SaCheckPermission("zsjy:internship:export") + @SaCheckPermission("zsjy:internship:export") @PostMapping("/export") public void export(@Validated InternshipInfoQueryBO queryBO, HttpServletResponse response) { internshipInfoService.exportInternshipInfo(queryBO, response); @@ -87,7 +87,7 @@ public class InternshipInfoController extends BaseController { * 获取班主任管理的班级信息 */ @Operation(summary = "获取班主任班级", description = "获取当前登录班主任管理的班级列表") - // @SaCheckPermission("zsjy:internship:class") + @SaCheckPermission("zsjy:internship:class") @GetMapping("/classes") public R getTeacherClasses() { return R.ok(internshipInfoService.getTeacherClasses()); @@ -97,7 +97,7 @@ public class InternshipInfoController extends BaseController { * 统计实习状态数据 */ @Operation(summary = "实习状态统计", description = "统计班级学生实习状态分布") - // @SaCheckPermission("zsjy:internship:statistics") + @SaCheckPermission("zsjy:internship:statistics") @GetMapping("/statistics") public R getInternshipStatistics(@Validated InternshipInfoQueryBO queryBO) { return R.ok(internshipInfoService.getInternshipStatistics(queryBO)); @@ -138,7 +138,7 @@ public class InternshipInfoController extends BaseController { * 新增实习信息 */ @Operation(summary = "新增实习信息", description = "为学生新增实习信息") - // @SaCheckPermission("zsjy:internship:add") + @SaCheckPermission("zsjy:internship:add") @PostMapping public R add(@RequestBody @Validated(AddGroup.class) InternshipInfoAddBO addBO) { log.info("新增实习信息请求，参数：{}", addBO); @@ -161,7 +161,7 @@ public class InternshipInfoController extends BaseController { * 33 */ @Operation(summary = "修改实习信息", description = "修改学生实习信息") - // @SaCheckPermission("zsjy:internship:edit") + @SaCheckPermission("zsjy:internship:edit") @PutMapping public R edit(@RequestBody @Validated(EditGroup.class) InternshipInfoEditBO editBO) { log.info("修改实习信息请求，参数：{}", editBO); @@ -184,7 +184,7 @@ public class InternshipInfoController extends BaseController { * 删除实习信息 */ @Operation(summary = "删除实习信息", description = "删除学生实习信息") - // @SaCheckPermission("zsjy:internship:remove") + @SaCheckPermission("zsjy:internship:remove") @DeleteMapping("/{internshipIds}") public R remove(@Parameter(description = "实习信息ID串") @PathVariable("internshipIds") Long[] internshipIds) { @@ -208,7 +208,7 @@ public class InternshipInfoController extends BaseController { * 获取当前学生的实习信息 */ @Operation(summary = "获取当前学生实习信息", description = "获取当前登录学生的实习信息，用于月度总结等功能") - // @SaCheckPermission("zsjy:internship:query") + @SaCheckPermission("zsjy:internship:query") @GetMapping("/current") public R getCurrentStudentInternship() { try { @@ -231,7 +231,7 @@ public class InternshipInfoController extends BaseController { * 实习信息变更 */ @Operation(summary = "实习信息变更", description = "变更学生实习信息，将原记录设置为失效，并新增一条新的实习记录") - // @SaCheckPermission("zsjy:internship:change") + @SaCheckPermission("zsjy:internship:change") @PostMapping("/change") public R changeInternship(@RequestBody @Validated InternshipInfoChangeBO changeBO) { log.info("实习信息变更请求，参数：{}", changeBO); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java index 4fa5262a..80356b21 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java @@ -7,6 +7,9 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.common.ratelimiter.annotation.RateLimiter; +import org.dromara.common.ratelimiter.enums.LimitType; +import org.dromara.common.core.utils.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -43,7 +46,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { /** * 查询招生报名信息列表 */ - // @SaCheckPermission("zsjy:enrollment:info:list") + @SaCheckPermission("zsjy:enrollment:info:list") @GetMapping("/list") public TableDataInfo list(ZsjyEnrollmentInfoBo bo, PageQuery pageQuery) { return enrollmentInfoService.queryPageList(bo, pageQuery); @@ -52,7 +55,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { /** * 导出招生报名信息列表 */ - // @SaCheckPermission("zsjy:enrollment:info:export") + @SaCheckPermission("zsjy:enrollment:info:export") @Log(title = "招生报名信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ZsjyEnrollmentInfoBo bo, HttpServletResponse response) { @@ -63,7 +66,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { /** * 获取招生报名信息详细信息 */ - // @SaCheckPermission("zsjy:enrollment:info:query") + @SaCheckPermission("zsjy:enrollment:info:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(enrollmentInfoService.queryById(id)); @@ -72,7 +75,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { /** * 新增招生报名信息 */ - // @SaCheckPermission("zsjy:enrollment:info:add") + @SaCheckPermission("zsjy:enrollment:info:add") @Log(title = "招生报名信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +86,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { /** * 修改招生报名信息 */ - // @SaCheckPermission("zsjy:enrollment:info:edit") + @SaCheckPermission("zsjy:enrollment:info:edit") @Log(title = "招生报名信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -94,7 +97,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { /** * 删除招生报名信息 */ - // @SaCheckPermission("zsjy:enrollment:info:remove") + @SaCheckPermission("zsjy:enrollment:info:remove") @Log(title = "招生报名信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -102,19 +105,27 @@ public class ZsjyEnrollmentInfoController extends BaseController { } /** - * 根据身份证号和准考证号查询报名信息（须登录） + * 根据身份证号和准考证号查询报名信息（须登录；须双因子；返回脱敏；IP 限流） */ + @RateLimiter(time = 60, count = 10, limitType = LimitType.IP) @GetMapping("/query") public R queryByIdCardAndExamNumber( - @RequestParam(value = "idCard", required = false) String idCard, - @RequestParam(value = "examNumber", required = false) String examNumber) { - ZsjyEnrollmentInfoVo vo = enrollmentInfoService.queryByIdCardAndExamNumber(idCard, examNumber); + @RequestParam("idCard") String idCard, + @RequestParam("examNumber") String examNumber) { + if (StringUtils.isBlank(idCard) || StringUtils.isBlank(examNumber)) { + return R.fail("请同时提供身份证号和准考证号"); + } + ZsjyEnrollmentInfoVo vo = enrollmentInfoService.queryMaskedByIdCardAndExamNumber(idCard, examNumber); + if (vo == null) { + return R.fail("未找到相关报名信息"); + } return R.ok(vo); } /** * 提交报名信息（供学生端使用，须登录） */ + @RateLimiter(time = 60, count = 5, limitType = LimitType.IP) @Log(title = "学生报名", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/submit") @@ -123,13 +134,17 @@ public class ZsjyEnrollmentInfoController extends BaseController { } /** - * 查询我的报名状态（供学生端使用，须登录） + * 查询我的报名状态（须登录；须双因子；返回脱敏；IP 限流） */ + @RateLimiter(time = 60, count = 10, limitType = LimitType.IP) @GetMapping("/myStatus") public R getMyEnrollmentStatus( @RequestParam("idCard") String idCard, @RequestParam("examNumber") String examNumber) { - ZsjyEnrollmentInfoVo vo = enrollmentInfoService.queryByIdCardAndExamNumber(idCard, examNumber); + if (StringUtils.isBlank(idCard) || StringUtils.isBlank(examNumber)) { + return R.fail("请同时提供身份证号和准考证号"); + } + ZsjyEnrollmentInfoVo vo = enrollmentInfoService.queryMaskedByIdCardAndExamNumber(idCard, examNumber); if (vo == null) { return R.fail("未找到相关报名信息"); } @@ -139,7 +154,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { /** * 更新报名信息状态 */ - // @SaCheckPermission("zsjy:enrollment:info:edit") + @SaCheckPermission("zsjy:enrollment:info:edit") @Log(title = "更新报名状态", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/updateStatus") diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java index 0fd02b5a..ba6c0c9e 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java @@ -43,7 +43,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 查询招生录取流程状态列表 */ - // @SaCheckPermission("zsjy:enrollment:process:list") + @SaCheckPermission("zsjy:enrollment:process:list") @GetMapping("/list") public TableDataInfo list(ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { return enrollmentProcessService.queryPageList(bo, pageQuery); @@ -52,7 +52,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 导出招生录取流程状态列表 */ - // @SaCheckPermission("zsjy:enrollment:process:export") + @SaCheckPermission("zsjy:enrollment:process:export") @Log(title = "招生录取流程状态", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ZsjyEnrollmentProcessBo bo, HttpServletResponse response) { @@ -73,7 +73,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 获取招生录取流程状态详细信息 */ - // @SaCheckPermission("zsjy:enrollment:process:query") + @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(enrollmentProcessService.queryById(id)); @@ -82,7 +82,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 根据报名信息ID查询流程状态 */ - // @SaCheckPermission("zsjy:enrollment:process:query") + @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/enrollment/{enrollmentId}") public R getByEnrollmentId(@NotNull(message = "报名信息ID不能为空") @PathVariable("enrollmentId") Long enrollmentId) { return R.ok(enrollmentProcessService.queryByEnrollmentId(enrollmentId)); @@ -91,7 +91,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 新增招生录取流程状态 */ - // @SaCheckPermission("zsjy:enrollment:process:add") + @SaCheckPermission("zsjy:enrollment:process:add") @Log(title = "招生录取流程状态", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -102,7 +102,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 修改招生录取流程状态 */ - // @SaCheckPermission("zsjy:enrollment:process:edit") + @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "招生录取流程状态", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -113,7 +113,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 删除招生录取流程状态 */ - // @SaCheckPermission("zsjy:enrollment:process:remove") + @SaCheckPermission("zsjy:enrollment:process:remove") @Log(title = "招生录取流程状态", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -123,7 +123,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 初始化流程状态 */ - // @SaCheckPermission("zsjy:enrollment:process:init") + @SaCheckPermission("zsjy:enrollment:process:init") @Log(title = "初始化招生录取流程", businessType = BusinessType.INSERT) @PostMapping("/init") public R initProcess(@RequestParam("enrollmentId") Long enrollmentId, @RequestParam("studentName") String studentName, @RequestParam("idCard") String idCard) { @@ -133,7 +133,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 信息审核 */ - // @SaCheckPermission("zsjy:enrollment:process:audit") + @SaCheckPermission("zsjy:enrollment:process:audit") @Log(title = "招生信息审核", businessType = BusinessType.UPDATE) @PostMapping("/infoAudit") public R infoAudit(@RequestParam("processId") Long processId, @RequestParam("auditResult") String auditResult, @RequestParam(value = "auditOpinion", required = false) String auditOpinion) { @@ -143,7 +143,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 录取处理 */ - // @SaCheckPermission("zsjy:enrollment:process:admission") + @SaCheckPermission("zsjy:enrollment:process:admission") @Log(title = "招生录取处理", businessType = BusinessType.UPDATE) @PostMapping("/admissionProcess") public R admissionProcess(@RequestParam("processId") Long processId, @RequestParam("admissionResult") String admissionResult, @@ -155,7 +155,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 获取流程统计数据 */ - // @SaCheckPermission("zsjy:enrollment:process:query") + @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/statistics") public R> getStatistics() { List allProcesses = enrollmentProcessService.queryList(new ZsjyEnrollmentProcessBo()); @@ -173,7 +173,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 最终确认 */ - // @SaCheckPermission("zsjy:enrollment:process:final") + @SaCheckPermission("zsjy:enrollment:process:final") @Log(title = "招生最终确认", businessType = BusinessType.UPDATE) @PostMapping("/finalConfirm") public R finalConfirm(@RequestParam("processId") Long processId, @RequestParam("finalResult") String finalResult, @RequestParam(value = "finalOpinion", required = false) String finalOpinion) { @@ -183,7 +183,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 从报名信息创建流程 */ - // @SaCheckPermission("zsjy:enrollment:process:add") + @SaCheckPermission("zsjy:enrollment:process:add") @Log(title = "创建录取流程", businessType = BusinessType.INSERT) @PostMapping("/createFromEnrollment") public R createFromEnrollment(@RequestParam("enrollmentId") Long enrollmentId) { @@ -193,7 +193,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 同步流程状态 */ - // @SaCheckPermission("zsjy:enrollment:process:edit") + @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "同步流程状态", businessType = BusinessType.UPDATE) @PostMapping("/syncStatus") public R syncStatus(@RequestParam("id") Long id) { @@ -204,7 +204,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 查询待处理的流程列表 */ - // @SaCheckPermission("zsjy:enrollment:process:query") + @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/pending") public TableDataInfo getPendingList(ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { // 查询当前用户的待处理流程 @@ -214,7 +214,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 根据状态查询流程列表 */ - // @SaCheckPermission("zsjy:enrollment:process:query") + @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/status/{status}") public TableDataInfo getListByStatus(@PathVariable("status") String status, ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { bo.setCurrentStatus(status); @@ -224,7 +224,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 搜索流程 */ - // @SaCheckPermission("zsjy:enrollment:process:query") + @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/search") public TableDataInfo searchProcess(@RequestParam("keyword") String keyword, ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { bo.setStudentName(keyword); // 按学生姓名搜索 @@ -234,7 +234,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 确认缴费 */ - // @SaCheckPermission("zsjy:enrollment:process:edit") + @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "确认缴费", businessType = BusinessType.UPDATE) @PostMapping("/confirmPayment") public R confirmPayment(@RequestParam("processId") Long processId) { @@ -249,7 +249,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 完成流程 */ - // @SaCheckPermission("zsjy:enrollment:process:edit") + @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "完成录取流程", businessType = BusinessType.UPDATE) @PostMapping("/complete") public R completeProcess(@RequestParam("processId") Long processId) { @@ -263,7 +263,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 驳回流程 */ - // @SaCheckPermission("zsjy:enrollment:process:edit") + @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "驳回录取流程", businessType = BusinessType.UPDATE) @PostMapping("/reject") public R rejectProcess(@RequestParam("processId") Long processId, @RequestParam("rejectReason") String rejectReason) { @@ -277,7 +277,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 重置流程 */ - // @SaCheckPermission("zsjy:enrollment:process:edit") + @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "重置录取流程", businessType = BusinessType.UPDATE) @PostMapping("/reset") public R resetProcess(@RequestParam("processId") Long processId) { @@ -295,7 +295,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { /** * 查询当前用户角色需要审核的数据列表 */ - // @SaCheckPermission("zsjy:enrollment:process:audit") + @SaCheckPermission("zsjy:enrollment:process:audit") @GetMapping("/myAudit") public TableDataInfo getMyAuditList(PageQuery pageQuery) { return enrollmentProcessService.queryMyAuditList(pageQuery); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentStatisticsController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentStatisticsController.java index 027688a2..ee842217 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentStatisticsController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentStatisticsController.java @@ -36,7 +36,7 @@ public class ZsjyEnrollmentStatisticsController extends BaseController { /** * 获取报名录取信息统计数据 */ - // @SaCheckPermission("zsjy:enrollment:statistics:list") + @SaCheckPermission("zsjy:enrollment:statistics:list") @GetMapping("/list") public TableDataInfo getStatistics(ZsjyEnrollmentStatisticsQueryVo queryVo, PageQuery pageQuery) { @@ -49,7 +49,7 @@ public class ZsjyEnrollmentStatisticsController extends BaseController { /** * 获取报名录取信息汇总统计 */ - // @SaCheckPermission("zsjy:enrollment:statistics:summary") + @SaCheckPermission("zsjy:enrollment:statistics:summary") @GetMapping("/summary") public R> getSummary(ZsjyEnrollmentStatisticsQueryVo queryVo) { log.info("接收到获取报名录取信息汇总统计请求，查询条件: {}", queryVo); @@ -61,7 +61,7 @@ public class ZsjyEnrollmentStatisticsController extends BaseController { /** * 获取统计维度选项数据 */ - // @SaCheckPermission("zsjy:enrollment:statistics:dimensions") + @SaCheckPermission("zsjy:enrollment:statistics:dimensions") @GetMapping("/dimensions") public R>>> getDimensions() { log.info("接收到获取统计维度选项数据请求"); @@ -74,7 +74,7 @@ public class ZsjyEnrollmentStatisticsController extends BaseController { * 导出统计数据 */ @Log(title = "导出报名录取统计数据", businessType = BusinessType.EXPORT) - // @SaCheckPermission("zsjy:enrollment:statistics:export") + @SaCheckPermission("zsjy:enrollment:statistics:export") @PostMapping("/export") public void export(@RequestBody ZsjyEnrollmentStatisticsQueryVo queryVo) { log.info("接收到导出报名录取统计数据请求，查询条件: {}", queryVo); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java index dc8b40cb..4abecf6f 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java @@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -41,7 +42,7 @@ public class ZsjyGraduateInfoController extends BaseController { /** * 查询毕业生信息列表 */ - // @SaCheckPermission("zsjy:graduate:list") + @SaCheckPermission("zsjy:graduate:list") @GetMapping("/list") public TableDataInfo list(ZsjyGraduateInfoBo bo, PageQuery pageQuery) { return graduateInfoService.queryPageList(bo, pageQuery); @@ -50,7 +51,7 @@ public class ZsjyGraduateInfoController extends BaseController { /** * 导出毕业生信息列表 */ - // @SaCheckPermission("zsjy:graduate:export") + @SaCheckPermission("zsjy:graduate:export") @Log(title = "毕业生信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ZsjyGraduateInfoBo bo, HttpServletResponse response) { @@ -63,7 +64,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("zsjy:graduate:query") + @SaCheckPermission("zsjy:graduate:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -73,7 +74,7 @@ public class ZsjyGraduateInfoController extends BaseController { /** * 新增毕业生信息 */ - // @SaCheckPermission("zsjy:graduate:add") + @SaCheckPermission("zsjy:graduate:add") @Log(title = "毕业生信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -84,7 +85,7 @@ public class ZsjyGraduateInfoController extends BaseController { /** * 修改毕业生信息 */ - // @SaCheckPermission("zsjy:graduate:edit") + @SaCheckPermission("zsjy:graduate:edit") @Log(title = "毕业生信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -97,7 +98,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("zsjy:graduate:remove") + @SaCheckPermission("zsjy:graduate:remove") @Log(title = "毕业生信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -110,7 +111,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param studentNo 学号 */ - // @SaCheckPermission("zsjy:graduate:query") + @SaCheckPermission("zsjy:graduate:query") @GetMapping("/student/{studentNo}") public R getByStudentNo(@NotBlank(message = "学号不能为空") @PathVariable("studentNo") String studentNo) { @@ -122,7 +123,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param idCard 身份证号 */ - // @SaCheckPermission("zsjy:graduate:query") + @SaCheckPermission("zsjy:graduate:query") @GetMapping("/idcard/{idCard}") public R getByIdCard(@NotBlank(message = "身份证号不能为空") @PathVariable("idCard") String idCard) { @@ -130,11 +131,9 @@ public class ZsjyGraduateInfoController extends BaseController { } /** - * 校验学号是否唯一 - * - * @param studentNo 学号 - * @param id 主键ID（修改时传入） + * 校验学号是否唯一（须具备新增或修改权限，防止枚举） */ + @SaCheckPermission(value = {"zsjy:graduate:add", "zsjy:graduate:edit"}, mode = SaMode.OR) @GetMapping("/checkStudentNo") public R checkStudentNoUnique(@NotBlank(message = "学号不能为空") String studentNo, Long id) { @@ -142,11 +141,9 @@ public class ZsjyGraduateInfoController extends BaseController { } /** - * 校验身份证号是否唯一 - * - * @param idCard 身份证号 - * @param id 主键ID（修改时传入） + * 校验身份证号是否唯一（须具备新增或修改权限，防止枚举） */ + @SaCheckPermission(value = {"zsjy:graduate:add", "zsjy:graduate:edit"}, mode = SaMode.OR) @GetMapping("/checkIdCard") public R checkIdCardUnique(@NotBlank(message = "身份证号不能为空") String idCard, Long id) { @@ -160,7 +157,7 @@ public class ZsjyGraduateInfoController extends BaseController { * @param auditStatus 审核状态 * @param auditRemark 审核意见 */ - // @SaCheckPermission("zsjy:graduate:audit") + @SaCheckPermission("zsjy:graduate:audit") @Log(title = "毕业生信息审核", businessType = BusinessType.UPDATE) @PutMapping("/audit/{id}") public R audit(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, @@ -176,7 +173,7 @@ public class ZsjyGraduateInfoController extends BaseController { * @param auditStatus 审核状态 * @param auditRemark 审核意见 */ - // @SaCheckPermission("zsjy:graduate:audit") + @SaCheckPermission("zsjy:graduate:audit") @Log(title = "毕业生信息批量审核", businessType = BusinessType.UPDATE) @PutMapping("/batchAudit") public R batchAudit(@NotEmpty(message = "主键不能为空") @RequestBody Long[] ids, @@ -188,7 +185,7 @@ public class ZsjyGraduateInfoController extends BaseController { /** * 统计总体就业情况 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/overall") public R getOverallStatistics() { return R.ok(graduateInfoService.getOverallStatistics()); @@ -199,7 +196,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param graduationYear 毕业年份 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/major") public R> getStatisticsByMajor(Integer graduationYear) { return R.ok(graduateInfoService.getStatisticsByMajor(graduationYear)); @@ -210,7 +207,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param graduationYear 毕业年份 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/college") public R> getStatisticsByCollege(Integer graduationYear) { return R.ok(graduateInfoService.getStatisticsByCollege(graduationYear)); @@ -221,7 +218,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param graduationYear 毕业年份 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/employment") public R> getStatisticsByEmploymentStatus(Integer graduationYear) { return R.ok(graduateInfoService.getStatisticsByEmploymentStatus(graduationYear)); @@ -232,7 +229,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param graduationYear 毕业年份 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/company") public R> getStatisticsByCompanyType(Integer graduationYear) { return R.ok(graduateInfoService.getStatisticsByCompanyType(graduationYear)); @@ -243,7 +240,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param graduationYear 毕业年份 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/region") public R> getStatisticsByRegion(Integer graduationYear) { return R.ok(graduateInfoService.getStatisticsByRegion(graduationYear)); @@ -254,7 +251,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param graduationYear 毕业年份 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/salary") public R> getStatisticsBySalaryRange(Integer graduationYear) { return R.ok(graduateInfoService.getStatisticsBySalaryRange(graduationYear)); @@ -263,7 +260,7 @@ public class ZsjyGraduateInfoController extends BaseController { /** * 按年份统计历年就业情况 */ - // @SaCheckPermission("zsjy:graduate:statistics") + @SaCheckPermission("zsjy:graduate:statistics") @GetMapping("/statistics/year") public R> getStatisticsByYear() { return R.ok(graduateInfoService.getStatisticsByYear()); @@ -272,7 +269,7 @@ public class ZsjyGraduateInfoController extends BaseController { /** * 查询待审核的毕业生信息数量 */ - // @SaCheckPermission("zsjy:graduate:query") + @SaCheckPermission("zsjy:graduate:query") @GetMapping("/pendingCount") public R getPendingAuditCount() { return R.ok(graduateInfoService.getPendingAuditCount()); @@ -283,7 +280,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param collegeId 学院ID */ - // @SaCheckPermission("zsjy:graduate:query") + @SaCheckPermission("zsjy:graduate:query") @GetMapping("/college/{collegeId}") public R> getListByCollegeId(@NotNull(message = "学院ID不能为空") @PathVariable("collegeId") Long collegeId, @@ -296,7 +293,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param majorId 专业ID */ - // @SaCheckPermission("zsjy:graduate:query") + @SaCheckPermission("zsjy:graduate:query") @GetMapping("/major/{majorId}") public R> getListByMajorId(@NotNull(message = "专业ID不能为空") @PathVariable("majorId") Long majorId, @@ -309,7 +306,7 @@ public class ZsjyGraduateInfoController extends BaseController { * * @param classId 班级ID */ - // @SaCheckPermission("zsjy:graduate:query") + @SaCheckPermission("zsjy:graduate:query") @GetMapping("/class/{classId}") public R> getListByClassId(@NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId, diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java index b3335de4..b60c057a 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java @@ -42,7 +42,7 @@ public class ZsjyInternshipDailyController extends BaseController { * 查询实习日常记录列表 */ @Operation(summary = "查询实习日常记录列表", description = "班主任查看学生实习日常记录") - // @SaCheckPermission("zsjy:internshipdaily:list") + @SaCheckPermission("zsjy:internshipdaily:list") @GetMapping("/list") public TableDataInfo list(@Validated ZsjyInternshipDailyQueryBo queryBo, PageQuery pageQuery) { log.info("=== Controller层调试 ==="); @@ -57,7 +57,7 @@ public class ZsjyInternshipDailyController extends BaseController { * 学生签到打卡 */ @Operation(summary = "学生签到打卡", description = "学生进行实习日常签到打卡") - // @SaCheckPermission("zsjy:internshipdaily:checkin") + @SaCheckPermission("zsjy:internshipdaily:checkin") @PostMapping("/checkin") public R checkIn(@Validated(CheckInGroup.class) @RequestBody ZsjyInternshipDailyAddBo addBo) { log.info("=== Controller层调试 ==="); @@ -71,7 +71,7 @@ public class ZsjyInternshipDailyController extends BaseController { * 获取学生考勤日历 */ @Operation(summary = "获取学生考勤日历", description = "查看指定学生的考勤日历数据") - // @SaCheckPermission("zsjy:internshipdaily:calendar") + @SaCheckPermission("zsjy:internshipdaily:calendar") @GetMapping("/calendar") public R>> getCalendar( @Parameter(description = "学生ID", required = true) @RequestParam("studentId") Long studentId, @@ -89,7 +89,7 @@ public class ZsjyInternshipDailyController extends BaseController { * 获取考勤统计数据 */ @Operation(summary = "获取考勤统计数据", description = "查看实习生考勤统计分析") - // @SaCheckPermission("zsjy:internshipdaily:statistics") + @SaCheckPermission("zsjy:internshipdaily:statistics") @GetMapping("/statistics") public R> getStatistics(@Validated ZsjyInternshipDailyQueryBo queryBo) { log.info("=== Controller层调试 ==="); @@ -103,7 +103,7 @@ public class ZsjyInternshipDailyController extends BaseController { * 获取学生个人月度考勤统计（移动端专用） */ @Operation(summary = "获取学生月度统计", description = "获取指定学生的月度考勤统计数据") - // @SaCheckPermission("zsjy:internshipdaily:statistics") + @SaCheckPermission("zsjy:internshipdaily:statistics") @GetMapping("/monthly-statistics") public R> getStudentMonthlyStatistics( @Parameter(description = "学生ID", required = true) @RequestParam("studentId") Long studentId, diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java index dec17cb3..a24e7968 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java @@ -47,7 +47,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 查询学生月度实习总结列表 */ @Operation(summary = "查询学生月度实习总结列表", description = "学生查看自己的月度总结列表") - // @SaCheckPermission("zsjy:internshipmonthly:list") + @SaCheckPermission("zsjy:internshipmonthly:list") @GetMapping("/list") public TableDataInfo list(@Validated ZsjyInternshipMonthlyQueryBo queryBo, PageQuery pageQuery) { log.info("=== Controller层调试 ==="); @@ -62,7 +62,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 查询学生月度实习总结详细信息 */ @Operation(summary = "查询学生月度实习总结详细信息", description = "根据ID查询月度总结详情") - // @SaCheckPermission("zsjy:internshipmonthly:query") + @SaCheckPermission("zsjy:internshipmonthly:query") @GetMapping("/{monthlyId}") public R getInfo(@Parameter(description = "月度总结ID") @PathVariable("monthlyId") Long monthlyId) { @@ -74,7 +74,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 新增学生月度实习总结 */ @Operation(summary = "新增学生月度实习总结", description = "学生创建新的月度总结") - // @SaCheckPermission("zsjy:internshipmonthly:add") + @SaCheckPermission("zsjy:internshipmonthly:add") @PostMapping public R add(@Validated(AddGroup.class) @RequestBody ZsjyInternshipMonthlyAddBo addBo) { log.info("新增月度总结: {}", addBo); @@ -89,7 +89,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 修改学生月度实习总结 */ @Operation(summary = "修改学生月度实习总结", description = "学生编辑自己的月度总结") - // @SaCheckPermission("zsjy:internshipmonthly:edit") + @SaCheckPermission("zsjy:internshipmonthly:edit") @PutMapping public R edit(@Validated(EditGroup.class) @RequestBody ZsjyInternshipMonthlyAddBo addBo) { log.info("修改月度总结: {}", addBo); @@ -104,7 +104,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 删除学生月度实习总结 */ @Operation(summary = "删除学生月度实习总结", description = "学生删除自己的草稿状态月度总结") - // @SaCheckPermission("zsjy:internshipmonthly:remove") + @SaCheckPermission("zsjy:internshipmonthly:remove") @DeleteMapping("/{monthlyIds}") public R remove(@Parameter(description = "月度总结ID串") @PathVariable("monthlyIds") Long[] monthlyIds) { @@ -120,7 +120,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 提交月度总结审批 */ @Operation(summary = "提交月度总结审批", description = "学生提交月度总结给班主任审批") - // @SaCheckPermission("zsjy:internshipmonthly:submit") + @SaCheckPermission("zsjy:internshipmonthly:submit") @PutMapping("/submit/{monthlyId}") public R submit(@Parameter(description = "月度总结ID") @PathVariable("monthlyId") Long monthlyId) { @@ -136,7 +136,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 自动保存草稿 */ @Operation(summary = "自动保存草稿", description = "学生编辑时自动保存草稿") - // @SaCheckPermission("zsjy:internshipmonthly:autosave") + @SaCheckPermission("zsjy:internshipmonthly:autosave") @PostMapping("/autosave") public R autoSave(@RequestBody ZsjyInternshipMonthlyAddBo addBo) { log.info("自动保存草稿: {}", addBo); @@ -151,7 +151,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 检查月份是否存在总结 */ @Operation(summary = "检查月份是否存在总结", description = "检查学生某月是否已有总结记录") - // @SaCheckPermission("zsjy:internshipmonthly:check") + @SaCheckPermission("zsjy:internshipmonthly:check") @GetMapping("/check/{summaryMonth}") public R checkMonth(@Parameter(description = "总结月份") @PathVariable("summaryMonth") String summaryMonth, @@ -167,7 +167,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 获取月度总结模板 */ @Operation(summary = "获取月度总结模板", description = "获取指定月份的总结模板信息") - // @SaCheckPermission("zsjy:internshipmonthly:template") + @SaCheckPermission("zsjy:internshipmonthly:template") @GetMapping("/template/{summaryMonth}") public R getTemplate(@Parameter(description = "总结月份") @PathVariable("summaryMonth") String summaryMonth) { @@ -181,7 +181,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 查询学生指定实习的月度总结列表 */ @Operation(summary = "查询学生指定实习的月度总结列表", description = "查询学生某个实习的所有月度总结") - // @SaCheckPermission("zsjy:internshipmonthly:list") + @SaCheckPermission("zsjy:internshipmonthly:list") @GetMapping("/internship/{internshipId}") public R> listByInternship(@Parameter(description = "实习ID") @PathVariable("internshipId") Long internshipId) { @@ -195,7 +195,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 统计学生各状态的总结数量 */ @Operation(summary = "统计学生各状态的总结数量", description = "统计学生草稿、待审核、已审核等状态的总结数量") - // @SaCheckPermission("zsjy:internshipmonthly:statistics") + @SaCheckPermission("zsjy:internshipmonthly:statistics") @GetMapping("/statistics") public R> statistics() { log.info("统计学生月度总结状态"); @@ -208,7 +208,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 获取学生当前实习信息 */ @Operation(summary = "获取学生当前实习信息", description = "获取当前登录学生的进行中实习信息") - // @SaCheckPermission("zsjy:internshipmonthly:add") + @SaCheckPermission("zsjy:internshipmonthly:add") @GetMapping("/current-internship") public R> getCurrentInternship() { log.info("获取学生当前实习信息"); @@ -225,7 +225,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { * 导出学生月度实习总结 */ @Operation(summary = "导出学生月度实习总结", description = "导出学生的月度总结数据") - // @SaCheckPermission("zsjy:internshipmonthly:export") + @SaCheckPermission("zsjy:internshipmonthly:export") @Log(title = "学生月度实习总结", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(@RequestBody ZsjyInternshipMonthlyQueryBo queryBo, HttpServletResponse response) { diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java index 84e978da..b21b67a3 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java @@ -47,7 +47,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 查询待审核的学生月度实习总结列表 */ @Operation(summary = "查询待审核的学生月度实习总结列表", description = "班主任查看待审核的月度总结列表") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @GetMapping("/pending") public TableDataInfo listPending(@Validated ZsjyInternshipMonthlyReviewQueryBo queryBo, PageQuery pageQuery) { log.info("=== 审核Controller层调试 ==="); @@ -62,7 +62,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 查询所有审核记录列表 (包含已审核和待审核) */ @Operation(summary = "查询所有审核记录列表", description = "班主任查看所有审核记录") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @GetMapping("/list") public TableDataInfo listAll(@Validated ZsjyInternshipMonthlyReviewQueryBo queryBo, PageQuery pageQuery) { log.info("=== 审核Controller层调试 ==="); @@ -77,7 +77,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 查询学生月度实习总结审核详情 */ @Operation(summary = "查询学生月度实习总结审核详情", description = "根据ID查询月度总结审核详情") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @GetMapping("/{monthlyId}/detail") public R getReviewDetail(@Parameter(description = "月度总结ID") @PathVariable("monthlyId") Long monthlyId) { @@ -89,7 +89,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 单个审核学生月度实习总结 */ @Operation(summary = "单个审核学生月度实习总结", description = "班主任对单个月度总结进行审核") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @Log(title = "学生月度实习总结审核", businessType = BusinessType.UPDATE) @PostMapping("/approve") public R approve(@Validated(AddGroup.class) @RequestBody ZsjyInternshipMonthlyReviewBo reviewBo) { @@ -107,7 +107,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 批量审核学生月度实习总结 */ @Operation(summary = "批量审核学生月度实习总结", description = "班主任批量审核多个月度总结") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @Log(title = "学生月度实习总结批量审核", businessType = BusinessType.UPDATE) @PostMapping("/batch-approve") public R> batchApprove(@Validated(AddGroup.class) @RequestBody ZsjyInternshipMonthlyBatchReviewBo batchReviewBo) { @@ -121,7 +121,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 查询审核统计信息 */ @Operation(summary = "查询审核统计信息", description = "获取审核工作的统计数据") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @GetMapping("/statistics") public R> getStatistics(@Validated ZsjyInternshipMonthlyReviewQueryBo queryBo) { log.info("查询审核统计信息: {}", queryBo); @@ -134,7 +134,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 查询审核历史记录 */ @Operation(summary = "查询审核历史记录", description = "查看已完成的审核记录") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @GetMapping("/history") public TableDataInfo getHistory(@Validated ZsjyInternshipMonthlyReviewQueryBo queryBo, PageQuery pageQuery) { log.info("查询审核历史记录: {}", queryBo); @@ -146,7 +146,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { * 导出审核记录 */ @Operation(summary = "导出审核记录", description = "导出学生月度总结审核记录") - // @SaCheckPermission("zsjy:internshipmonthly:review") + @SaCheckPermission("zsjy:internshipmonthly:review") @Log(title = "学生月度实习总结审核记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(@RequestBody ZsjyInternshipMonthlyReviewQueryBo queryBo, HttpServletResponse response) { diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java index f8854699..d8f551a8 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java @@ -47,7 +47,7 @@ public class ZsjyInternshipVisitController extends BaseController { * 查询班主任走访列表 */ @Operation(summary = "查询班主任走访列表") - // @SaCheckPermission("zsjy:internshipVisit:list") + @SaCheckPermission("zsjy:internshipVisit:list") @GetMapping("/list") public TableDataInfo list(ZsjyInternshipVisitQueryBo bo, PageQuery pageQuery) { return zsjyInternshipVisitService.queryPageList(bo, pageQuery); @@ -57,7 +57,7 @@ public class ZsjyInternshipVisitController extends BaseController { * 导出班主任走访列表 */ @Operation(summary = "导出班主任走访列表") - // @SaCheckPermission("zsjy:internshipVisit:export") + @SaCheckPermission("zsjy:internshipVisit:export") @Log(title = "班主任走访", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ZsjyInternshipVisitQueryBo bo, HttpServletResponse response) { @@ -69,7 +69,7 @@ public class ZsjyInternshipVisitController extends BaseController { * 获取班主任走访详细信息 */ @Operation(summary = "获取班主任走访详细信息") - // @SaCheckPermission("zsjy:internshipVisit:query") + @SaCheckPermission("zsjy:internshipVisit:query") @GetMapping("/{visitId}") @Parameters({ @Parameter(name = "visitId", description = "走访记录ID", required = true) @@ -83,7 +83,7 @@ public class ZsjyInternshipVisitController extends BaseController { * 新增班主任走访 */ @Operation(summary = "新增班主任走访") - // @SaCheckPermission("zsjy:internshipVisit:add") + @SaCheckPermission("zsjy:internshipVisit:add") @Log(title = "班主任走访", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -95,7 +95,7 @@ public class ZsjyInternshipVisitController extends BaseController { * 修改班主任走访 */ @Operation(summary = "修改班主任走访") - // @SaCheckPermission("zsjy:internshipVisit:edit") + @SaCheckPermission("zsjy:internshipVisit:edit") @Log(title = "班主任走访", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -107,7 +107,7 @@ public class ZsjyInternshipVisitController extends BaseController { * 删除班主任走访 */ @Operation(summary = "删除班主任走访") - // @SaCheckPermission("zsjy:internshipVisit:remove") + @SaCheckPermission("zsjy:internshipVisit:remove") @Log(title = "班主任走访", businessType = BusinessType.DELETE) @DeleteMapping("/{visitIds}") @Parameters({ @@ -122,7 +122,7 @@ public class ZsjyInternshipVisitController extends BaseController { * 获取可选项列表（学生选择） */ @Operation(summary = "获取可选项列表") - // @SaCheckPermission("zsjy:internshipVisit:list") + @SaCheckPermission("zsjy:internshipVisit:list") @GetMapping("/options") public R> getOptions() { List list = zsjyInternshipVisitService.getStudentOptions(); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java index ef01240a..b827fa33 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java @@ -40,7 +40,7 @@ public class ZsjyJobPositionController extends BaseController { /** * 查询招聘岗位列表 */ - // @SaCheckPermission("zsjy:position:list") + @SaCheckPermission("zsjy:position:list") @GetMapping("/list") public TableDataInfo list(ZsjyJobPositionBo bo, PageQuery pageQuery) { return jobPositionService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class ZsjyJobPositionController extends BaseController { /** * 导出招聘岗位列表 */ - // @SaCheckPermission("zsjy:position:export") + @SaCheckPermission("zsjy:position:export") @Log(title = "招聘岗位", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ZsjyJobPositionBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class ZsjyJobPositionController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("zsjy:position:query") + @SaCheckPermission("zsjy:position:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(jobPositionService.queryById(id)); @@ -71,7 +71,7 @@ public class ZsjyJobPositionController extends BaseController { /** * 新增招聘岗位 */ - // @SaCheckPermission("zsjy:position:add") + @SaCheckPermission("zsjy:position:add") @Log(title = "招聘岗位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class ZsjyJobPositionController extends BaseController { /** * 修改招聘岗位 */ - // @SaCheckPermission("zsjy:position:edit") + @SaCheckPermission("zsjy:position:edit") @Log(title = "招聘岗位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class ZsjyJobPositionController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("zsjy:position:remove") + @SaCheckPermission("zsjy:position:remove") @Log(title = "招聘岗位", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -105,7 +105,7 @@ public class ZsjyJobPositionController extends BaseController { /** * 获取企业下的岗位列表 */ - // @SaCheckPermission("zsjy:position:list") + @SaCheckPermission("zsjy:position:list") @GetMapping("/enterprise/{enterpriseId}") public R> listByEnterpriseId(@NotNull(message = "企业ID不能为空") @PathVariable("enterpriseId") Long enterpriseId) { return R.ok(jobPositionService.queryListByEnterpriseId(enterpriseId)); @@ -114,7 +114,7 @@ public class ZsjyJobPositionController extends BaseController { /** * 获取岗位下拉选项 */ - // @SaCheckPermission("zsjy:position:list") + @SaCheckPermission("zsjy:position:list") @GetMapping("/options") public R> getOptions(@RequestParam(value = "enterpriseId", required = false) Long enterpriseId) { ZsjyJobPositionBo bo = new ZsjyJobPositionBo(); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java index 6f52c1d4..b7bc3519 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java @@ -48,7 +48,7 @@ public class ZsjyQrCodeController extends BaseController { * 查询二维码信息列表 */ @Operation(summary = "查询二维码列表", description = "分页查询二维码信息列表") - // @SaCheckPermission("zsjy:qrcode:list") + @SaCheckPermission("zsjy:qrcode:list") @GetMapping("/list") public TableDataInfo list(@Validated ZsjyQrCodeBo bo, PageQuery pageQuery) { return qrCodeService.queryPageList(bo, pageQuery); @@ -58,7 +58,7 @@ public class ZsjyQrCodeController extends BaseController { * 导出二维码信息列表 */ @Operation(summary = "导出二维码列表", description = "导出二维码信息到Excel") - // @SaCheckPermission("zsjy:qrcode:export") + @SaCheckPermission("zsjy:qrcode:export") @Log(title = "二维码管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(@Validated ZsjyQrCodeBo bo, HttpServletResponse response) { @@ -70,7 +70,7 @@ public class ZsjyQrCodeController extends BaseController { * 获取二维码信息详细信息 */ @Operation(summary = "获取二维码详情", description = "根据ID获取二维码详细信息") - // @SaCheckPermission("zsjy:qrcode:query") + @SaCheckPermission("zsjy:qrcode:query") @GetMapping("/{id}") public R getInfo( @Parameter(description = "二维码ID", required = true) @@ -82,7 +82,7 @@ public class ZsjyQrCodeController extends BaseController { * 新增二维码信息 */ @Operation(summary = "新增二维码", description = "创建新的二维码") - // @SaCheckPermission("zsjy:qrcode:add") + @SaCheckPermission("zsjy:qrcode:add") @Log(title = "二维码管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -94,7 +94,7 @@ public class ZsjyQrCodeController extends BaseController { * 修改二维码信息 */ @Operation(summary = "修改二维码", description = "修改二维码信息") - // @SaCheckPermission("zsjy:qrcode:edit") + @SaCheckPermission("zsjy:qrcode:edit") @Log(title = "二维码管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -106,7 +106,7 @@ public class ZsjyQrCodeController extends BaseController { * 删除二维码信息 */ @Operation(summary = "删除二维码", description = "批量删除二维码信息") - // @SaCheckPermission("zsjy:qrcode:remove") + @SaCheckPermission("zsjy:qrcode:remove") @Log(title = "二维码管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove( @@ -152,7 +152,7 @@ public class ZsjyQrCodeController extends BaseController { * 生成新的访问令牌 */ @Operation(summary = "生成Token", description = "生成新的访问令牌") - // @SaCheckPermission("zsjy:qrcode:token") + @SaCheckPermission("zsjy:qrcode:token") @PostMapping("/generate-token") public R generateToken() { return R.ok(qrCodeService.generateAccessToken()); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java index 312eb7ae..65156238 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java @@ -38,7 +38,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { /** * 查询招聘海报列表 */ - // @SaCheckPermission("zsjy:poster:list") + @SaCheckPermission("zsjy:poster:list") @GetMapping("/list") public TableDataInfo list(ZsjyRecruitmentPosterBo bo, PageQuery pageQuery) { return recruitmentPosterService.queryPageList(bo, pageQuery); @@ -47,7 +47,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { /** * 导出招聘海报列表 */ - // @SaCheckPermission("zsjy:poster:export") + @SaCheckPermission("zsjy:poster:export") @Log(title = "招聘海报", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ZsjyRecruitmentPosterBo bo, HttpServletResponse response) { @@ -60,7 +60,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { * * @param id 主键 */ - // @SaCheckPermission("zsjy:poster:query") + @SaCheckPermission("zsjy:poster:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(recruitmentPosterService.queryById(id)); @@ -71,7 +71,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { * * @param bo 招聘海报 */ - // @SaCheckPermission("zsjy:poster:add") + @SaCheckPermission("zsjy:poster:add") @Log(title = "招聘海报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping @@ -84,7 +84,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { * * @param bo 招聘海报 */ - // @SaCheckPermission("zsjy:poster:edit") + @SaCheckPermission("zsjy:poster:edit") @Log(title = "招聘海报", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping @@ -97,7 +97,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { * * @param ids 主键串 */ - // @SaCheckPermission("zsjy:poster:remove") + @SaCheckPermission("zsjy:poster:remove") @Log(title = "招聘海报", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { @@ -107,7 +107,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { /** * 生成企业招聘海报 */ - // @SaCheckPermission("zsjy:poster:generate") + @SaCheckPermission("zsjy:poster:generate") @Log(title = "企业招聘海报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/enterprise/{enterpriseId}") @@ -118,7 +118,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { /** * 生成岗位招聘海报 */ - // @SaCheckPermission("zsjy:poster:generate") + @SaCheckPermission("zsjy:poster:generate") @Log(title = "岗位招聘海报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/position/{positionId}") @@ -129,7 +129,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { /** * 导出海报为图片 */ - // @SaCheckPermission("zsjy:poster:export") + @SaCheckPermission("zsjy:poster:export") @Log(title = "导出海报图片", businessType = BusinessType.EXPORT) @GetMapping("/export/image/{id}") public void exportImage(@NotNull(message = "海报ID不能为空") @PathVariable("id") Long id, HttpServletResponse response) { @@ -141,7 +141,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { /** * 导出海报为PDF */ - // @SaCheckPermission("zsjy:poster:export") + @SaCheckPermission("zsjy:poster:export") @Log(title = "导出海报PDF", businessType = BusinessType.EXPORT) @GetMapping("/export/pdf/{id}") public void exportPdf(@NotNull(message = "海报ID不能为空") @PathVariable("id") Long id, HttpServletResponse response) { diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java index 8345d1e2..9ffe1b86 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java @@ -32,7 +32,7 @@ public class ZsjyStatisticsController extends BaseController { /** * 获取统计概览数据 */ - // @SaCheckPermission("zsjy:statistics:view") + @SaCheckPermission("zsjy:statistics:view") @GetMapping("/overview") public R getOverview() { log.info("接收到获取统计概览数据请求"); @@ -44,7 +44,7 @@ public class ZsjyStatisticsController extends BaseController { /** * 获取专业分布统计 */ - // @SaCheckPermission("zsjy:statistics:major:view") + @SaCheckPermission("zsjy:statistics:major:view") @GetMapping("/major") public R> getMajorDistribution() { log.info("接收到获取专业分布统计请求"); @@ -56,7 +56,7 @@ public class ZsjyStatisticsController extends BaseController { /** * 获取地区分布统计 */ - // @SaCheckPermission("zsjy:statistics:region:view") + @SaCheckPermission("zsjy:statistics:region:view") @GetMapping("/region") public R> getRegionDistribution() { log.info("接收到获取地区分布统计请求"); @@ -68,7 +68,7 @@ public class ZsjyStatisticsController extends BaseController { /** * 获取性别比例统计 */ - // @SaCheckPermission("zsjy:statistics:view") + @SaCheckPermission("zsjy:statistics:view") @GetMapping("/gender") public R> getGenderRatio() { log.info("接收到获取性别比例统计请求"); @@ -80,7 +80,7 @@ public class ZsjyStatisticsController extends BaseController { /** * 获取报名趋势统计 */ - // @SaCheckPermission("zsjy:statistics:view") + @SaCheckPermission("zsjy:statistics:view") @GetMapping("/trend") public R> getEnrollmentTrend(@RequestParam(value = "days", required = false) Integer days) { log.info("接收到获取报名趋势统计请求, days={}", days); @@ -92,7 +92,7 @@ public class ZsjyStatisticsController extends BaseController { /** * 获取状态分布统计 */ - // @SaCheckPermission("zsjy:statistics:view") + @SaCheckPermission("zsjy:statistics:view") @GetMapping("/status") public R> getStatusDistribution() { log.info("接收到获取状态分布统计请求"); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/IZsjyEnrollmentInfoService.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/IZsjyEnrollmentInfoService.java index e413945f..da88e036 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/IZsjyEnrollmentInfoService.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/IZsjyEnrollmentInfoService.java @@ -67,14 +67,19 @@ public interface IZsjyEnrollmentInfoService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); /** - * 根据身份证号和准考证号查询报名信息 + * 根据身份证号和准考证号查询报名信息（须双因子同时匹配） * * @param idCard 身份证号 * @param examNumber 准考证号 - * @return 报名信息 + * @return 报名信息；参数不全或未命中时返回 null */ ZsjyEnrollmentInfoVo queryByIdCardAndExamNumber(String idCard, String examNumber); + /** + * 学生端查询：双因子命中后返回脱敏结果（不含住址、成绩等敏感明细） + */ + ZsjyEnrollmentInfoVo queryMaskedByIdCardAndExamNumber(String idCard, String examNumber); + /** * 提交报名信息 * diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyEnrollmentInfoServiceImpl.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyEnrollmentInfoServiceImpl.java index d86af1c6..8a68f95f 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyEnrollmentInfoServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyEnrollmentInfoServiceImpl.java @@ -184,20 +184,84 @@ public class ZsjyEnrollmentInfoServiceImpl implements IZsjyEnrollmentInfoService } /** - * 根据身份证号和准考证号查询报名信息 - * - * @param idCard 身份证号 - * @param examNumber 准考证号 - * @return 报名信息 + * 根据身份证号和准考证号查询报名信息（须双因子同时提供且同时匹配） */ @Override public ZsjyEnrollmentInfoVo queryByIdCardAndExamNumber(String idCard, String examNumber) { + if (StringUtils.isBlank(idCard) || StringUtils.isBlank(examNumber)) { + return null; + } LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(idCard), ZsjyEnrollmentInfo::getIdCard, idCard); - lqw.eq(StringUtils.isNotBlank(examNumber), ZsjyEnrollmentInfo::getExamNumber, examNumber); + lqw.eq(ZsjyEnrollmentInfo::getIdCard, idCard.trim()); + lqw.eq(ZsjyEnrollmentInfo::getExamNumber, examNumber.trim()); return baseMapper.selectVoOne(lqw); } + /** + * 学生端查询：双因子 + 脱敏（隐藏住址、成绩、第二联系方式等） + */ + @Override + public ZsjyEnrollmentInfoVo queryMaskedByIdCardAndExamNumber(String idCard, String examNumber) { + ZsjyEnrollmentInfoVo vo = queryByIdCardAndExamNumber(idCard, examNumber); + if (vo == null) { + return null; + } + return maskForStudentQuery(vo); + } + + private ZsjyEnrollmentInfoVo maskForStudentQuery(ZsjyEnrollmentInfoVo src) { + ZsjyEnrollmentInfoVo vo = new ZsjyEnrollmentInfoVo(); + vo.setId(src.getId()); + vo.setName(maskName(src.getName())); + vo.setIdCard(maskIdCard(src.getIdCard())); + vo.setExamNumber(maskExamNumber(src.getExamNumber())); + vo.setPhone1(maskPhone(src.getPhone1())); + vo.setAppliedMajor(src.getAppliedMajor()); + vo.setMajorCode(src.getMajorCode()); + vo.setCollegeName(src.getCollegeName()); + vo.setCollegeId(src.getCollegeId()); + vo.setEnrollmentStatus(src.getEnrollmentStatus()); + vo.setApplicationTime(src.getApplicationTime()); + // 明确不回传：住址、成绩、第二手机、健康、奖惩等 + return vo; + } + + private String maskName(String name) { + if (StringUtils.isBlank(name)) { + return name; + } + String n = name.trim(); + if (n.length() == 1) { + return "*"; + } + if (n.length() == 2) { + return n.charAt(0) + "*"; + } + return n.charAt(0) + "*".repeat(Math.max(1, n.length() - 2)) + n.charAt(n.length() - 1); + } + + private String maskIdCard(String idCard) { + if (StringUtils.isBlank(idCard) || idCard.length() < 8) { + return "****"; + } + return idCard.substring(0, 4) + "**********" + idCard.substring(idCard.length() - 4); + } + + private String maskExamNumber(String examNumber) { + if (StringUtils.isBlank(examNumber) || examNumber.length() < 4) { + return "****"; + } + int keep = Math.min(3, examNumber.length() / 3); + return examNumber.substring(0, keep) + "****" + examNumber.substring(examNumber.length() - keep); + } + + private String maskPhone(String phone) { + if (StringUtils.isBlank(phone) || phone.length() < 7) { + return "****"; + } + return phone.substring(0, 3) + "****" + phone.substring(phone.length() - 4); + } + /** * 提交报名信息 * diff --git a/mobile/src/pages/enrollment/index.vue b/mobile/src/pages/enrollment/index.vue index 398a388a..24b7672f 100644 --- a/mobile/src/pages/enrollment/index.vue +++ b/mobile/src/pages/enrollment/index.vue @@ -1543,9 +1543,9 @@ export default { // 查询报名状态 async queryStatus() { - if (!this.queryData.idCard && !this.queryData.examNumber) { + if (!this.queryData.idCard || !this.queryData.examNumber) { uni.showToast({ - title: '请输入身份证号或准考证号', + title: '请同时输入身份证号和准考证号', icon: 'none', }); return;