添加鉴权注解@SaCheckPermission

src/main/java/com/xjrsoft/config/SaTokenConfig.java

@@ -6,6 +6,7 @@ import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.exception.NotPermissionException;
 import cn.dev33.satoken.exception.NotRoleException;
 import cn.dev33.satoken.filter.SaServletFilter;
+import cn.dev33.satoken.interceptor.SaInterceptor;
 import cn.dev33.satoken.router.SaHttpMethod;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpUtil;
@@ -46,7 +47,7 @@ public class SaTokenConfig implements WebMvcConfigurer {
         // 注册拦截器
         registry.addInterceptor(getRateLimitInterceptor()).addPathPatterns("/**");
         //satoken 注解鉴权拦截器
-//        registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
+        registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**");
     }
 
     @Bean

src/main/java/com/xjrsoft/module/activity/controller/ActivityEnrollController.java

@@ -47,10 +47,9 @@ public class ActivityEnrollController {
     private final IXjrUserService xjrUserService;
     private final IActivityEnrollService activityEnrollService;
 
-
     @GetMapping(value = "/page")
     @ApiOperation(value = "活动信息列表(分页)")
-    @SaCheckPermission("activityinfo:detail")
+    @SaCheckPermission("activityenroll:page")
     @XjrLog(value = "活动信息列表(分页)")
     public RT<PageOutput<ActivityEnrollPageVo>> page(@Valid ActivityEnrollPageDto dto) {
         Page<ActivityEnrollPageVo> page = activityEnrollService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -67,7 +66,7 @@ public class ActivityEnrollController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("activityenroll:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody List<ChangeStatusDto> dtoList) throws Exception {
         List<ActivityEnroll> enrollList = new ArrayList<>();
@@ -81,10 +80,9 @@ public class ActivityEnrollController {
         return RT.ok(true);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增活动信息")
-    @SaCheckPermission("activityinfo:add")
+    @SaCheckPermission("activityenroll:add")
     @XjrLog(value = "新增活动信息", saveResponseData = true)
     public RT<Boolean> add(@Valid @RequestBody AddActivityEnrollDto dto) {
 
@@ -94,7 +92,7 @@ public class ActivityEnrollController {
 
     @PutMapping
     @ApiOperation(value = "修改活动信息")
-    @SaCheckPermission("activityinfo:edit")
+    @SaCheckPermission("activityenroll:edit")
     @XjrLog(value = "修改活动信息", saveResponseData = true)
     public RT<Boolean> update(@Valid @RequestBody UpdateActivityInfoDto dto) {
 
@@ -105,15 +103,15 @@ public class ActivityEnrollController {
 
     @DeleteMapping
     @ApiOperation(value = "删除活动信息")
-    @SaCheckPermission("activityinfo:delete")
+    @SaCheckPermission("activityenroll:delete")
     @XjrLog(value = "删除活动信息", saveResponseData = true)
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(activityEnrollService.delete(ids));
     }
 
-
     @PostMapping("/export-query")
     @ApiOperation(value = "导出列表")
+    @SaCheckPermission("activityenroll:exportquery")
     @XjrLog(value = "导出列表")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody ActivityEnrollExportDto dto) {
         List<ActivityEnrollPageVo> listVos = activityEnrollService.getList(dto);
@@ -149,14 +147,10 @@ public class ActivityEnrollController {
 
     @PostMapping(value = "/enroll")
     @ApiOperation(value = "报名")
-    @SaCheckPermission("activityinfo:detail")
+    @SaCheckPermission("activityenroll:enroll")
     @XjrLog(value = "报名", saveResponseData = true)
     public RT<Boolean> enroll(@Valid @RequestBody UserEnrollDto dto) {
-        List<ActivityEnroll> enrollList = activityEnrollService.list(
-                new QueryWrapper<ActivityEnroll>().lambda()
-                        .eq(ActivityEnroll::getUserId, StpUtil.getLoginIdAsLong())
-                        .eq(ActivityEnroll::getActivityInfoId, dto.getActivityInfoId())
-        );
+        List<ActivityEnroll> enrollList = activityEnrollService.list(new QueryWrapper<ActivityEnroll>().lambda().eq(ActivityEnroll::getUserId, StpUtil.getLoginIdAsLong()).eq(ActivityEnroll::getActivityInfoId, dto.getActivityInfoId()));
         if (!enrollList.isEmpty()) {
             return RT.error("已报名，无需重复报名");
         }

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -55,7 +55,6 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class ActivityInfoController {
 
-
     private final IActivityInfoService activityInfoService;
     private final IBaseClassService classService;
     private final IDepartmentService departmentService;
@@ -66,7 +65,7 @@ public class ActivityInfoController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "活动信息列表(分页)")
-    @SaCheckPermission("activityinfo:detail")
+    @SaCheckPermission("activityinfo:page")
     @XjrLog(value = "活动信息列表(分页)")
     public RT<PageOutput<ActivityInfoPageVo>> page(@Valid ActivityInfoPageDto dto) {
 
@@ -77,7 +76,7 @@ public class ActivityInfoController {
 
     @GetMapping(value = "/today-schedule")
     @ApiOperation(value = "今日安排(分页)")
-    @SaCheckPermission("activityinfo:detail")
+    @SaCheckPermission("activityinfo:todayschedule")
     @XjrLog(value = "今日安排(分页)")
     public RT<PageOutput<ActivityInfoPageVo>> todaySchedule(@Valid ActivityInfoTodayDto dto) {
         List<String> roleList = StpUtil.getRoleList();
@@ -94,7 +93,7 @@ public class ActivityInfoController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询活动信息信息")
-    @SaCheckPermission("activityinfo:detail")
+    @SaCheckPermission("activityinfo:info")
     @XjrLog(value = "根据id查询活动信息信息", saveResponseData = true)
     public RT<ActivityInfoVo> info(@RequestParam Long id, Integer category) {
         ActivityInfoVo infoVo = null;
@@ -231,7 +230,7 @@ public class ActivityInfoController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("activityinfo:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         ActivityInfo activityInfo = activityInfoService.getById(dto.getId());
@@ -243,7 +242,6 @@ public class ActivityInfoController {
         return RT.ok(true);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增活动信息")
     @SaCheckPermission("activityinfo:add")
@@ -271,10 +269,9 @@ public class ActivityInfoController {
         return RT.ok(activityInfoService.delete(ids));
     }
 
-
     @GetMapping(value = "/effective-list")
     @ApiOperation(value = "移动端活动信息列表(分页)")
-    @SaCheckPermission("activityinfo:detail")
+    @SaCheckPermission("activityinfo:effectivelist")
     @XjrLog(value = "移动端活动信息列表(分页)")
     public RT<PageOutput<ActivityInfoPageVo>> mobilePage(@Valid ActivityInfoPageDto dto) {
         AddActivityEnrollRangeDto rangeDto = new AddActivityEnrollRangeDto();
@@ -313,7 +310,7 @@ public class ActivityInfoController {
 
     @GetMapping(value = "/my-enroll-list")
     @ApiOperation(value = "我的报名记录(分页)")
-    @SaCheckPermission("activityinfo:detail")
+    @SaCheckPermission("activityinfo:myenrolllist")
     @XjrLog(value = "我的报名记录(分页)")
     public RT<PageOutput<ActivityInfoPageVo>> myEnrollList(@Valid ActivityInfoPageDto dto) {
         dto.setLoginUserId(StpUtil.getLoginIdAsLong());
@@ -330,4 +327,5 @@ public class ActivityInfoController {
         PageOutput<ActivityInfoPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityInfoPageVo.class);
         return RT.ok(pageOutput);
     }
+
 }

src/main/java/com/xjrsoft/module/app/controller/AppFuncDesignController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.app.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -48,27 +49,17 @@ public class AppFuncDesignController {
 
     @GetMapping(value = "/page")
     @ApiOperation("app端功能页面设计分页")
+    @SaCheckPermission("appfuncdesign:page")
     @XjrLog(value = "app端功能页面设计分页")
     public R page(AppFuncDesignPageDto dto) {
-
-        IPage<AppFuncDesignPageVo> page = funcDesignService.selectJoinListPage(ConventPage.getPage(dto), AppFuncDesignPageVo.class, MPJWrappers.<AppFuncDesign>lambdaJoin()
-                .like(StrUtil.isNotBlank(dto.getKeyword()), AppMenu::getName, dto.getKeyword())
-                .eq(ObjectUtil.isNotEmpty(dto.getEnabledMark()), AppFuncDesign::getEnabledMark, dto.getEnabledMark())
-                .eq(dto.getFormType() != null, AppFuncDesign::getFormType, dto.getFormType())
-                .select(AppFuncDesign::getId)
-                .select(AppFuncDesign.class, x -> VoToColumnUtil.fieldsToColumns(AppFuncDesignPageVo.class).contains(x.getProperty()))
-                .selectAs(AppMenu::getName, AppFuncDesignPageVo::getName)
-                .selectAs(AppMenu::getRemark, AppFuncDesignPageVo::getMenuRemark)
-                .leftJoin(AppMenu.class, AppMenu::getId, AppFuncDesign::getAppMenuId)
-                .orderByDesc(AppFuncDesign::getCreateDate)
-        );
-
+        IPage<AppFuncDesignPageVo> page = funcDesignService.selectJoinListPage(ConventPage.getPage(dto), AppFuncDesignPageVo.class, MPJWrappers.<AppFuncDesign>lambdaJoin().like(StrUtil.isNotBlank(dto.getKeyword()), AppMenu::getName, dto.getKeyword()).eq(ObjectUtil.isNotEmpty(dto.getEnabledMark()), AppFuncDesign::getEnabledMark, dto.getEnabledMark()).eq(dto.getFormType() != null, AppFuncDesign::getFormType, dto.getFormType()).select(AppFuncDesign::getId).select(AppFuncDesign.class, x -> VoToColumnUtil.fieldsToColumns(AppFuncDesignPageVo.class).contains(x.getProperty())).selectAs(AppMenu::getName, AppFuncDesignPageVo::getName).selectAs(AppMenu::getRemark, AppFuncDesignPageVo::getMenuRemark).leftJoin(AppMenu.class, AppMenu::getId, AppFuncDesign::getAppMenuId).orderByDesc(AppFuncDesign::getCreateDate));
         PageOutput<AppFuncDesignPageVo> pageOutput = ConventPage.getPageOutput(page, AppFuncDesignPageVo.class);
         return R.ok(pageOutput);
     }
 
     @PostMapping
     @ApiOperation(value = "新增app端功能页面设计")
+    @SaCheckPermission("appfuncdesign:add")
     @XjrLog(value = "新增app端功能页面设计", saveResponseData = true)
     public R add(@Valid @RequestBody AddFuncDesignDto dto) {
         return R.ok(funcDesignService.add(dto));
@@ -76,6 +67,7 @@ public class AppFuncDesignController {
 
     @PutMapping
     @ApiOperation(value = "修改app端功能页面设计")
+    @SaCheckPermission("appfuncdesign:edit")
     @XjrLog(value = "修改app端功能页面设计", saveResponseData = true)
     public R update(@Valid @RequestBody UpdateAppFuncDesignDto dto) {
         return R.ok(funcDesignService.modify(dto));
@@ -83,6 +75,7 @@ public class AppFuncDesignController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询数app端功能页面设计详细信息")
+    @SaCheckPermission("appfuncdesign:info")
     @XjrLog(value = "根据id查询数app端功能页面设计详细信息", saveResponseData = true)
     public R info(@RequestParam Long id) {
         AppFuncDesign appFuncDesign = funcDesignService.getById(id);
@@ -91,30 +84,25 @@ public class AppFuncDesignController {
         }
         AppFuncDesignVo appFuncDesignVo = BeanUtil.toBean(appFuncDesign, AppFuncDesignVo.class);
         AppMenu appMenu = appMenuService.getById(appFuncDesign.getAppMenuId());
-
         appFuncDesignVo.setMenuConfigs(BeanUtil.toBean(appMenu, AppMenuVo.class));
-
-
         return R.ok(appFuncDesignVo);
     }
 
-
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("appfuncdesign:delete")
     @XjrLog(value = "删除app端展示页面设计", saveResponseData = true)
     @Transactional(rollbackFor = Exception.class)
     public R delete(@Valid @RequestBody DeleteAppPageDesignDto dto) {
         AppFuncDesign appFuncDesign = funcDesignService.getById(dto.getId());
-
         appMenuService.removeById(appFuncDesign.getAppMenuId());
-
-
         funcDesignService.removeById(dto.getId());
         return R.ok(Boolean.TRUE);
     }
 
     @PutMapping("/update-enable-mark")
     @ApiOperation(value = "修改启用状态")
+    @SaCheckPermission("appfuncdesign:updateenablemark")
     @XjrLog(value = "修改启用状态", saveResponseData = true)
     public R updateEnableMark(@Valid @RequestBody UpdateEnableMarkDto dto) {
         AppFuncDesign appFuncDesign = new AppFuncDesign();

src/main/java/com/xjrsoft/module/app/controller/AppMenuController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.app.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -47,9 +48,9 @@ public class AppMenuController {
 
     @GetMapping("/page")
     @ApiOperation("app菜单分页接口")
+    @SaCheckPermission("appmenu:page")
     @XjrLog(value = "app菜单分页接口")
     public R page(AppMenuPageDto dto) {
-
         LambdaQueryWrapper<AppMenu> queryWrapper = Wrappers.lambdaQuery(AppMenu.class)
                 .eq(StrUtil.isNotBlank(dto.getName()), AppMenu::getName, dto.getName())
                 .eq(StrUtil.isNotBlank(dto.getCode()), AppMenu::getCode, dto.getCode())
@@ -62,12 +63,11 @@ public class AppMenuController {
         return R.ok(pageOutput);
     }
 
-
     @GetMapping("/list")
     @ApiOperation("app菜单 列表 不分页")
+    @SaCheckPermission("appmenu:list")
     @XjrLog(value = "app菜单 列表 不分页")
     public R list(AppMenuListDto dto) {
-
         LambdaQueryWrapper<AppMenu> queryWrapper = Wrappers.lambdaQuery(AppMenu.class)
                 .eq(StrUtil.isNotBlank(dto.getName()), AppMenu::getName, dto.getName())
                 .eq(StrUtil.isNotBlank(dto.getCode()), AppMenu::getCode, dto.getCode())
@@ -76,7 +76,6 @@ public class AppMenuController {
                 .orderByAsc(AppMenu::getSortCode)
                 .select(AppMenu.class, x -> VoToColumnUtil.fieldsToColumns(AppMenuPageVo.class).contains(x.getProperty()));
 
-
         List<AppMenu> list = appMenuService.list(queryWrapper);
 
         List<AppMenuListVo> appMenuListVos = BeanUtil.copyToList(list, AppMenuListVo.class);
@@ -86,29 +85,25 @@ public class AppMenuController {
 
     @PostMapping
     @ApiOperation("新增")
+    @SaCheckPermission("appmenu:add")
     @XjrLog(value = "新增", saveResponseData = true)
     public R add(@Valid @RequestBody AddAppMenuDto dto) {
-
         AppMenu appMenu = BeanUtil.toBean(dto, AppMenu.class);
-
         return R.ok(appMenuService.save(appMenu));
-
     }
 
-
     @PutMapping
     @ApiOperation("修改")
+    @SaCheckPermission("appmenu:edit")
     @XjrLog(value = "修改", saveResponseData = true)
     public R update(@Valid @RequestBody UpdateAppMenuDto dto) {
-
         AppMenu appMenu = BeanUtil.toBean(dto, AppMenu.class);
-
         return R.ok(appMenuService.updateById(appMenu));
-
     }
 
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("appmenu:delete")
     @XjrLog(value = "删除app端展示页面设计")
     public R delete(@Valid @RequestBody List<Long> ids) {
         appMenuService.removeBatchByIds(ids);

src/main/java/com/xjrsoft/module/app/controller/AppPageDesignController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.app.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -44,6 +45,7 @@ public class AppPageDesignController {
 
     @GetMapping(value = "/page")
     @ApiOperation("app端展示页面设计分页")
+    @SaCheckPermission("apppagedesign:page")
     @XjrLog("app端展示页面设计分页")
     public R page(AppPageDesignDto dto) {
         LambdaQueryWrapper<AppPageDesign> queryWrapper = new LambdaQueryWrapper<>();
@@ -61,14 +63,15 @@ public class AppPageDesignController {
 
     @PostMapping
     @ApiOperation(value = "新增app端展示页面设计")
+    @SaCheckPermission("apppagedesign:add")
     @XjrLog("新增app端展示页面设计")
     public R add(@Valid @RequestBody AddAppPageDesignDto dto) {
-
         return R.ok(pageDesignService.add(dto));
     }
 
     @PostMapping("/draft")
     @ApiOperation(value = "app端展示页面设计保存草稿")
+    @SaCheckPermission("apppagedesign:draft")
     @XjrLog("app端展示页面设计保存草稿")
     public R draft(@Valid @RequestBody AppPageDesignDraftDto dto) {
         AppPageDesign bean = BeanUtil.toBean(dto, AppPageDesign.class);
@@ -77,6 +80,7 @@ public class AppPageDesignController {
 
     @PutMapping
     @ApiOperation(value = "修改app端展示页面设计")
+    @SaCheckPermission("apppagedesign:edit")
     @XjrLog("修改app端展示页面设计")
     public R update(@Valid @RequestBody UpdateAppPageDesignDto dto) {
         return R.ok(pageDesignService.modify(dto));
@@ -84,6 +88,7 @@ public class AppPageDesignController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询数app端展示页面设计详细信息")
+    @SaCheckPermission("apppagedesign:info")
     @XjrLog("根据id查询数app端展示页面设计详细信息")
     public R info(@RequestParam Long id) {
         AppPageDesign appPageDesign = pageDesignService.getById(id);
@@ -93,9 +98,9 @@ public class AppPageDesignController {
         return R.ok(BeanUtil.toBean(appPageDesign, AppPageDesign.class));
     }
 
-
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("apppagedesign:delete")
     @XjrLog(value = "删除app端展示页面设计")
     @Transactional(rollbackFor = Exception.class)
     public R delete(@Valid @RequestBody DeleteAppPageDesignDto dto) {
@@ -110,6 +115,7 @@ public class AppPageDesignController {
 
     @PutMapping("/update-enable-mark")
     @ApiOperation(value = "修改启用状态")
+    @SaCheckPermission("apppagedesign:updateenablemark")
     @XjrLog(value = "修改启用状态")
     public R updateEnableMark(@Valid @RequestBody UpdateEnableMarkDto dto) {
         AppPageDesign appPageDesign = new AppPageDesign();

src/main/java/com/xjrsoft/module/app/controller/BaseAppFunctionController.java

@@ -43,14 +43,12 @@ public class BaseAppFunctionController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "APP端功能模块管理列表(分页)")
-    @SaCheckPermission("baseappfunction:detail")
+    @SaCheckPermission("baseappfunction:page")
     @XjrLog(value = "APP端功能模块管理列表(分页)")
     public RT<PageOutput<BaseAppFunctionPageVo>> page(@Valid BaseAppFunctionPageDto dto) {
 
         LambdaQueryWrapper<BaseAppFunction> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .orderByDesc(BaseAppFunction::getId)
-                .select(BaseAppFunction.class, x -> VoToColumnUtil.fieldsToColumns(BaseAppFunctionPageVo.class).contains(x.getProperty()));
+        queryWrapper.orderByDesc(BaseAppFunction::getId).select(BaseAppFunction.class, x -> VoToColumnUtil.fieldsToColumns(BaseAppFunctionPageVo.class).contains(x.getProperty()));
         IPage<BaseAppFunction> page = baseAppFunctionService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseAppFunctionPageVo> pageOutput = ConventPage.getPageOutput(page, BaseAppFunctionPageVo.class);
         return RT.ok(pageOutput);
@@ -58,15 +56,12 @@ public class BaseAppFunctionController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "根据Type返回模块")
-    @SaCheckPermission("baseappfunction:detail")
+    @SaCheckPermission("baseappfunction:list")
     @XjrLog(value = "根据Type返回模块")
     public RT<List<BaseAppFunctionListVo>> list(@Valid BaseAppFunctionListDto dto) {
 
         LambdaQueryWrapper<BaseAppFunction> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .orderByAsc(BaseAppFunction::getSortCode)
-                .eq(BaseAppFunction::getType, dto.getType())
-                .select(BaseAppFunction.class, x -> VoToColumnUtil.fieldsToColumns(BaseAppFunctionListVo.class).contains(x.getProperty()));
+        queryWrapper.orderByAsc(BaseAppFunction::getSortCode).eq(BaseAppFunction::getType, dto.getType()).select(BaseAppFunction.class, x -> VoToColumnUtil.fieldsToColumns(BaseAppFunctionListVo.class).contains(x.getProperty()));
 
         List<BaseAppFunction> list = baseAppFunctionService.list(queryWrapper);
         List<BaseAppFunctionListVo> listVos = BeanUtil.copyToList(list, BaseAppFunctionListVo.class);
@@ -75,7 +70,7 @@ public class BaseAppFunctionController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询APP端功能模块管理信息")
-    @SaCheckPermission("baseappfunction:detail")
+    @SaCheckPermission("baseappfunction:info")
     @XjrLog(value = "根据id查询APP端功能模块管理信息", saveResponseData = true)
     public RT<BaseAppFunctionVo> info(@RequestParam Long id) {
         BaseAppFunction baseAppFunction = baseAppFunctionService.getById(id);

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -38,7 +38,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "/student-page")
     @ApiOperation(value = "考核计划答题列表-学生端(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:studentpage")
     @XjrLog(value = "考核计划答题列表-学生端(分页)")
     public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> studentPage(@Valid AssessmentPlanAnswerPageDto dto) {
         dto.setStudentUserId(StpUtil.getLoginIdAsLong());
@@ -49,7 +49,7 @@ public class AssessmentPlanAnswerController {
 
 //    @GetMapping(value = "/result-page")
 //    @ApiOperation(value="考核计划答题列表-学生端(分页)")
-//    @SaCheckPermission("assessmenttemplateplan:detail")
+//    @SaCheckPermission("assessmentplananswer:resultpage")
 //    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> resultPage(@Valid AssessmentPlanAnswerPageDto dto){
 //        dto.setStudentUserId(StpUtil.getLoginIdAsLong());
 //        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -59,7 +59,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "/teacher-page")
     @ApiOperation(value = "考核计划答题列表-教师端(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:teacherpage")
     @XjrLog(value = "考核计划答题列表-教师端(分页)")
     public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> teacherPage(@Valid AssessmentPlanAnswerPageDto dto) {
         dto.setTeacherId(StpUtil.getLoginIdAsLong());
@@ -71,7 +71,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "/all-class-page")
     @ApiOperation(value = "考核计划答题列表-所有班级(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:allclasspage")
     @XjrLog(value = "考核计划答题列表-所有班级(分页)")
     public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> allClassPage(@Valid AssessmentPlanAnswerPageDto dto) {
 
@@ -86,7 +86,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "/mobile-page")
     @ApiOperation(value = "考核计划答题列表-所有计划(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:mobilepage")
     @XjrLog(value = "考核计划答题列表-所有计划(分页)")
     public RT<List<AssessmentTemplatePlanPageVo>> mobilePage(@Valid AssessmentTemplatePlanPageDto dto) {
         List<AssessmentTemplatePlanPageVo> page = planService.getMobilePage(dto);
@@ -95,7 +95,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "/answer-student-page")
     @ApiOperation(value = "考核计划答题列表-学生答题情况(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:answerstudentpage")
     @XjrLog(value = "考核计划答题列表-学生答题情况(分页)")
     public RT<PageOutput<AssessmentPlanAnswerStudentVo>> answerStudent(@Valid AssessmentPlanAnswerStudentDto dto) {
         Page<AssessmentPlanAnswerStudentVo> page = planService.getAnswerStudent(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -105,7 +105,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "/answer-student-list")
     @ApiOperation(value = "考核计划答题列表-学生答题情况")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:answerstudentlist")
     @XjrLog(value = "考核计划答题列表-学生答题情况")
     public RT<List<AssessmentPlanAnswerStudentVo>> answerStudentList(@Valid AssessmentPlanAnswerStudentDto dto) {
         List<AssessmentPlanAnswerStudentVo> page = planService.getAnswerStudentList(dto);
@@ -114,7 +114,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考核计划信息")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:info")
     @XjrLog(value = "根据id查询考核计划信息", saveResponseData = true)
     public RT<AssessmentTemplatePlanQuestionVo> info(@RequestParam Long id) {
         AssessmentTemplatePlanQuestionVo questionVo = planService.getQuestionsById(id);
@@ -124,10 +124,9 @@ public class AssessmentPlanAnswerController {
         return RT.ok(questionVo);
     }
 
-
     @PostMapping(value = "sure")
     @ApiOperation(value = "班主任确认考核")
-    @SaCheckPermission("assessmenttemplateplan:add")
+    @SaCheckPermission("assessmentplananswer:sure")
     @XjrLog(value = "班主任确认考核", saveResponseData = true)
     public RT<Boolean> add(@Valid @RequestBody AssessmentTemplatePlanSureDto dto) {
         boolean isSuccess = planService.sure(dto);
@@ -136,7 +135,7 @@ public class AssessmentPlanAnswerController {
 
     @PostMapping(value = "save-answer")
     @ApiOperation(value = "提交答题")
-    @SaCheckPermission("assessmenttemplateplan:save-answer")
+    @SaCheckPermission("assessmentplananswer:saveanswer")
     @XjrLog(value = "提交答题", saveResponseData = true)
     public RT<Boolean> saveAnswer(@Valid @RequestBody AssessmentPlanSubmitDto dto) {
         boolean isSuccess = planService.saveAnswer(dto);
@@ -145,7 +144,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "class-result")
     @ApiOperation(value = "班级答题情况")
-    @SaCheckPermission("assessmenttemplateplan:class-result")
+    @SaCheckPermission("assessmentplananswer:classresult")
     @XjrLog(value = "班级答题情况")
     public RT<List<AssessmentPlanAnswerClassResultVo>> classResult(@RequestParam Long id) {
         List<AssessmentPlanAnswerClassResultVo> resultList = planService.getClassResult(id);
@@ -154,7 +153,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "question-result")
     @ApiOperation(value = "每道题的答题情况")
-    @SaCheckPermission("assessmenttemplateplan:question-result")
+    @SaCheckPermission("assessmentplananswer:questionresult")
     @XjrLog(value = "每道题的答题情况", saveResponseData = true)
     public RT<AssessmentTemplatePlanResultVo> questionResult(@RequestParam Long id) {
         AssessmentTemplatePlanResultVo resultList = planService.getQuestionResult(id);
@@ -163,7 +162,7 @@ public class AssessmentPlanAnswerController {
 
     @PostMapping(value = "send-msg")
     @ApiOperation(value = "推送微信通知")
-    @SaCheckPermission("assessmenttemplateplan:send-msg")
+    @SaCheckPermission("assessmentplananswer:sendmsg")
     @XjrLog(value = "推送微信通知", saveResponseData = true)
     public RT<Boolean> questionResult(@Valid @RequestBody AssessmentTemplatePlanSureDto dto) {
         Boolean sendMsg = planService.sendMsg(dto);
@@ -172,7 +171,7 @@ public class AssessmentPlanAnswerController {
 
     @GetMapping(value = "answer-student-result")
     @ApiOperation(value = "每个学生的答题详情")
-    @SaCheckPermission("assessmenttemplateplan:answer-student-result")
+    @SaCheckPermission("assessmentplananswer:answerstudentresult")
     @XjrLog(value = "每个学生的答题详情", saveResponseData = true)
     public RT<AssessmentTemplatePlanAnswerResultVo> studentAnswerResult(@RequestParam Long studentUserId, @RequestParam Long assessmentTemplatePlanId) {
         AssessmentTemplatePlanAnswerResultVo result = planService.getAnswerStudentResult(studentUserId, assessmentTemplatePlanId);
@@ -181,7 +180,7 @@ public class AssessmentPlanAnswerController {
 
     @PostMapping(value = "/answer-export-query")
     @ApiOperation(value = "考核计划答题列表-学生答题情况导出")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmentplananswer:answerexportquery")
     @XjrLog(value = "考核计划答题列表-学生答题情况导出")
     public ResponseEntity<byte[]> answerExportQuery(@Valid @RequestBody AssessmentPlanAnswerStudentDto dto) throws IOException {
         String fileName = "answerExportQuery" + ExcelTypeEnum.XLSX.getValue();

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentTemplateController.java

@@ -41,14 +41,12 @@ public class AssessmentTemplateController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考核模板列表(分页)")
-    @SaCheckPermission("assessmenttemplate:detail")
+    @SaCheckPermission("assessmenttemplate:page")
     @XjrLog(value = "考核模板列表(分页)")
     public RT<PageOutput<AssessmentTemplatePageVo>> page(@Valid AssessmentTemplatePageDto dto) {
 
         LambdaQueryWrapper<AssessmentTemplate> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotEmpty(dto.getName()), AssessmentTemplate::getName, dto.getName())
-                .orderByDesc(AssessmentTemplate::getId)
-                .select(AssessmentTemplate.class, x -> VoToColumnUtil.fieldsToColumns(AssessmentTemplatePageVo.class).contains(x.getProperty()));
+        queryWrapper.like(StrUtil.isNotEmpty(dto.getName()), AssessmentTemplate::getName, dto.getName()).orderByDesc(AssessmentTemplate::getId).select(AssessmentTemplate.class, x -> VoToColumnUtil.fieldsToColumns(AssessmentTemplatePageVo.class).contains(x.getProperty()));
         IPage<AssessmentTemplate> page = assessmentTemplateService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<AssessmentTemplatePageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentTemplatePageVo.class);
         return RT.ok(pageOutput);
@@ -56,7 +54,7 @@ public class AssessmentTemplateController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考核模板信息")
-    @SaCheckPermission("assessmenttemplate:detail")
+    @SaCheckPermission("assessmenttemplate:info")
     @XjrLog(value = "根据id查询考核模板信息", saveResponseData = true)
     public RT<AssessmentTemplateVo> info(@RequestParam Long id) {
         AssessmentTemplateVo assessmentTemplate = assessmentTemplateService.getById(id);

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentTemplatePlanController.java

@@ -39,7 +39,7 @@ public class AssessmentTemplatePlanController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考核计划列表(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmenttemplateplan:page")
     @XjrLog(value = "考核计划列表(分页)")
     public RT<PageOutput<AssessmentTemplatePlanPageVo>> page(@Valid AssessmentTemplatePlanPageDto dto) {
 
@@ -50,7 +50,7 @@ public class AssessmentTemplatePlanController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考核计划信息")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmenttemplateplan:info")
     @XjrLog(value = "根据id查询考核计划信息", saveResponseData = true)
     public RT<AssessmentTemplatePlanVo> info(@RequestParam Long id) {
         AssessmentTemplatePlan assessmentTemplatePlan = planService.getById(id);
@@ -62,7 +62,7 @@ public class AssessmentTemplatePlanController {
 
     @GetMapping(value = "/semester-class")
     @ApiOperation(value = "根据学期id查询被选择过的班级")
-    @SaCheckPermission("assessmenttemplateplan:detail")
+    @SaCheckPermission("assessmenttemplateplan:semesterclass")
     @XjrLog(value = "根据学期id查询被选择过的班级")
     public RT<List<Long>> getSemesterClass(@RequestParam Long id) {
         List<Long> semesterClass = planService.getSemesterClass(id);
@@ -91,7 +91,7 @@ public class AssessmentTemplatePlanController {
 
     @PutMapping(value = "/update-time")
     @ApiOperation(value = "修改考核计划时间")
-    @SaCheckPermission("assessmenttemplateplan:edit")
+    @SaCheckPermission("assessmenttemplateplan:updatetime")
     @XjrLog(value = "修改考核计划时间", saveResponseData = true)
     public RT<Boolean> updateTime(@Valid @RequestBody UpdateAssessmentTemplatePlanTimeDto dto) {
 
@@ -109,7 +109,7 @@ public class AssessmentTemplatePlanController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("assessmenttemplateplan:change-status")
+    @SaCheckPermission("assessmenttemplateplan:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody AssessmentTemplatePlanChangeStatusDto dto) {
         AssessmentTemplatePlan templatePlan = planService.getById(dto.getId());

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -59,7 +59,7 @@ public class WfAssetManageController {
 
     @GetMapping(value = "/buildingfloorclassroomtree")
     @ApiOperation(value = "楼栋楼层教室树")
-    @SaCheckPermission("studentmanager:detail")
+    @SaCheckPermission("wfassetmanage:buildingfloorclassroomtree")
     @XjrLog(value = "楼栋楼层教室树")
     public RT<List<PlaceTreeVo>> buildingFloorClassroomTree() {
         List<PlaceTreeVo> voList = new ArrayList<>();
@@ -158,7 +158,7 @@ public class WfAssetManageController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "资产管理列表(分页)")
-    @SaCheckPermission("wfassetmanage:detail")
+    @SaCheckPermission("wfassetmanage:page")
     @XjrLog(value = "资产管理列表(分页)")
     public RT<PageOutput<WfAssetManagePageVo>> page(@Valid WfAssetManagePageDto dto) {
         IPage<WfAssetManagePageVo> page = wfAssetManageService.getPage(dto);
@@ -168,7 +168,7 @@ public class WfAssetManageController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询资产管理信息")
-    @SaCheckPermission("wfassetmanage:detail")
+    @SaCheckPermission("wfassetmanage:info")
     @XjrLog(value = "根据id查询资产管理信息", saveResponseData = true)
     public RT<WfAssetManageVo> info(@RequestParam Long id) {
         MPJLambdaWrapper<WfAssetManage> wfAssetManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
@@ -223,6 +223,7 @@ public class WfAssetManageController {
 
     @PostMapping("/select-record-export-query")
     @ApiOperation(value = "选中记录导出")
+    @SaCheckPermission("wfassetmanage:selectrecordexportquery")
     @XjrLog(value = "选中记录导出")
     public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid @RequestBody WfAssetManageSelectRecordQueryDto dto) {
 //    @GetMapping("/select-record-export-query")
@@ -234,6 +235,7 @@ public class WfAssetManageController {
 
     @PostMapping("/conditional-search-export-query")
     @ApiOperation(value = "条件搜索导出")
+    @SaCheckPermission("wfassetmanage:conditionalsearchexportquery")
     @XjrLog(value = "条件搜索导出")
     public ResponseEntity<byte[]> assetManageConditionalSearchQuery(@Valid @RequestBody WfAssetManageConditionalSearchQueryDto dto) {
 //    @GetMapping("/conditional-search-export-query")

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageInventoryController.java

@@ -48,14 +48,12 @@ public class WfAssetManageInventoryController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "资产管理盘点列表(分页)")
-    @SaCheckPermission("wfassetmanageinventory:detail")
+    @SaCheckPermission("wfassetmanageinventory:page")
     @XjrLog(value = "资产管理盘点列表(分页)")
     public RT<PageOutput<WfAssetManageInventoryPageVo>> page(@Valid WfAssetManageInventoryPageDto dto) {
 
         LambdaQueryWrapper<WfAssetManageInventory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .orderByDesc(WfAssetManageInventory::getId)
-                .select(WfAssetManageInventory.class, x -> VoToColumnUtil.fieldsToColumns(WfAssetManageInventoryPageVo.class).contains(x.getProperty()));
+        queryWrapper.orderByDesc(WfAssetManageInventory::getId).select(WfAssetManageInventory.class, x -> VoToColumnUtil.fieldsToColumns(WfAssetManageInventoryPageVo.class).contains(x.getProperty()));
         IPage<WfAssetManageInventory> page = wfAssetManageInventoryService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<WfAssetManageInventoryPageVo> pageOutput = ConventPage.getPageOutput(page, WfAssetManageInventoryPageVo.class);
         return RT.ok(pageOutput);
@@ -63,7 +61,7 @@ public class WfAssetManageInventoryController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询资产管理盘点信息")
-    @SaCheckPermission("wfassetmanageinventory:detail")
+    @SaCheckPermission("wfassetmanageinventory:info")
     @XjrLog(value = "根据id查询资产管理盘点信息", saveResponseData = true)
     public RT<WfAssetManageInventoryVo> info(@RequestParam Long id) {
         WfAssetManageInventory wfAssetManageInventory = wfAssetManageInventoryService.getById(id);
@@ -106,6 +104,7 @@ public class WfAssetManageInventoryController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("wfassetmanageinventory:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<WfAssetManageInventoryPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(WfAssetManageInventoryPageVo.class).sheet().doReadSync();
@@ -115,6 +114,7 @@ public class WfAssetManageInventoryController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("wfassetmanageinventory:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid WfAssetManageInventoryPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<WfAssetManageInventoryPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

src/main/java/com/xjrsoft/module/attendance/controller/AttendanceMessageSetController.java

@@ -55,7 +55,7 @@ public class AttendanceMessageSetController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考勤消息设置列表(分页)")
-    @SaCheckPermission("attendancemessageset:detail")
+    @SaCheckPermission("attendancemessageset:page")
     @XjrLog(value = "考勤消息设置列表(分页)")
     public RT<PageOutput<AttendanceMessageSetPageVo>> page(@Valid AttendanceMessageSetPageDto dto) {
 
@@ -70,7 +70,7 @@ public class AttendanceMessageSetController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "考勤消息设置列表")
-    @SaCheckPermission("attendancemessageset:detail")
+    @SaCheckPermission("attendancemessageset:list")
     @XjrLog(value = "考勤消息设置列表")
     public RT<List<AttendanceMessageSetVo>> list(@Valid AttendanceMessageSetDto dto) {
         List<AttendanceMessageSet> list = attendanceMessageSetService.list(MPJWrappers.<AttendanceMessageSet>lambdaJoin().eq(ObjectUtil.isNotNull(dto.getRoleType()) && dto.getRoleType() != 0, AttendanceMessageSet::getRoleType, dto.getRoleType()));
@@ -108,7 +108,7 @@ public class AttendanceMessageSetController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考勤消息设置信息")
-    @SaCheckPermission("attendancemessageset:detail")
+    @SaCheckPermission("attendancemessageset:info")
     @XjrLog(value = "根据id查询考勤消息设置信息", saveResponseData = true)
     public RT<AttendanceMessageSetVo> info(@RequestParam Long id) {
         AttendanceMessageSet attendanceMessageSet = attendanceMessageSetService.getByIdDeep(id);
@@ -118,7 +118,6 @@ public class AttendanceMessageSetController {
         return RT.ok(BeanUtil.toBean(attendanceMessageSet, AttendanceMessageSetVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增考勤消息设置")
     @SaCheckPermission("attendancemessageset:add")
@@ -141,9 +140,9 @@ public class AttendanceMessageSetController {
     }
 
     @PostMapping("edit")
-    @ApiOperation(value = "新增考勤消息设置")
-    @SaCheckPermission("attendancemessageset:add")
-    @XjrLog(value = "新增考勤消息设置", saveResponseData = true)
+    @ApiOperation(value = "修改考勤消息设置（自写）")
+    @SaCheckPermission("attendancemessageset:editrabandhand")
+    @XjrLog(value = "修改考勤消息设置（自写）", saveResponseData = true)
     public RT<Boolean> edit(@Valid @RequestBody List<UpdateAttendanceMessageSetDto> dtos) {
         boolean isSuccess = attendanceMessageSetService.edit(dtos);
         return RT.ok(isSuccess);

src/main/java/com/xjrsoft/module/attendance/controller/AttendanceRuleCategoryController.java

@@ -56,7 +56,7 @@ public class AttendanceRuleCategoryController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考勤规则列表(分页)")
-    @SaCheckPermission("attendancerulecategory:detail")
+    @SaCheckPermission("attendancerulecategory:page")
     @XjrLog(value = "考勤规则列表(分页)")
     public RT<PageOutput<AttendanceRuleCategoryPageVo>> page(@Valid AttendanceRuleCategoryPageDto dto) {
 
@@ -71,7 +71,7 @@ public class AttendanceRuleCategoryController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "考勤规则列表(不分页)")
-    @SaCheckPermission("attendancerulecategory:detail")
+    @SaCheckPermission("attendancerulecategory:list")
     @XjrLog(value = "考勤规则列表(不分页)")
     public RT<List<AttendanceRuleCategoryPageVo>> list(@Valid AttendanceRuleCategoryPageDto dto) {
 
@@ -87,7 +87,7 @@ public class AttendanceRuleCategoryController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考勤规则信息")
-    @SaCheckPermission("attendancerulecategory:detail")
+    @SaCheckPermission("attendancerulecategory:info")
     @XjrLog(value = "根据id查询考勤规则信息", saveResponseData = true)
     public RT<AttendanceRuleCategoryVo> info(@RequestParam Long id) {
         AttendanceRuleCategory attendanceRuleCategory = attendanceRuleCategoryService.getByIdDeep(id);
@@ -126,7 +126,6 @@ public class AttendanceRuleCategoryController {
         return RT.ok(categoryVo);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增考勤规则")
     @SaCheckPermission("attendancerulecategory:add")

src/main/java/com/xjrsoft/module/attendance/controller/AttendanceStatisticsController.java

@@ -50,7 +50,7 @@ public class AttendanceStatisticsController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "考勤统计列表(分页)")
-    @SaCheckPermission("attendancestatistics:detail")
+    @SaCheckPermission("attendancestatistics:page")
     @XjrLog(value = "考勤统计列表(分页)")
     public RT<PageOutput<AttendanceStatisticsPageVo>> page(@Valid AttendanceStatisticsPageDto dto) {
         IPage<AttendanceStatisticsPageVo> page = attendanceStatisticsService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -60,7 +60,7 @@ public class AttendanceStatisticsController {
 
     @GetMapping(value = "/rule-list")
     @ApiOperation(value = "考勤规则列表")
-    @SaCheckPermission("attendancestatistics:detail")
+    @SaCheckPermission("attendancestatistics:rulelist")
     @XjrLog(value = "考勤规则列表")
     public RT<List<AttendanceRuleCategoryListVo>> list(@Valid AttendanceRuleCategoryListDto dto) {
         List<AttendanceRuleCategory> list = ruleCategoryService.list(
@@ -73,7 +73,7 @@ public class AttendanceStatisticsController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询考勤统计信息")
-    @SaCheckPermission("attendancestatistics:detail")
+    @SaCheckPermission("attendancestatistics:info")
     @XjrLog(value = "根据id查询考勤统计信息", saveResponseData = true)
     public RT<AttendanceStatisticsVo> info(@RequestParam Long id) {
         AttendanceStatistics attendanceStatistics = attendanceStatisticsService.getById(id);
@@ -90,7 +90,7 @@ public class AttendanceStatisticsController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("attendancestatistics:detail")
+    @SaCheckPermission("attendancestatistics:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         AttendanceStatistics statistics = attendanceStatisticsService.getById(dto.getId());
@@ -103,7 +103,6 @@ public class AttendanceStatisticsController {
         return RT.ok(true);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增考勤统计")
     @SaCheckPermission("attendancestatistics:add")
@@ -132,7 +131,7 @@ public class AttendanceStatisticsController {
 
     @GetMapping(value = "/record-list")
     @ApiOperation(value = "考情统计详情列表")
-    @SaCheckPermission("attendancestatistics:detail")
+    @SaCheckPermission("attendancestatistics:recordlist")
     @XjrLog(value = "考情统计详情列表")
     public RT<List<AttendanceStatisticsRecordVo>> recordPage(@Valid AttendanceStatisticsRecordDto dto) {
         List<AttendanceStatisticsRecordVo> recordList = attendanceStatisticsService.getRecordList(dto);
@@ -141,7 +140,7 @@ public class AttendanceStatisticsController {
 
     @PostMapping("/refresh-statistics")
     @ApiOperation(value = "刷新课时统计")
-    @SaCheckPermission("attendancestatistics:detail")
+    @SaCheckPermission("attendancestatistics:refreshstatistics")
     @XjrLog(value = "刷新课时统计", saveResponseData = true)
     public RT<Boolean> refreshStatistics(@Valid @RequestBody RefreshStatisticsDto dto) {
         Boolean aBoolean = attendanceStatisticsService.refreshRecord(dto.getId());
@@ -150,7 +149,7 @@ public class AttendanceStatisticsController {
 
     @PostMapping(value = "/record-export-query")
     @ApiOperation(value = "考勤统计详情导出")
-    @SaCheckPermission("attendancestatistics:detail")
+    @SaCheckPermission("attendancestatistics:recordexportquery")
     @XjrLog(value = "考勤统计详情导出")
     public ResponseEntity<byte[]> recordExport(@Valid @RequestBody RefreshStatisticsDto dto) throws IOException {
         byte[] bytes = attendanceStatisticsService.recordExport(dto.getId());

src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -81,7 +81,7 @@ public class StatisticsController {
 
     @GetMapping(value = "/teacher-statistics")
     @ApiOperation(value = "教职工考勤统计")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("statistics:teacherstatistics")
     @XjrLog(value = "教职工考勤统计", saveResponseData = true)
     public RT<TeacherStatisticsVo> teacherStatistics(@Valid AttendanceStatisticDto dto) {
         TeacherStatisticsVo statisticsVo = new TeacherStatisticsVo();
@@ -203,10 +203,9 @@ public class StatisticsController {
         return RT.ok(statisticsVo);
     }
 
-
     @GetMapping(value = "/student-statistics")
     @ApiOperation(value = "学生考勤统计")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("statistics:studentstatistics")
     @XjrLog(value = "学生考勤统计", saveResponseData = true)
     public RT<TeacherStatisticsVo> studentStatistics(@Valid AttendanceStatisticDto dto) {
         TeacherStatisticsVo statisticsVo = new TeacherStatisticsVo();
@@ -292,10 +291,9 @@ public class StatisticsController {
         return RT.ok(statisticsVo);
     }
 
-
     @GetMapping(value = "/visitor-list")
     @ApiOperation(value = "访客列表")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("statistics:visitorlist")
     @XjrLog(value = "访客列表")
     public RT<List<VisitorInfoVo>> visitorList(@Valid AttendanceStatisticDto dto) {
         List<VisitorInfoVo> visionList = reservationSchoolService.getVisionList(dto.getDate());

src/main/java/com/xjrsoft/module/attendance/controller/StudentAttendanceRecordController.java

@@ -50,7 +50,7 @@ public class StudentAttendanceRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生考勤记录列表(分页)")
-    @SaCheckPermission("studentattendancerecord:detail")
+    @SaCheckPermission("studentattendancerecord:page")
     @XjrLog(value = "学生考勤记录列表(分页)")
     public RT<PageOutput<StudentAttendanceRecordPageVo>> page(@Valid StudentAttendanceRecordPageDto dto) {
 
@@ -82,7 +82,7 @@ public class StudentAttendanceRecordController {
 
     @GetMapping(value = "/class-page")
     @ApiOperation(value = "班级考勤记录列表(分页)")
-    @SaCheckPermission("studentattendancerecord:detail")
+    @SaCheckPermission("studentattendancerecord:classpage")
     @XjrLog(value = "班级考勤记录列表(分页)")
     public RT<PageOutput<StudentAttendanceRecordClassPageVo>> classPage(@Valid StudentAttendanceRecordClassPageDto dto) {
 
@@ -107,7 +107,7 @@ public class StudentAttendanceRecordController {
 
     @GetMapping(value = "/history-page")
     @ApiOperation(value = "历史考勤记录列表(分页)")
-    @SaCheckPermission("studentattendancerecord:detail")
+    @SaCheckPermission("studentattendancerecord:historypage")
     @XjrLog(value = "历史考勤记录列表(分页)")
     public RT<PageOutput<StudentAttendanceRecordClassPageVo>> historyPage(@Valid StudentAttendanceRecordClassPageDto dto) {
 
@@ -131,7 +131,7 @@ public class StudentAttendanceRecordController {
 
     @GetMapping(value = "/leaving-school-page")
     @ApiOperation(value = "离校统计列表(分页)")
-    @SaCheckPermission("studentattendancerecord:detail")
+    @SaCheckPermission("studentattendancerecord:leavingschoolpage")
     @XjrLog(value = "离校统计列表(分页)")
     public RT<PageOutput<StudentAttendanceRecordClassPageVo>> leavingSchoolPage(@Valid StudentAttendanceRecordClassPageDto dto) {
 
@@ -156,7 +156,7 @@ public class StudentAttendanceRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学生考勤记录信息")
-    @SaCheckPermission("studentattendancerecord:detail")
+    @SaCheckPermission("studentattendancerecord:info")
     @XjrLog(value = "根据id查询学生考勤记录信息", saveResponseData = true)
     public RT<StudentAttendanceRecordVo> info(@RequestParam Long id) {
         StudentAttendanceRecord studentAttendanceRecord = studentAttendanceRecordService.getById(id);
@@ -166,7 +166,6 @@ public class StudentAttendanceRecordController {
         return RT.ok(BeanUtil.toBean(studentAttendanceRecord, StudentAttendanceRecordVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增学生考勤记录")
     @SaCheckPermission("studentattendancerecord:add")

src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -77,7 +77,7 @@ public class StudentStatisticsController {
 
     @GetMapping(value = "/class-statistics")
     @ApiOperation(value = "班级考勤统计")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("studentStatistics:classstatistics")
     @XjrLog(value = "班级考勤统计")
     public RT<PageOutput<ClassStatisticsVo>> classStatistics(@Valid AttendanceStatisticDto dto) {
 
@@ -174,10 +174,9 @@ public class StudentStatisticsController {
         return RT.ok(pageOutput);
     }
 
-
     @GetMapping(value = "/student-details")
     @ApiOperation(value = "学生考勤")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("studentStatistics:studentdetails")
     @XjrLog(value = "学生考勤")
     public RT<PageOutput<StudentStatisticsPageVo>> studentDetails(@Valid StudentDetailsDto dto) {
         List<String> roleList = StpUtil.getRoleList();
@@ -278,7 +277,7 @@ public class StudentStatisticsController {
 
     @GetMapping(value = "/class-history")
     @ApiOperation(value = "历史考勤")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("studentStatistics:classhistory")
     @XjrLog(value = "历史考勤")
     public RT<PageOutput<ClassStatisticsVo>> classHistory(@Valid AttendanceStatisticDto dto) {
         Page<ClassStatisticsVo> attendancePage = classService.getAttendancePage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -361,7 +360,7 @@ public class StudentStatisticsController {
 
     @GetMapping(value = "/leaving-school")
     @ApiOperation(value = "离校统计")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("studentStatistics:leavingschool")
     @XjrLog(value = "离校统计")
     public RT<PageOutput<ClassStatisticsVo>> leavingSchool(@Valid AttendanceStatisticDto dto) {
         Page<ClassStatisticsVo> attendancePage = classService.getAttendancePage(new Page<>(dto.getLimit(), dto.getSize()), dto);

src/main/java/com/xjrsoft/module/attendance/controller/TeacherAttendanceRecordController.java

@@ -49,7 +49,7 @@ public class TeacherAttendanceRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "教师考勤记录列表(分页)")
-    @SaCheckPermission("teacherattendancerecord:detail")
+    @SaCheckPermission("teacherattendancerecord:page")
     @XjrLog(value = "教师考勤记录列表(分页)")
     public RT<PageOutput<TeacherAttendanceRecordPageVo>> page(@Valid TeacherAttendanceRecordPageDto dto) {
 
@@ -80,7 +80,7 @@ public class TeacherAttendanceRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询教师考勤记录信息")
-    @SaCheckPermission("teacherattendancerecord:detail")
+    @SaCheckPermission("teacherattendancerecord:info")
     @XjrLog(value = "根据id查询教师考勤记录信息", saveResponseData = true)
     public RT<TeacherAttendanceRecordVo> info(@RequestParam Long id) {
         TeacherAttendanceRecord teacherAttendanceRecord = teacherAttendanceRecordService.getById(id);
@@ -90,7 +90,6 @@ public class TeacherAttendanceRecordController {
         return RT.ok(BeanUtil.toBean(teacherAttendanceRecord, TeacherAttendanceRecordVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增教师考勤记录")
     @SaCheckPermission("teacherattendancerecord:add")
@@ -120,7 +119,7 @@ public class TeacherAttendanceRecordController {
 
     @PostMapping("reset-data")
     @ApiOperation(value = "重置考勤数据")
-    @SaCheckPermission("teacherattendancerecord:reset-data")
+    @SaCheckPermission("teacherattendancerecord:resetdata")
     @XjrLog(value = "重置考勤数据", saveResponseData = true)
     public RT<Boolean> add(@Valid @RequestBody ResetTeacherAttendanceRecordDto dto) {
         Boolean aBoolean = teacherAttendanceRecordService.resetData(dto);

src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -75,7 +75,7 @@ public class TeacherStatisticsController {
 
     @GetMapping(value = "/teacher-details")
     @ApiOperation(value = "教师考勤")
-    @SaCheckPermission("statistics:detail")
+    @SaCheckPermission("teacherstatistics:teacherdetails")
     @XjrLog(value = "教师考勤")
     public RT<PageOutput<TeacherStatisticsPageVo>> teacherDetails(@Valid TeacherDetailsDto dto) {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");

src/main/java/com/xjrsoft/module/authority/controller/DataAuthController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.authority.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -51,6 +52,7 @@ public class DataAuthController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "数据权限(不分页)")
+    @SaCheckPermission("dataauth:list")
     @XjrLog(value = "数据权限(不分页)")
     public R list(@Valid DataAuthListDto dto) {
         //因为多表关联 会有多个表都使用了id字段，  所以必须专门指定主表的Id
@@ -73,6 +75,7 @@ public class DataAuthController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "数据权限(分页)")
+    @SaCheckPermission("dataauth:page")
     @XjrLog(value = "数据权限(分页)")
     public R page(@Valid DataAuthPageDto dto) {
         //因为多表关联 会有多个表都使用了id字段，  所以必须专门指定主表的Id
@@ -98,6 +101,7 @@ public class DataAuthController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询数据权限信息")
+    @SaCheckPermission("dataauth:info")
     @XjrLog(value = "根据id查询数据权限信息", saveResponseData = true)
     public R info(@RequestParam Long id) {
 
@@ -110,6 +114,7 @@ public class DataAuthController {
 
     @PostMapping
     @ApiOperation(value = "新增权限")
+    @SaCheckPermission("dataauth:add")
     @Transactional(rollbackFor = Exception.class)
     @XjrLog(value = "新增权限", saveResponseData = true)
     public R add(@Valid @RequestBody AddDataAuthDto dto) {
@@ -122,6 +127,7 @@ public class DataAuthController {
 
     @PutMapping
     @ApiOperation(value = "修改权限")
+    @SaCheckPermission("dataauth:edit")
     @Transactional(rollbackFor = Exception.class)
     @XjrLog(value = "修改权限", saveResponseData = true)
     public R update(@Valid @RequestBody UpdateDataAuthDto dto) {
@@ -138,6 +144,7 @@ public class DataAuthController {
 
     @DeleteMapping
     @ApiOperation(value = "删除用户(可批量)")
+    @SaCheckPermission("dataauth:delete")
     @XjrLog(value = "删除用户(可批量)", saveResponseData = true)
     public R delete(@RequestBody List<Long> ids) {
 
@@ -149,6 +156,7 @@ public class DataAuthController {
 
     @GetMapping("/auth-objects")
     @ApiOperation(value = "查询数据权限授权对象")
+    @SaCheckPermission("dataauth:authobjects")
     @XjrLog(value = "查询数据权限授权对象")
     public R getAuthObjectsInfo(@RequestParam Long id) {
         return R.ok(authService.getAuthObjectsInfo(id));

src/main/java/com/xjrsoft/module/banding/controller/BandingRuleController.java

@@ -44,7 +44,7 @@ public class BandingRuleController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "新生分班规则列表(分页)")
-    @SaCheckPermission("bandingrule:detail")
+    @SaCheckPermission("bandingrule:page")
     @XjrLog(value = "新生分班规则列表(分页)")
     public RT<PageOutput<BandingRulePageVo>> page(@Valid BandingRulePageDto dto) {
 
@@ -59,7 +59,7 @@ public class BandingRuleController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询新生分班规则信息")
-    @SaCheckPermission("bandingrule:detail")
+    @SaCheckPermission("bandingrule:info")
     @XjrLog(value = "根据id查询新生分班规则信息", saveResponseData = true)
     public RT<BandingRuleVo> info(@RequestParam Long id) {
         BandingRule bandingRule = bandingRuleService.getById(id);
@@ -69,7 +69,6 @@ public class BandingRuleController {
         return RT.ok(BeanUtil.toBean(bandingRule, BandingRuleVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增新生分班规则")
     @SaCheckPermission("bandingrule:add")
@@ -102,6 +101,7 @@ public class BandingRuleController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("bandingrule:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<BandingRulePageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(BandingRulePageVo.class).sheet().doReadSync();

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskClassController.java

@@ -50,7 +50,7 @@ public class BandingTaskClassController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "新生分班任务班级配置列表")
-    @SaCheckPermission("bandingtask:detail")
+    @SaCheckPermission("bandingtaskclass:list")
     @XjrLog(value = "新生分班任务班级配置列表")
     public RT<List<BandingTaskClassPageVo>> list(@Valid BandingTaskClassPageDto dto) {
 
@@ -60,7 +60,7 @@ public class BandingTaskClassController {
 
     @GetMapping(value = "/class-student")
     @ApiOperation(value = "分班后的学生列表")
-    @SaCheckPermission("bandingtask:detail")
+    @SaCheckPermission("bandingtaskclass:classstudent")
     @XjrLog(value = "分班后的学生列表")
     public RT<List<BandingTaskClassStudentListVo>> classStudent(@Valid BandingTaskClassStudentPageDto dto) {
         List<BandingTaskClassStudentListVo> list = bandingTaskClassService.classStudent(dto);
@@ -69,7 +69,7 @@ public class BandingTaskClassController {
 
     @GetMapping(value = "/class-sure")
     @ApiOperation(value = "分班确认列表")
-    @SaCheckPermission("bandingtask:detail")
+    @SaCheckPermission("bandingtaskclass:classsure")
     @XjrLog(value = "分班确认列表")
     public RT<List<BandingTaskClassSureListVo>> classSure(@Valid BandingTaskClassStudentPageDto dto) {
         List<BandingTaskClassSureListVo> list = bandingTaskClassService.getClassSure(dto);
@@ -78,7 +78,7 @@ public class BandingTaskClassController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询新生分班任务信息")
-    @SaCheckPermission("bandingTaskClass:detail")
+    @SaCheckPermission("bandingtaskclass:info")
     @XjrLog(value = "根据id查询新生分班任务信息")
     public RT<BandingTaskClassVo> info(@RequestParam Long id) {
         BandingTaskClass bandingTaskClass = bandingTaskClassService.getById(id);
@@ -88,10 +88,9 @@ public class BandingTaskClassController {
         return RT.ok(BeanUtil.toBean(bandingTaskClass, BandingTaskClassVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增新生分班")
-    @SaCheckPermission("bandingTaskClass:add")
+    @SaCheckPermission("bandingtaskclass:add")
     @XjrLog(value = "新增新生分班")
     public RT<Boolean> add(@Valid @RequestBody List<AddBandingTaskClassDto> dtoList) {
         List<BandingTaskClass> dataList = new ArrayList<>();
@@ -125,7 +124,7 @@ public class BandingTaskClassController {
 
     @PutMapping
     @ApiOperation(value = "批量新增或者修改新生分班")
-    @SaCheckPermission("bandingTaskClass:edit")
+    @SaCheckPermission("bandingtaskclass:edit")
     @XjrLog(value = "批量新增或者修改新生分班")
     public RT<Boolean> update(@Valid @RequestBody List<UpdateBandingClassDto> dtoList) {
         Boolean isSuccess = bandingTaskClassService.saveClass(dtoList);
@@ -134,7 +133,7 @@ public class BandingTaskClassController {
 
     @DeleteMapping
     @ApiOperation(value = "删除新生分班")
-    @SaCheckPermission("bandingTaskClass:delete")
+    @SaCheckPermission("bandingtaskclass:delete")
     @XjrLog(value = "删除新生分班")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(bandingTaskClassService.deleteClass(ids));
@@ -142,6 +141,7 @@ public class BandingTaskClassController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("bandingtaskclass:import")
     @XjrLog(value = "导入")
     public RT<Boolean> importData(@RequestParam Long bandingTaskId, @RequestParam MultipartFile file) throws IOException {
         List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(3).doReadSync();
@@ -151,6 +151,7 @@ public class BandingTaskClassController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出学生列表")
+    @SaCheckPermission("bandingtaskclass:exportquery")
     @XjrLog(value = "导出学生列表")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody BandingTaskClassStudentPageDto dto) {
         List<BandingTaskClassStudentListVo> listVos = bandingTaskClassService.classStudent(dto);
@@ -163,17 +164,16 @@ public class BandingTaskClassController {
 
     @PostMapping("/reset")
     @ApiOperation(value = "重置功能")
-    @SaCheckPermission("bandingTaskClass:add")
+    @SaCheckPermission("bandingtaskclass:reset")
     @XjrLog(value = "重置功能")
     public RT<Boolean> reset(@Valid @RequestBody SureBandingTaskDto dto) {
         boolean isSuccess = bandingTaskClassService.reset(dto.getBandingTaskId());
         return RT.ok(isSuccess);
     }
 
-
     @PostMapping("/change-class")
     @ApiOperation(value = "调整班级")
-    @SaCheckPermission("bandingTaskClass:change-class")
+    @SaCheckPermission("bandingtaskclass:changeclass")
     @XjrLog(value = "调整班级")
     public RT<Boolean> changeClass(@Valid @RequestBody ChangeClassDto dto) {
         boolean isSuccess = classStudentService.changeClass(dto);
@@ -183,7 +183,7 @@ public class BandingTaskClassController {
     @PostMapping("/remove-student")
     @ApiOperation(value = "移出学生")
     @XjrLog(value = "移出学生")
-    @SaCheckPermission("bandingTaskClass:remove-student")
+    @SaCheckPermission("bandingtaskclass:removestudent")
     public RT<Boolean> removeStudent(@Valid @RequestBody ChangeClassDto dto) {
         boolean isSuccess = classStudentService.removeStudent(dto);
         return RT.ok(isSuccess);
@@ -191,7 +191,7 @@ public class BandingTaskClassController {
 
     @PostMapping("/insert-student")
     @ApiOperation(value = "移入学生")
-    @SaCheckPermission("bandingTaskClass:insert-student")
+    @SaCheckPermission("bandingtaskclass:insertstudent")
     @XjrLog(value = "移入学生")
     public RT<Boolean> insertStudent(@Valid @RequestBody ChangeClassDto dto) {
         boolean isSuccess = classStudentService.insertStudent(dto);
@@ -200,7 +200,7 @@ public class BandingTaskClassController {
 
     @GetMapping("/satisfy-student")
     @ApiOperation(value = "满足学生")
-    @SaCheckPermission("bandingTaskClass:satisfy-student")
+    @SaCheckPermission("bandingtaskclass:satisfystudent")
     @XjrLog(value = "满足学生")
     public RT<List<BaseNewStudentPageDto>> satisfyStudent(@Valid StudentDto dto) {
         List<BaseNewStudentPageDto> list = classStudentService.satisfyStudent(dto);
@@ -209,17 +209,16 @@ public class BandingTaskClassController {
 
     @GetMapping("/surplus-student")
     @ApiOperation(value = "剩余学生")
-    @SaCheckPermission("bandingTaskClass:surplus-student")
+    @SaCheckPermission("bandingtaskclass:surplusstudent")
     @XjrLog(value = "剩余学生")
     public RT<List<BaseNewStudentPageDto>> surplusStudent(@Valid StudentDto dto) {
         List<BaseNewStudentPageDto> list = classStudentService.surplusStudent(dto);
         return RT.ok(list);
     }
 
-
     @GetMapping("/classListParam")
     @ApiOperation(value = "根据专业和年级查询班级")
-    @SaCheckPermission("bandingTaskClass:surplus-student")
+    @SaCheckPermission("bandingtaskclass:classlistparam")
     @XjrLog(value = "根据专业和年级查询班级")
     public RT<List<BandingTaskClassVo>> classListParam(@Valid BandingTaskClassListDto dto) {
         List<BandingTaskClassVo> list = bandingTaskClassService.selectJoinList(BandingTaskClassVo.class,
@@ -235,7 +234,7 @@ public class BandingTaskClassController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("bandingtaskclass:changestatus")
     @XjrLog(value = "修改状态")
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeClassStatusDto dto) throws Exception {
         BandingTaskClass taskClass = bandingTaskClassService.getById(dto.getId());

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskController.java

@@ -52,7 +52,7 @@ public class BandingTaskController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "新生分班任务列表(分页)")
-    @SaCheckPermission("bandingtask:detail")
+    @SaCheckPermission("bandingtask:page")
     @XjrLog(value = "新生分班任务列表(分页)")
     public RT<PageOutput<BandingTaskPageVo>> page(@Valid BandingTaskPageDto dto) {
         IPage<BandingTaskPageVo> page = bandingTaskService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -62,7 +62,7 @@ public class BandingTaskController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询新生分班任务信息")
-    @SaCheckPermission("bandingtask:detail")
+    @SaCheckPermission("bandingtask:info")
     @XjrLog(value = "根据id查询新生分班任务信息")
     public RT<BandingTaskVo> info(@RequestParam Long id) {
         BandingTask bandingTask = bandingTaskService.getById(id);
@@ -72,7 +72,6 @@ public class BandingTaskController {
         return RT.ok(BeanUtil.toBean(bandingTask, BandingTaskVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增新生分班任务")
     @SaCheckPermission("bandingtask:add")
@@ -94,7 +93,7 @@ public class BandingTaskController {
 
     @PostMapping("/set-rule")
     @ApiOperation(value = "设置规则")
-    @SaCheckPermission("bandingtask:set-rule")
+    @SaCheckPermission("bandingtask:setrule")
     @XjrLog(value = "设置规则")
     public RT<Boolean> setRule(@Valid @RequestBody AddBandingTaskRuleDto dto) {
         taskRuleService.remove(
@@ -135,7 +134,7 @@ public class BandingTaskController {
 
     @GetMapping(value = "/rule-list")
     @ApiOperation(value = "查询所有规则")
-    @SaCheckPermission("bandingtask:detail")
+    @SaCheckPermission("bandingtask:rulelist")
     @XjrLog(value = "查询所有规则")
     public RT<List<BandingTaskRuleVo>> ruleList(@RequestParam Long id) {
         List<BandingRule> ruleList = ruleService.list();
@@ -157,17 +156,16 @@ public class BandingTaskController {
 
     @PostMapping("/sure")
     @ApiOperation(value = "确认分班")
-    @SaCheckPermission("bandingTaskClass:sure")
+    @SaCheckPermission("bandingtask:sure")
     @XjrLog(value = "确认分班")
     public RT<Boolean> sure(@Valid @RequestBody SureBandingTaskDto dto) {
         Boolean isSuccess = bandingTaskService.sureReport(dto);
         return RT.ok(isSuccess);
     }
 
-
     @PostMapping("/automatic-banding")
     @ApiOperation(value = "自动分班")
-    @SaCheckPermission("bandingTaskClass:automatic-banding")
+    @SaCheckPermission("bandingtask:automaticbanding")
     @XjrLog(value = "自动分班")
     public RT<Boolean> automaticBanding(@Valid @RequestBody AutomaticBandingTaskDto dto) {
         Boolean aBoolean = bandingTaskService.automaticBanding(dto);

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskMajorConditionController.java

@@ -42,7 +42,7 @@ public class BandingTaskMajorConditionController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "专业限制条件列表")
-    @SaCheckPermission("bandingtaskmajorcondition:detail")
+    @SaCheckPermission("bandingtaskmajorcondition:list")
     @XjrLog(value = "专业限制条件列表")
     public RT<List<BandingTaskMajorConditionListVo>> page(@Valid BandingTaskMajorConditionListDto dto) {
         BandingTask bandingTask = taskService.getById(dto.getBandingTaskId());
@@ -64,7 +64,6 @@ public class BandingTaskMajorConditionController {
         return RT.ok(page);
     }
 
-
     @PostMapping("save")
     @ApiOperation(value = "保存")
     @SaCheckPermission("bandingtaskmajorcondition:save")

src/main/java/com/xjrsoft/module/base/controller/BaseClassController.java

@@ -53,7 +53,7 @@ public class BaseClassController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "班级列表(分页)")
-    @SaCheckPermission("baseclass:detail")
+    @SaCheckPermission("baseclass:page")
     @XjrLog(value = "班级列表(分页)")
     public RT<PageOutput<BaseClassPageVo>> page(@Valid BaseClassPageDto dto) {
         Page<BaseClassPageVo> page = baseClassService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -89,7 +89,7 @@ public class BaseClassController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询班级信息")
-    @SaCheckPermission("baseclass:detail")
+    @SaCheckPermission("baseclass:info")
     @XjrLog(value = "根据id查询班级信息", saveResponseData = true)
     public RT<BaseClassVo> info(@RequestParam Long id) {
         BaseClass baseClass = baseClassService.getByIdDeep(id);

src/main/java/com/xjrsoft/module/base/controller/BaseClassCourseController.java

@@ -86,7 +86,7 @@ public class BaseClassCourseController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "班级课程列表(分页)")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:page")
     @XjrLog(value = "班级课程列表(分页)")
     public RT<PageOutput<BaseClassCoursePageVo>> page(@Valid BaseClassCoursePageDto dto) {
         if (dto.getSemester() == null || dto.getSemester() == 0) {
@@ -99,7 +99,7 @@ public class BaseClassCourseController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "单个班级班级课程列表")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:list")
     @XjrLog(value = "单个班级班级课程列表")
     public RT<List<BaseClassCourseListVo>> oneClassClassCourseList(@Valid BaseClassCourseListDto dto) {
         List<BaseClassCourseListVo> baseClassCourseListVoList = baseClassCourseService.oneClassClassCourseList(dto);
@@ -108,7 +108,7 @@ public class BaseClassCourseController {
 
     @GetMapping(value = "/mobile-list")
     @ApiOperation(value = "单个班级班级课程列表(移动端)")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:mobilelist")
     @XjrLog(value = "单个班级班级课程列表(移动端)")
     public RT<List<BaseClassCourseMobileListVo>> mobileOneClassClassCourseList(@Valid BaseClassCourseListDto dto) {
         List<BaseClassCourseMobileListVo> baseClassCourseListVoList = baseClassCourseService.mobileOneClassClassCourseList(dto);
@@ -117,7 +117,7 @@ public class BaseClassCourseController {
 
     @GetMapping("/getSemesterTree")
     @ApiOperation("获取年级树结构")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:getsemestertree")
     @XjrLog(value = "获取年级树结构")
     public RT<Map<String, Map<String, Object>>> semesterTree() {
         Map<String, Map<String, Object>> tree = baseClassCourseService.getSemesterTree();
@@ -126,7 +126,7 @@ public class BaseClassCourseController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询班级课程信息")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:info")
     @XjrLog(value = "根据id查询班级课程信息", saveResponseData = true)
     public RT<BaseClassCourseVo> info(@RequestParam Long id) {
         BaseClassCourse baseClassCourse = baseClassCourseService.getById(id);
@@ -138,7 +138,7 @@ public class BaseClassCourseController {
 
     @GetMapping("/getAllCoursesAndTextbooks")
     @ApiOperation(value = "获取所有课程教材")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:getallcoursesandtextbooks")
     @XjrLog(value = "获取所有课程教材")
     public RT<List<CourseBookInfo>> getAllCoursesAndTextbooks(@RequestParam(required = false) Long[] classIds, @RequestParam(required = false) Long subjectGroupId, @RequestParam(required = false) Long semester) {
         List<CourseBookInfo> data = baseClassCourseService.getAllCourseBook(classIds, subjectGroupId, semester);
@@ -147,7 +147,7 @@ public class BaseClassCourseController {
 
     @GetMapping("/getAllSelectedCoursesAndTextbooks")
     @ApiOperation(value = "获取所有已经选择的课程教材")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:getallselectedcoursesandtextbooks")
     @XjrLog(value = "获取所有已经选择的课程教材")
     public RT<List<CourseBookInfo>> getAllSelectedCoursesAndTextbooks(@RequestParam(required = false) Long[] classIds, @RequestParam(required = false) Long semester) {
         List<CourseBookInfo> data = baseClassCourseService.getSelectedCourseBook(classIds, semester);
@@ -159,7 +159,7 @@ public class BaseClassCourseController {
 
     @PostMapping("/oneUpdateClassCoursesAndTextbooks")
     @ApiOperation(value = "单个班级更新课程教材")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:oneupdateclasscoursesandtextbooks")
     @XjrLog(value = "单个班级更新课程教材", saveResponseData = true)
     public RT<Boolean> oneUpdateClassCoursesAndTextbooks(@Valid @RequestBody ClassCourseTextbook dto) {
         if (ObjectUtils.isEmpty(dto.getBaseClassAdminCourseIds())) {
@@ -170,7 +170,7 @@ public class BaseClassCourseController {
 
     @PostMapping("/updateAddCoursesAndTextbooks")
     @ApiOperation(value = "更新增加课程教材")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:updateaddcoursesandtextbooks")
     @XjrLog(value = "更新增加课程教材", saveResponseData = true)
     public RT<Boolean> updateAddCoursesAndTextbooks(@Valid @RequestBody ClassCourseTextbook dto) {
         if (ObjectUtils.isEmpty(dto.getBaseClassAdminCourseIds())) {
@@ -181,7 +181,7 @@ public class BaseClassCourseController {
 
     @PostMapping("/updateRemoveCoursesAndTextbooks")
     @ApiOperation(value = "更新减少课程教材")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:updateremovecoursesandtextbooks")
     @XjrLog(value = "更新减少课程教材", saveResponseData = true)
     public RT<Boolean> updateRemoveCoursesAndTextbooks(@Valid @RequestBody ClassCourseTextbook dto) {
         return RT.ok(baseClassCourseService.updateRemoveCourseBook(dto));
@@ -189,7 +189,7 @@ public class BaseClassCourseController {
 
     @PostMapping("/insertClassCourseTextbookCombinations")
     @ApiOperation(value = "复用课程教材")
-    @SaCheckPermission("baseclasscourse:detail")
+    @SaCheckPermission("baseclasscourse:insertclasscoursetextbookcombinations")
     @XjrLog(value = "复用课程教材", saveResponseData = true)
     public RT<Boolean> insertClassCourseTextbookCombinations(@Valid @RequestBody ClassCourseReuseDto dto) {
         return RT.ok(baseClassCourseService.duplicateCourseBook(dto));
@@ -197,7 +197,7 @@ public class BaseClassCourseController {
 
     @PostMapping("/setting_up_classes")
     @ApiOperation(value = "设置需要进行课程管理的班级")
-    @SaCheckPermission("baseclasscourse:add")
+    @SaCheckPermission("baseclasscourse:settingupclasses")
     @XjrLog(value = "设置需要进行课程管理的班级", saveResponseData = true)
     public RT<Boolean> settingUpClasses(@Valid @RequestBody AddBaseClassAdminCourseDto dto) {
         boolean isSuccess = baseClassCourseService.settingUpClasses(dto);
@@ -235,7 +235,7 @@ public class BaseClassCourseController {
 
     @DeleteMapping("/deleteSetting_up_classes")
     @ApiOperation(value = "移除需要进行课程管理的班级")
-    @SaCheckPermission("baseclasscourse:add")
+    @SaCheckPermission("baseclasscourse:deleteSettingupclasses")
     @XjrLog(value = "移除需要进行课程管理的班级", saveResponseData = true)
     public RT<Boolean> deleteSettingUpClasses(@Valid @RequestBody List<Long> ids) {
         if (ObjectUtils.isEmpty(ids) || ids.isEmpty()) {
@@ -247,6 +247,7 @@ public class BaseClassCourseController {
 
     @PostMapping("/import")
     @ApiOperation(value = "班级课程导入")
+    @SaCheckPermission("baseclasscourse:import")
     @XjrLog(value = "班级课程导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<BaseClassCourseExcelVo> savedDataList = EasyExcel.read(file.getInputStream()).headRowNumber(3).head(BaseClassCourseExcelVo.class).sheet().doReadSync();
@@ -389,6 +390,7 @@ public class BaseClassCourseController {
 
     @PostMapping("/class-course-textbook-export-query")
     @ApiOperation(value = "班级课程教材详情条件导出")
+    @SaCheckPermission("baseclasscourse:classcoursetextbookexportquery")
     @XjrLog(value = "班级课程教材详情条件导出")
     public ResponseEntity<byte[]> classCourseTextbookExportQuery(@RequestBody ClassCourseTextbookExportQueryDto dto) throws IOException {
 //    @GetMapping("/class-course-textbook-export-query")

src/main/java/com/xjrsoft/module/base/controller/BaseClassDynamicsController.java

@@ -63,7 +63,7 @@ public class BaseClassDynamicsController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "班级动态表列表(分页)")
-    @SaCheckPermission("baseclassdynamics:detail")
+    @SaCheckPermission("baseclassdynamics:page")
     @XjrLog(value = "班级动态表列表(分页)")
     public RT<PageOutput<BaseClassDynamicsPageVo>> page(@Valid BaseClassDynamicsPageDto dto) {
         long userId = StpUtil.getLoginIdAsLong();
@@ -87,7 +87,7 @@ public class BaseClassDynamicsController {
 
     @GetMapping(value = "/reader-page")
     @ApiOperation(value = "班级动态读者信息(分页)")
-    @SaCheckPermission("baseclassdynamics:detail")
+    @SaCheckPermission("baseclassdynamics:readerpage")
     @XjrLog(value = "班级动态读者信息(分页)")
     public RT<PageOutput<BaseClassDynamicsRelationPageVo>> page(@Valid BaseClassDynamicsRelationPageDto dto) {
         MPJLambdaWrapper<User> queryWrapper = new MPJLambdaWrapper<>();
@@ -108,7 +108,7 @@ public class BaseClassDynamicsController {
 
     @GetMapping(value = "/release-page")
     @ApiOperation(value = "班主任发布列表(分页)")
-    @SaCheckPermission("baseclassdynamics:detail")
+    @SaCheckPermission("baseclassdynamics:releasepage")
     @XjrLog(value = "班主任发布列表(分页)")
     public RT<PageOutput<BaseClassDynamicsPageVo>> releasePage(@Valid BaseClassDynamicsPageDto dto) {
         long userId = StpUtil.getLoginIdAsLong();
@@ -125,10 +125,9 @@ public class BaseClassDynamicsController {
         return RT.ok(pageOutput);
     }
 
-
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询班级动态表信息")
-    @SaCheckPermission("baseclassdynamics:detail")
+    @SaCheckPermission("baseclassdynamics:info")
     @XjrLog(value = "根据id查询班级动态表信息", saveResponseData = true)
     public RT<BaseClassDynamicsVo> info(@RequestParam Long id) {
         BaseClassDynamics baseClassDynamics = baseClassDynamicsService.getById(id);
@@ -151,7 +150,6 @@ public class BaseClassDynamicsController {
         return RT.ok(dynamicsVo);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增班级动态表")
     @SaCheckPermission("baseclassdynamics:add")

src/main/java/com/xjrsoft/module/base/controller/BaseClassMergeController.java

@@ -54,7 +54,7 @@ public class BaseClassMergeController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="班级合并列表(分页)")
-    @SaCheckPermission("baseclassmerge:detail")
+    @SaCheckPermission("baseclassmerge:page")
     @XjrLog(value = "班级合并列表(分页)")
     public RT<PageOutput<BaseClassMergePageVo>> page(@Valid BaseClassMergePageDto dto){
         List<Long> classIds = null;
@@ -82,7 +82,7 @@ public class BaseClassMergeController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询班级合并信息")
-    @SaCheckPermission("baseclassmerge:detail")
+    @SaCheckPermission("baseclassmerge:info")
     @XjrLog(value = "根据id查询班级合并信息")
     public RT<BaseClassMergeVo> info(@RequestParam Long id){
         BaseClassMerge baseClassMerge = baseClassMergeService.getByIdDeep(id);
@@ -92,7 +92,6 @@ public class BaseClassMergeController {
         return RT.ok(BeanUtil.toBean(baseClassMerge, BaseClassMergeVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增班级合并")
     @SaCheckPermission("baseclassmerge:add")
@@ -123,7 +122,7 @@ public class BaseClassMergeController {
 
     @GetMapping(value = "/student-page")
     @ApiOperation(value="班级合并学生列表(分页)")
-    @SaCheckPermission("baseclassmerge:detail")
+    @SaCheckPermission("baseclassmerge:studentpage")
     @XjrLog(value = "班级合并学生列表(分页)")
     public RT<PageOutput<BaseClassMergeStudentVo>> studentPage(@Valid BaseClassMergeStudentPageDto dto){
         IPage<BaseClassMergeStudentVo> page = baseClassMergeService.getStudentPage(dto);

src/main/java/com/xjrsoft/module/base/controller/BaseClassTeacherChangeController.java

@@ -41,12 +41,11 @@ import java.util.List;
 @AllArgsConstructor
 public class BaseClassTeacherChangeController {
 
-
     private final IBaseClassTeacherChangeService baseClassTeacherChangeService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="班主任异动记录表列表(分页)")
-    @SaCheckPermission("baseclassteacherchange:detail")
+    @SaCheckPermission("baseclassteacherchange:page")
     @XjrLog(value = "班主任异动记录表列表(分页)")
     public RT<PageOutput<BaseClassTeacherChangePageVo>> page(@Valid BaseClassTeacherChangePageDto dto){
 
@@ -57,7 +56,7 @@ public class BaseClassTeacherChangeController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询班主任异动记录表信息")
-    @SaCheckPermission("baseclassteacherchange:detail")
+    @SaCheckPermission("baseclassteacherchange:info")
     @XjrLog(value = "根据id查询班主任异动记录表信息")
     public RT<BaseClassTeacherChangeVo> info(@RequestParam Long id){
         BaseClassTeacherChange baseClassTeacherChange = baseClassTeacherChangeService.getById(id);

src/main/java/com/xjrsoft/module/base/controller/BaseCourseSubjectController.java

@@ -61,7 +61,7 @@ public class BaseCourseSubjectController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "课程学科列表(分页)")
-    @SaCheckPermission("basecoursesubject:detail")
+    @SaCheckPermission("basecoursesubject:page")
     @XjrLog(value = "课程学科列表(分页)")
     public RT<PageOutput<BaseCourseSubjectPageVo>> page(@Valid BaseCourseSubjectPageDto dto) {
 
@@ -119,7 +119,7 @@ public class BaseCourseSubjectController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询课程学科信息")
-    @SaCheckPermission("basecoursesubject:detail")
+    @SaCheckPermission("basecoursesubject:info")
     @XjrLog(value = "根据id查询课程学科信息")
     public RT<BaseCourseSubjectVo> info(@RequestParam Long id) {
         BaseCourseSubject baseCourseSubject = baseCourseSubjectService.getByIdDeep(id);
@@ -129,7 +129,6 @@ public class BaseCourseSubjectController {
         return RT.ok(BeanUtil.toBean(baseCourseSubject, BaseCourseSubjectVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增课程学科")
     @SaCheckPermission("basecoursesubject:add")
@@ -165,6 +164,7 @@ public class BaseCourseSubjectController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("basecoursesubject:import")
     @XjrLog(value = "导入", saveRequestData = false)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<BaseCourseSubjectPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(BaseCourseSubjectPageVo.class).sheet().doReadSync();
@@ -174,6 +174,7 @@ public class BaseCourseSubjectController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("basecoursesubject:export")
     @XjrLog(value = "导出", saveRequestData = false)
     public ResponseEntity<byte[]> exportData(@Valid BaseCourseSubjectPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<BaseCourseSubjectPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

src/main/java/com/xjrsoft/module/base/controller/BaseGradeController.java

@@ -37,7 +37,7 @@ public class BaseGradeController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "年级列表")
-    @SaCheckPermission("basegrade:detail")
+    @SaCheckPermission("basegrade:list")
     @XjrLog(value = "年级列表")
     public RT<List<BaseGradeVo>> noTokenList(@Valid BaseGradePageDto dto) {
         List<BaseGrade> list = gradeService.list(

src/main/java/com/xjrsoft/module/base/controller/BaseMajorSetController.java

@@ -37,7 +37,7 @@ public class BaseMajorSetController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "专业列表")
-    @SaCheckPermission("basemajorset:detail")
+    @SaCheckPermission("basemajorset:list")
     @XjrLog(value = "专业列表")
     public RT<List<BaseMajorSetVo>> noTokenList(@Valid BaseMajorSetPageDto dto) {
         List<BaseMajorSet> list = majorSetService.list(

src/main/java/com/xjrsoft/module/base/controller/BaseSystemConfigController.java

@@ -33,7 +33,7 @@ public class BaseSystemConfigController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "获取系统配置")
-    @SaCheckPermission("baseSystemConfig:detail")
+    @SaCheckPermission("baseSystemConfig:list")
     @XjrLog(value = "年级列表")
     public RT<List<BaseSystemConfigVo>> noTokenList(@RequestParam String code) {
         List<BaseSystemConfig> list = systemConfigService.list(

src/main/java/com/xjrsoft/module/base/controller/ClassroomController.java

@@ -34,7 +34,7 @@ public class ClassroomController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("classroom:detail")
+    @SaCheckPermission("classroom:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody BaseClassroomChangeStatusDto dto) throws Exception {
         BaseClassroom classroom = baseClassroomService.getById(dto.getId());

src/main/java/com/xjrsoft/module/base/controller/CourseSubjectDetailController.java

@@ -50,12 +50,11 @@ import java.util.List;
 @AllArgsConstructor
 public class CourseSubjectDetailController {
 
-
     private final ICourseSubjectDetailService courseSubjectDetailService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "课程学科管理详情表列表(分页)")
-    @SaCheckPermission("coursesubjectdetail:detail")
+    @SaCheckPermission("coursesubjectdetail:page")
     @XjrLog(value = "课程学科管理详情表列表(分页)")
     public RT<PageOutput<CourseSubjectDetailPageVo>> page(@Valid CourseSubjectDetailPageDto dto) {
 
@@ -70,7 +69,7 @@ public class CourseSubjectDetailController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询课程学科管理详情表信息")
-    @SaCheckPermission("coursesubjectdetail:detail")
+    @SaCheckPermission("coursesubjectdetail:info")
     @XjrLog(value = "根据id查询课程学科管理详情表信息", saveResponseData = true)
     public RT<CourseSubjectDetailVo> info(@RequestParam Long id) {
         CourseSubjectDetail courseSubjectDetail = courseSubjectDetailService.getById(id);
@@ -80,7 +79,6 @@ public class CourseSubjectDetailController {
         return RT.ok(BeanUtil.toBean(courseSubjectDetail, CourseSubjectDetailVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增课程学科管理详情表")
     @SaCheckPermission("coursesubjectdetail:add")
@@ -113,6 +111,7 @@ public class CourseSubjectDetailController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("coursesubjectdetail:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<CourseSubjectDetailPageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(CourseSubjectDetailPageVo.class).sheet().doReadSync();
@@ -122,6 +121,7 @@ public class CourseSubjectDetailController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("coursesubjectdetail:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid CourseSubjectDetailPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<CourseSubjectDetailPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();

src/main/java/com/xjrsoft/module/base/controller/OdsZzxxgkjcsjController.java

@@ -51,7 +51,7 @@ public class OdsZzxxgkjcsjController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "学校基本数据子类表列表(不分页)")
-    @SaCheckPermission("odszzxxgkjcsj:detail")
+    @SaCheckPermission("odszzxxgkjcsj:list")
     @XjrLog(value = "学校基本数据子类表列表(不分页)")
     public RT<List<OdsZzxxgkjcsjListVo>> list(@Valid OdsZzxxgkjcsjListDto dto) {
 
@@ -67,7 +67,7 @@ public class OdsZzxxgkjcsjController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询学校基本数据子类表信息")
-    @SaCheckPermission("odszzxxgkjcsj:detail")
+    @SaCheckPermission("odszzxxgkjcsj:info")
     @XjrLog(value = "根据id查询学校基本数据子类表信息", saveResponseData = true)
     public RT<OdsZzxxgkjcsjVo> info(@RequestParam Long id) {
         OdsZzxxgkjcsj odsZzxxgkjcsj = odsZzxxgkjcsjService.getById(id);
@@ -77,7 +77,6 @@ public class OdsZzxxgkjcsjController {
         return RT.ok(BeanUtil.toBean(odsZzxxgkjcsj, OdsZzxxgkjcsjVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增学校基本数据子类表")
     @SaCheckPermission("odszzxxgkjcsj:add")
@@ -110,6 +109,7 @@ public class OdsZzxxgkjcsjController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("odszzxxgkjcsj:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
         List<OdsZzxxgkjcsjListVo> savedDataList = EasyExcel.read(file.getInputStream()).head(OdsZzxxgkjcsjListVo.class).sheet().doReadSync();
@@ -119,6 +119,7 @@ public class OdsZzxxgkjcsjController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("odszzxxgkjcsj:export")
     @XjrLog(value = "导出", saveResponseData = true)
     public ResponseEntity<byte[]> exportData(@Valid OdsZzxxgkjcsjListDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<OdsZzxxgkjcsjListVo> customerList = list(dto).getData();

src/main/java/com/xjrsoft/module/base/controller/OfficeBuildController.java

@@ -34,7 +34,7 @@ public class OfficeBuildController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("officebuild:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody BaseOfficeBuildChangeStatusDto dto) throws Exception {
         BaseOfficeBuild officeBuild = baseOfficeBuildService.getById(dto.getId());

src/main/java/com/xjrsoft/module/base/controller/WhitelistManagementController.java

@@ -56,7 +56,7 @@ public class WhitelistManagementController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "白名单管理列表(分页)")
-    @SaCheckPermission("whitelistmanagement:detail")
+    @SaCheckPermission("whitelistmanagement:page")
     @XjrLog(value = "白名单管理列表(分页)")
     public RT<PageOutput<WhitelistManagementPageVo>> page(@Valid WhitelistManagementPageDto dto) {
         Page<WhitelistManagementPageVo> page = whitelistManagementService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -66,7 +66,7 @@ public class WhitelistManagementController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询白名单管理信息")
-    @SaCheckPermission("whitelistmanagement:detail")
+    @SaCheckPermission("whitelistmanagement:info")
     @XjrLog(value = "根据id查询白名单管理信息", saveResponseData = true)
     public RT<WhitelistManagementVo> info(@RequestParam Long id) {
         WhitelistManagement whitelistManagement = whitelistManagementService.getById(id);
@@ -95,7 +95,7 @@ public class WhitelistManagementController {
 
     @PostMapping("/set-endtime-batch")
     @ApiOperation(value = "批量设置结束时间")
-    @SaCheckPermission("whitelistmanagement:add")
+    @SaCheckPermission("whitelistmanagement:setendtimebatch")
     @XjrLog(value = "批量设置结束时间", saveResponseData = true)
     public RT<Boolean> setEndtimeBatch(@Valid @RequestBody SetWhitelistEndTimeDto dto) {
         List<WhitelistManagement> list = whitelistManagementService.listByIds(dto.getIds());
@@ -109,7 +109,7 @@ public class WhitelistManagementController {
 
     @PostMapping("/set-temporary")
     @ApiOperation(value = "设置为永久")
-    @SaCheckPermission("whitelistmanagement:add")
+    @SaCheckPermission("whitelistmanagement:settemporary")
     @XjrLog(value = "设置为永久", saveResponseData = true)
     public RT<Boolean> setTemporary(@Valid @RequestBody List<Long> ids) {
         List<WhitelistManagement> list = whitelistManagementService.listByIds(ids);
@@ -152,6 +152,7 @@ public class WhitelistManagementController {
 
     @GetMapping("/structure")
     @ApiOperation(value = "获取年级班级树结构")
+    @SaCheckPermission("whitelistmanagement:structure")
     @XjrLog(value = "获取年级班级树结构")
     public ResponseEntity<List<TreeNode>> getTreeStructure() {
         List<TreeNode> treeStructure = whitelistManagementService.getTreeStructure();
@@ -160,6 +161,7 @@ public class WhitelistManagementController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("whitelistmanagement:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<List<Map<String, String>>> importData(@RequestParam MultipartFile file) throws IOException {
         List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(3).doReadSync();
@@ -189,6 +191,7 @@ public class WhitelistManagementController {
 
     @PostMapping("/activate-import")
     @ApiOperation(value = "新生账号激活导入")
+    @SaCheckPermission("whitelistmanagement:activateimport")
     @XjrLog(value = "新生账号激活导入", saveRequestData = false, saveResponseData = true)
     public RT<List<Map<String, String>>> activateImport(@RequestParam MultipartFile file) throws IOException {
         List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(3).doReadSync();

src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeCalendarController.java

@@ -42,7 +42,7 @@ public class ClassTimeCalendarController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "节假日调课设置列表(分页)")
-    @SaCheckPermission("classtimecalendar:detail")
+    @SaCheckPermission("classtimecalendar:page")
     @XjrLog(value = "节假日调课设置列表(分页)")
     public RT<PageOutput<ClassTimeCalendarPageVo>> page(@Valid ClassTimeCalendarPageDto dto) {
 
@@ -57,7 +57,7 @@ public class ClassTimeCalendarController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询节假日调课设置信息")
-    @SaCheckPermission("classtimecalendar:detail")
+    @SaCheckPermission("classtimecalendar:info")
     @XjrLog(value = "根据id查询节假日调课设置信息", saveResponseData = true)
     public RT<ClassTimeCalendarVo> info(@RequestParam Long id) {
         ClassTimeCalendar classTimeCalendar = classTimeCalendarService.getById(id);
@@ -99,7 +99,7 @@ public class ClassTimeCalendarController {
 
     @PostMapping(value = "/cancel")
     @ApiOperation(value = "作废")
-    @SaCheckPermission("classtimecalendar:detail")
+    @SaCheckPermission("classtimecalendar:cancel")
     @XjrLog(value = "作废", saveResponseData = true)
     public RT<Boolean> cancel(@Valid @RequestBody RefreshStatisticsDto dto) throws Exception {
         Boolean cancel = classTimeCalendarService.cancel(dto.getId());

src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeDeleteController.java

@@ -42,7 +42,7 @@ public class ClassTimeDeleteController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "课时删除列表(分页)")
-    @SaCheckPermission("classtimedelete:detail")
+    @SaCheckPermission("classtimedelete:page")
     @XjrLog(value = "课时删除列表(分页)")
     public RT<PageOutput<ClassTimeDeletePageVo>> page(@Valid ClassTimeDeletePageDto dto) {
 
@@ -53,7 +53,7 @@ public class ClassTimeDeleteController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询课时删除信息")
-    @SaCheckPermission("classtimedelete:detail")
+    @SaCheckPermission("classtimedelete:info")
     @XjrLog(value = "根据id查询课时删除信息", saveResponseData = true)
     public RT<ClassTimeDeleteVo> info(@RequestParam Long id) {
         ClassTimeDelete classTimeDelete = classTimeDeleteService.getById(id);
@@ -77,7 +77,7 @@ public class ClassTimeDeleteController {
 
     @PostMapping(value = "add-batch")
     @ApiOperation(value = "批量新增新增课时删除")
-    @SaCheckPermission("classtimedelete:add")
+    @SaCheckPermission("classtimedelete:addbatch")
     public RT<Boolean> add(@Valid @RequestBody List<AddClassTimeDeleteDto> dtoList){
         for (AddClassTimeDeleteDto dto : dtoList) {
             ClassTimeDelete classTimeDelete = BeanUtil.toBean(dto, ClassTimeDelete.class);
@@ -111,7 +111,7 @@ public class ClassTimeDeleteController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimedelete:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         ClassTimeDelete classTimeDelete = classTimeDeleteService.getById(dto.getId());

src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsController.java

@@ -64,7 +64,7 @@ public class ClassTimeStatisticsController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "课时统计列表(分页)")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:page")
     @XjrLog(value = "课时统计列表(分页)")
     public RT<PageOutput<ClassTimeStatisticsPageVo>> page(@Valid ClassTimeStatisticsPageDto dto) {
 
@@ -82,7 +82,7 @@ public class ClassTimeStatisticsController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询课时统计信息")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:info")
     @XjrLog(value = "根据id查询课时统计信息", saveResponseData = true)
     public RT<ClassTimeStatisticsVo> info(@RequestParam Long id) {
         ClassTimeStatistics classTimeStatistics = classTimeStatisticsService.getByIdDeep(id);
@@ -94,7 +94,7 @@ public class ClassTimeStatisticsController {
 
     @GetMapping(value = "/coursetimetypelist")
     @ApiOperation(value = "查询课时补充类型")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:coursetimetypelist")
     @XjrLog(value = "查询课时补充类型")
     public RT<List<DictionaryDetail>> CourseTimeTypeList() {
         List<DictionaryDetail> CourseTimeTypeList = dictionaryService.list(
@@ -106,7 +106,6 @@ public class ClassTimeStatisticsController {
         return RT.ok(CourseTimeTypeList);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增课时统计")
     @SaCheckPermission("classtimestatistics:add")
@@ -136,7 +135,7 @@ public class ClassTimeStatisticsController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         ClassTimeStatistics statistics = classTimeStatisticsService.getById(dto.getId());
@@ -155,7 +154,7 @@ public class ClassTimeStatisticsController {
 
     @GetMapping(value = "/last-date")
     @ApiOperation(value = "查询最新统计的结束日期")
-    @SaCheckPermission("classtimestatisticsset:detail")
+    @SaCheckPermission("classtimestatistics:lastdate")
     @XjrLog(value = "查询最新统计的结束日期", saveResponseData = true)
     public RT<LocalDate> lastInfo() {
         List<ClassTimeStatistics> list = classTimeStatisticsService.list(
@@ -170,7 +169,7 @@ public class ClassTimeStatisticsController {
 
     @PostMapping("/refresh-statistics")
     @ApiOperation(value = "刷新课时统计")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:refreshstatistics")
     @XjrLog(value = "刷新课时统计", saveResponseData = true)
     public RT<Boolean> refreshStatistics(@Valid @RequestBody RefreshStatisticsDto dto) {
 
@@ -211,10 +210,9 @@ public class ClassTimeStatisticsController {
         return RT.ok(aBoolean);
     }
 
-
     @GetMapping(value = "/record-list")
     @ApiOperation(value = "课时统计详情列表")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:recordlist")
     @XjrLog(value = "课时统计详情列表")
     public RT<List<ClassTimeStatisticsRecordVo>> recordPage(@Valid RefreshStatisticsDto dto) {
         List<ClassTimeStatisticsRecordVo> recordList = classTimeStatisticsService.getRecordList(dto.getId());
@@ -223,7 +221,7 @@ public class ClassTimeStatisticsController {
 
     @GetMapping(value = "/record-detail-info")
     @ApiOperation(value = "课时统计详情明细")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:recorddetailinfo")
     @XjrLog(value = "课时统计详情明细", saveResponseData = true)
     public RT<RecordDetailVo> recordDetailInfo(@Valid RefreshStatisticsDto dto) {
         ClassTimeStatisticsRecord record = recordService.getById(dto.getId());
@@ -233,7 +231,7 @@ public class ClassTimeStatisticsController {
 
     @PostMapping(value = "/record-detail-export-query")
     @ApiOperation(value = "课时统计详情明细-导出")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:recorddetailexportquery")
     @XjrLog(value = "课时统计详情明细-导出")
     public ResponseEntity<byte[]> recordDetailExportQuery(@Valid @RequestBody RefreshStatisticsDto dto) throws IOException {
         String fileName = "recordDetailExportQuery" + ExcelTypeEnum.XLSX.getValue();
@@ -241,10 +239,9 @@ public class ClassTimeStatisticsController {
         return RT.fileStream(bytes, fileName);
     }
 
-
     @PostMapping(value = "/record-export-query")
     @ApiOperation(value = "课时统计详情导出")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:recordexportquery")
     @XjrLog(value = "课时统计详情导出")
     public ResponseEntity<byte[]> recordExport(@Valid @RequestBody RefreshStatisticsDto dto) throws IOException {
         byte[] bytes = classTimeStatisticsService.recordExport(dto.getId());
@@ -252,10 +249,9 @@ public class ClassTimeStatisticsController {
         return RT.fileStream(bytes, fileName);
     }
 
-
     @GetMapping(value = "/teacher-record-page")
     @ApiOperation(value = "课时统计教师详情列表")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("classtimestatistics:teacherrecordpage")
     @XjrLog(value = "课时统计教师详情列表")
     public RT<PageOutput<ClassTimeStatisticsPageVo>> teacherRecordPage(@Valid ClassTimeStatisticsPageDto dto) {
 

src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsSetController.java

@@ -43,7 +43,7 @@ public class ClassTimeStatisticsSetController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "课时统计-设置列表(分页)")
-    @SaCheckPermission("classtimestatisticsset:detail")
+    @SaCheckPermission("classtimestatisticsset:page")
     @XjrLog(value = "课时统计-设置列表(分页)")
     public RT<PageOutput<ClassTimeStatisticsSetPageVo>> page(@Valid ClassTimeStatisticsSetPageDto dto) {
 
@@ -58,7 +58,7 @@ public class ClassTimeStatisticsSetController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询课时统计-设置信息")
-    @SaCheckPermission("classtimestatisticsset:detail")
+    @SaCheckPermission("classtimestatisticsset:info")
     @XjrLog(value = "根据id查询课时统计-设置信息", saveResponseData = true)
     public RT<ClassTimeStatisticsSetVo> info(@RequestParam Long id) {
         ClassTimeStatisticsSet classTimeStatisticsSet = classTimeStatisticsSetService.getById(id);
@@ -68,7 +68,6 @@ public class ClassTimeStatisticsSetController {
         return RT.ok(BeanUtil.toBean(classTimeStatisticsSet, ClassTimeStatisticsSetVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增课时统计-设置")
     @SaCheckPermission("classtimestatisticsset:add")
@@ -101,7 +100,7 @@ public class ClassTimeStatisticsSetController {
 
     @GetMapping(value = "/last-info")
     @ApiOperation(value = "查询最新设置信息")
-    @SaCheckPermission("classtimestatisticsset:detail")
+    @SaCheckPermission("classtimestatisticsset:lastinfo")
     @XjrLog(value = "查询最新设置信息", saveResponseData = true)
     public RT<ClassTimeStatisticsSetVo> lastInfo(@RequestParam Integer category) {
         List<ClassTimeStatisticsSet> list = classTimeStatisticsSetService.list(

src/main/java/com/xjrsoft/module/classtime/controller/CourseClassTimeStatisticsController.java

@@ -51,7 +51,7 @@ public class CourseClassTimeStatisticsController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "课时统计列表(分页)")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:page")
     @XjrLog(value = "课时统计列表(分页)")
     public RT<PageOutput<ClassTimeStatisticsPageVo>> page(@Valid ClassTimeStatisticsPageDto dto) {
 
@@ -69,7 +69,7 @@ public class CourseClassTimeStatisticsController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询课时统计信息")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:info")
     @XjrLog(value = "根据id查询课时统计信息", saveResponseData = true)
     public RT<ClassTimeStatisticsVo> info(@RequestParam Long id) {
         ClassTimeStatistics classTimeStatistics = classTimeStatisticsService.getByIdDeep(id);
@@ -81,7 +81,7 @@ public class CourseClassTimeStatisticsController {
 
     @PostMapping
     @ApiOperation(value = "新增课时统计")
-    @SaCheckPermission("classtimestatistics:add")
+    @SaCheckPermission("courseclasstimestatistics:add")
     @XjrLog(value = "新增课时统计", saveResponseData = true)
     public RT<Boolean> add(@Valid @RequestBody AddClassTimeStatisticsDto dto) {
         boolean isSuccess = classTimeStatisticsService.addCourse(dto);
@@ -90,7 +90,7 @@ public class CourseClassTimeStatisticsController {
 
     @PutMapping
     @ApiOperation(value = "修改课时统计")
-    @SaCheckPermission("classtimestatistics:edit")
+    @SaCheckPermission("courseclasstimestatistics:edit")
     @XjrLog(value = "修改课时统计", saveResponseData = true)
     public RT<Boolean> update(@Valid @RequestBody UpdateClassTimeStatisticsDto dto) {
         ClassTimeStatistics classTimeStatistics = BeanUtil.toBean(dto, ClassTimeStatistics.class);
@@ -99,7 +99,7 @@ public class CourseClassTimeStatisticsController {
 
     @DeleteMapping
     @ApiOperation(value = "删除课时统计")
-    @SaCheckPermission("classtimestatistics:delete")
+    @SaCheckPermission("courseclasstimestatistics:delete")
     @XjrLog(value = "删除课时统计", saveResponseData = true)
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(classTimeStatisticsService.delete(ids));
@@ -108,7 +108,7 @@ public class CourseClassTimeStatisticsController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         ClassTimeStatistics statistics = classTimeStatisticsService.getById(dto.getId());
@@ -125,7 +125,7 @@ public class CourseClassTimeStatisticsController {
 
     @PostMapping(value = "/over-workload-number-status")
     @ApiOperation(value = "修改超工作量基数状态")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:overworkloadnumberstatus")
     @XjrLog(value = "修改超工作量基数状态", saveResponseData = true)
     public RT<Boolean> changeOverWorkloadNumberStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         ClassTimeStatistics statistics = classTimeStatisticsService.getById(dto.getId());
@@ -139,7 +139,7 @@ public class CourseClassTimeStatisticsController {
 
     @PostMapping(value = "/over-workload-number")
     @ApiOperation(value = "修改超工作量基数")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:overworkloadnumber")
     @XjrLog(value = "修改超工作量基数", saveResponseData = true)
     public RT<Boolean> updateOverWorkloadNumber(@Valid @RequestBody UpdateOverworkloadNumberDto dto) {
         ClassTimeStatistics statistics = classTimeStatisticsService.getById(dto.getId());
@@ -148,10 +148,9 @@ public class CourseClassTimeStatisticsController {
         return RT.ok(true);
     }
 
-
     @GetMapping(value = "/last-date")
     @ApiOperation(value = "查询最新统计的结束日期")
-    @SaCheckPermission("classtimestatisticsset:detail")
+    @SaCheckPermission("courseclasstimestatistics:lastdate")
     @XjrLog(value = "查询最新统计的结束日期", saveResponseData = true)
     public RT<LocalDate> lastInfo() {
         List<ClassTimeStatistics> list = classTimeStatisticsService.list(
@@ -166,7 +165,7 @@ public class CourseClassTimeStatisticsController {
 
     @PostMapping("/refresh-statistics")
     @ApiOperation(value = "刷新课表课时统计")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:refreshstatistics")
     @XjrLog(value = "刷新课表课时统计", saveResponseData = true)
     public RT<Boolean> refreshStatistics(@Valid @RequestBody RefreshStatisticsDto dto) {
 
@@ -194,20 +193,18 @@ public class CourseClassTimeStatisticsController {
         return RT.ok(aBoolean);
     }
 
-
     @GetMapping(value = "/record-list")
     @ApiOperation(value = "课程课时统计详情列表")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:recordlist")
     @XjrLog(value = "课程课时统计详情列表")
     public RT<List<CourseClassTimeStatisticsRecordVo>> recordPage(@Valid CourseRecordDto dto) {
         List<CourseClassTimeStatisticsRecordVo> recordList = classTimeStatisticsService.getCourseRecordList(dto);
         return RT.ok(recordList);
     }
 
-
     @PostMapping("/import")
     @ApiOperation(value = "导入")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public RT<Boolean> importData(@RequestParam Long classTimeStatisticsId, @RequestParam MultipartFile file) throws IOException {
         Boolean aBoolean = classTimeStatisticsService.importAdministration(classTimeStatisticsId, file);
@@ -216,7 +213,7 @@ public class CourseClassTimeStatisticsController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
-    @SaCheckPermission("classtimestatistics:detail")
+    @SaCheckPermission("courseclasstimestatistics:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody RefreshStatisticsDto dto) throws IOException {
         byte[] bytes = classTimeStatisticsService.exportAdministration(dto.getId());

src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java

@@ -37,7 +37,7 @@ public class ConcatController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "教师通讯录")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("concat:list")
     @XjrLog(value = "教师通讯录")
     public RT<List<ConcatTreeVo>> list(ConcatTreeDto dto) throws Exception {
         Long parentId = 1684107782861680000L;

src/main/java/com/xjrsoft/module/courseTable/controller/ClassTimeController.java

@@ -42,7 +42,7 @@ public class ClassTimeController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "上课时间列表(分页)")
-    @SaCheckPermission("basenewstudent:detail")
+    @SaCheckPermission("basenewstudent:page")
     @XjrLog(value = "上课时间列表(分页)")
     public RT<PageOutput<ClassTimePageVo>> page(@Valid ClassTimePageDto dto) {
         LambdaQueryWrapper<ClassTime> queryWrapper = new LambdaQueryWrapper<>();
@@ -56,7 +56,7 @@ public class ClassTimeController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询上课时间")
-    @SaCheckPermission("basemajorcategor:detail")
+    @SaCheckPermission("basemajorcategor:info")
     @XjrLog(value = "根据id查询上课时间", saveResponseData = true)
     public RT<ClassTimeVo> info(@RequestParam Long id) {
         ClassTime ClassTime = classTimeService.getById(id);

src/main/java/com/xjrsoft/module/courseTable/controller/CourseTableController.java

@@ -32,6 +32,7 @@ public class CourseTableController {
 
     @GetMapping("/class")
     @ApiOperation(value = "获取班级课表")
+    @SaCheckPermission("coursetable:class")
     @XjrLog(value = "获取班级课表")
     public R classList(ClassListDto dto) {
         return R.ok(courseTableService.classList(dto));

src/main/java/com/xjrsoft/module/courseTable/controller/SecondCourseController.java

@@ -63,7 +63,7 @@ public class SecondCourseController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "第二课堂列表(分页)")
-    @SaCheckPermission("secondcourse:detail")
+    @SaCheckPermission("secondcourse:page")
     @XjrLog(value = "第二课堂列表(分页)")
     public RT<PageOutput<SecondCoursePageVo>> page(@Valid SecondCoursePageDto dto) {
         if (dto.getUserId() == null) {
@@ -90,7 +90,7 @@ public class SecondCourseController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询第二课堂信息")
-    @SaCheckPermission("secondcourse:detail")
+    @SaCheckPermission("secondcourse:info")
     @XjrLog(value = "根据id查询第二课堂信息", saveResponseData = true)
     public RT<SecondCourseVo> info(@RequestParam Long id) {
         SecondCourse secondCourse = secondCourseService.getByIdDeep(id);
@@ -169,7 +169,7 @@ public class SecondCourseController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("secondcourse:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
         SecondCourse secondCourse = secondCourseService.getById(dto.getId());
@@ -183,7 +183,7 @@ public class SecondCourseController {
 
     @GetMapping(value = "/enroll-page")
     @ApiOperation(value = "报名表")
-    @SaCheckPermission("secondcourse:detail")
+    @SaCheckPermission("secondcourse:enrollpage")
     @XjrLog(value = "报名表")
     public RT<PageOutput<SecondCourseEnrollVo>> enrollPage(@Valid SecondCourseEnrollPageDto dto) {
         Page<SecondCourseEnrollVo> enrollPage = secondCourseService.getEnrollPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -201,6 +201,7 @@ public class SecondCourseController {
 
     @PostMapping("/export-query")
     @ApiOperation(value = "导出列表")
+    @SaCheckPermission("secondcourse:exportquery")
     @XjrLog(value = "导出列表")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody SecondCourseEnrollPageDto dto) {
         List<SecondCourseEnrollVo> enrollList = secondCourseService.getEnrollList(dto);
@@ -232,7 +233,7 @@ public class SecondCourseController {
 
     @PostMapping(value = "/enroll")
     @ApiOperation(value = "报名")
-    @SaCheckPermission("secondcourse:detail")
+    @SaCheckPermission("secondcourse:enroll")
     @XjrLog(value = "报名", saveResponseData = true)
     public RT<Boolean> enroll(@Valid @RequestBody UserEnrollDto dto) {
         Boolean enroll = secondCourseService.enroll(dto);
@@ -241,7 +242,7 @@ public class SecondCourseController {
 
     @GetMapping(value = "/my-enroll-page")
     @ApiOperation(value = "我的报名记录(分页)")
-    @SaCheckPermission("secondcourse:detail")
+    @SaCheckPermission("secondcourse:myenrollpage")
     @XjrLog(value = "我的报名记录(分页)")
     public RT<PageOutput<SecondCoursePageVo>> myEnrollList(@Valid SecondCoursePageDto dto) {
         if (dto.getUserId() == null) {

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -66,7 +66,7 @@ public class DataboardController {
 
     @GetMapping(value = "/process-statistics")
     @ApiOperation(value = "流程统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:processstatistics")
     @XjrLog(value = "流程统计", saveResponseData = true)
     public RT<ProcessStatisticsVo> processStatistics(@Valid StatisticsDto dto) {
         ProcessStatisticsVo result = new ProcessStatisticsVo();
@@ -94,7 +94,7 @@ public class DataboardController {
 
     @GetMapping(value = "/meeting-statistics")
     @ApiOperation(value = "会议统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:meetingstatistics")
     @XjrLog(value = "会议统计", saveResponseData = true)
     public RT<MeetingStatisticsVo> meetingStatistics(@Valid StatisticsDetailDto dto) {
         LocalDateTime startTime = null;
@@ -129,7 +129,7 @@ public class DataboardController {
 
     @GetMapping(value = "/course-statistics")
     @ApiOperation(value = "课表统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:coursestatistics")
     @XjrLog(value = "课表统计", saveResponseData = true)
     public RT<CourseStatisticsVo> courseStatistics(@Valid StatisticsDetailDto dto) {
 
@@ -180,7 +180,7 @@ public class DataboardController {
 
     @GetMapping(value = "/visitor-statistics")
     @ApiOperation(value = "访客统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:visitorstatistics")
     @XjrLog(value = "访客统计", saveResponseData = true)
     public RT<VisitorStatisticsVo> visitorStatistics(@Valid StatisticsDto dto) {
         VisitorStatisticsVo result = new VisitorStatisticsVo();
@@ -202,7 +202,7 @@ public class DataboardController {
 
     @GetMapping(value = "/person-statistics")
     @ApiOperation(value = "全校师生数据概览")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:personstatistics")
     @XjrLog(value = "全校师生数据概览", saveResponseData = true)
     public RT<PersonStatisticsVo> personStatistics(@Valid StatisticsDto dto) {
 
@@ -310,7 +310,7 @@ public class DataboardController {
 
     @GetMapping(value = "/health-statistics")
     @ApiOperation(value = "学生健康统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:healthstatistics")
     @XjrLog(value = "学生健康统计", saveResponseData = true)
     public RT<HealthStatisticsVo> healthStatistics(@Valid StatisticsDto dto) {
         String sql = "SELECT t1.gender,COUNT(t1.id) AS a_count FROM student_infection t1" +
@@ -344,7 +344,7 @@ public class DataboardController {
 
     @GetMapping(value = "/reimbursement-statistics")
     @ApiOperation(value = "差旅费报销申请")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:reimbursementstatistics")
     @XjrLog(value = "差旅费报销申请", saveResponseData = true)
     public RT<ReimbursementStatisticsVo> reimbursementStatistics(@Valid StatisticsDetailDto dto) {
         LocalDateTime startTime = null;
@@ -424,7 +424,7 @@ public class DataboardController {
 
     @GetMapping(value = "/repair-statistics")
     @ApiOperation(value = "维修申报")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:repairstatistics")
     @XjrLog(value = "维修申报", saveResponseData = true)
     public RT<RepairStatisticsVo> repairStatistics(@Valid StatisticsDetailDto dto) {
         LocalDateTime startTime = null;
@@ -476,7 +476,7 @@ public class DataboardController {
 
     @GetMapping(value = "/attendance-statistics")
     @ApiOperation(value = "个人考勤")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:attendancestatistics")
     @XjrLog(value = "个人考勤", saveResponseData = true)
     public RT<AttendanceStatisticsVo> attendanceStatistics(@Valid StatisticsDetailDto dto) {
         if (dto.getUserId() == null) {
@@ -579,7 +579,7 @@ public class DataboardController {
 
     @GetMapping(value = "/room-statistics")
     @ApiOperation(value = "寝室统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:roomstatistics")
     @XjrLog(value = "寝室统计", saveResponseData = true)
     public RT<List<ItemCount2Vo>> roomStatistics(@Valid StatisticsDetailDto dto) {
         String sql = " SELECT t0.name," +
@@ -612,7 +612,7 @@ public class DataboardController {
 
     @GetMapping(value = "/internship-statistics")
     @ApiOperation(value = "实习统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("databoard:internshipstatistics")
     @XjrLog(value = "实习统计", saveResponseData = true)
     public RT<InternshipStatisticsVo> internshipStatistics(@Valid StatisticsDetailDto dto) {
         BaseSemester semester = semesterService.getCurrentSemester();

src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -105,7 +105,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/process-statistics")
     @ApiOperation(value = "流程统计详情")
-    @SaCheckPermission("datadetail:detail")
+    @SaCheckPermission("datadetail:processstatistics")
     @XjrLog(value = "流程统计详情", saveResponseData = true)
     public RT<ProcessStatisticsDetailVo> processStatistics(@Valid StatisticsDetailDto dto) {
         ProcessStatisticsDetailVo result = new ProcessStatisticsDetailVo();
@@ -199,7 +199,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/health-statistics")
     @ApiOperation(value = "学生健康统计")
-    @SaCheckPermission("datadetail:detail")
+    @SaCheckPermission("datadetail:healthstatistics")
     @XjrLog(value = "学生健康统计", saveResponseData = true)
     public RT<HealthStatisticsDetailVo> healthStatistics(@Valid StatisticsDetailDto dto) {
         String sql = "SELECT t1.gender,COUNT(t1.id) AS a_count FROM student_infection t1" +
@@ -299,7 +299,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/person-statistics")
     @ApiOperation(value = "教职工详情数据统计")
-    @SaCheckPermission("datadetail:detail")
+    @SaCheckPermission("datadetail:personstatistics")
     @XjrLog(value = "教职工详情数据统计", saveResponseData = true)
     public RT<TeacherStatisticsDetailVo> teahcerStatistics(@Valid StatisticsDetailDto dto) throws ParseException {
         String sql = "SELECT IFNULL(t2.name,'未填写') AS item ,IFNULL(COUNT(*), 0) AS a_count FROM xjr_user t1" +
@@ -456,7 +456,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/person-statistics-tea-change")
     @ApiOperation(value = "教职工详情数据统计之教职工变动情况")
-    @SaCheckPermission("datadetail:detail")
+    @SaCheckPermission("datadetail:personstatisticsteachange")
     @XjrLog(value = "教职工详情数据统计之教职工变动情况", saveResponseData = true)
     public RT<TeacherChangeStatisticsDetailVo> teacherChangeStatisticsDetail(@Valid TeacherChangeStatisticsDetailDto dto){
         TeacherChangeStatisticsDetailVo teacherChangeStatisticsDetailVo = new TeacherChangeStatisticsDetailVo();
@@ -598,7 +598,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/student-statistics")
     @ApiOperation(value = "学生详情数据统计")
-    @SaCheckPermission("datadetail:detail")
+    @SaCheckPermission("datadetail:studentstatistics")
     @XjrLog(value = "学生详情数据统计", saveResponseData = true)
     public RT<StudnetStatisticsDetailVo> studentStatistics(@Valid StatisticsDetailDto dto) {
         StudnetStatisticsDetailVo result = new StudnetStatisticsDetailVo();
@@ -742,7 +742,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/subscription-statistics")
     @ApiOperation(value = "物品申购详情数据统计")
-    @SaCheckPermission("datadetail:detail")
+    @SaCheckPermission("datadetail:subscriptionstatistics")
     @XjrLog(value = "物品申购详情数据统计", saveResponseData = true)
     public RT<SubscriptionStatisticsDetailVo> subscriptionStatistics(@Valid StatisticsDetailDto dto) {
         SubscriptionStatisticsDetailVo result = new SubscriptionStatisticsDetailVo();
@@ -832,7 +832,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/course-statistics")
     @ApiOperation(value = "课表详情数据统计")
-    @SaCheckPermission("datadetail:detail")
+    @SaCheckPermission("datadetail:coursestatistics")
     @XjrLog(value = "课表详情数据统计", saveResponseData = true)
     public RT<CourseStatisticsDetailVo> courseStatistics(@Valid StatisticsDetailDto dto) {
         String startDate = null;
@@ -907,7 +907,7 @@ public class DatadetailController {
 
     @GetMapping(value = "/room-statistics")
     @ApiOperation(value = "寝室统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("datadetail:roomstatistics")
     @XjrLog(value = "寝室统计", saveResponseData = true)
     public RT<RoomStatisticsDetailVo> roomStatistics(@Valid StatisticsDetailDto dto) {
         RoomStatisticsDetailVo result = new RoomStatisticsDetailVo();
@@ -969,10 +969,9 @@ public class DatadetailController {
         return RT.ok(result);
     }
 
-
     @GetMapping(value = "/internship-statistics")
     @ApiOperation(value = "实习统计")
-    @SaCheckPermission("databoard:detail")
+    @SaCheckPermission("datadetail:internshipstatistics")
     @XjrLog(value = "实习统计", saveResponseData = true)
     public RT<InternshipStatisticsDetailVo> internshipStatistics(@Valid StatisticsDetailDto dto) {
         InternshipStatisticsDetailVo result = new InternshipStatisticsDetailVo();

src/main/java/com/xjrsoft/module/dataexpert/controller/DataExpertSourceController.java

@@ -40,12 +40,11 @@ import java.util.List;
 @AllArgsConstructor
 public class DataExpertSourceController {
 
-
     private final IDataExpertSourceService dataExpertSourceService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "数据导出-数据源设置列表(分页)")
-    @SaCheckPermission("dataexpertsource:detail")
+    @SaCheckPermission("dataexpertsource:page")
     @XjrLog(value = "数据导出-数据源设置列表(分页)")
     public RT<PageOutput<DataExpertSourcePageVo>> page(@Valid DataExpertSourcePageDto dto) {
 
@@ -60,7 +59,7 @@ public class DataExpertSourceController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "数据源设置列表")
-    @SaCheckPermission("dataexpertsource:detail")
+    @SaCheckPermission("dataexpertsource:list")
     @XjrLog(value = "数据源设置列表")
     public RT<List<DataExpertSourceVo>> list(@Valid DataExpertSourcePageDto dto) {
 
@@ -74,7 +73,7 @@ public class DataExpertSourceController {
 
     @GetMapping(value = "/info-source-type")
     @ApiOperation(value = "根据sourceType查询数据导出-数据源设置信息")
-    @SaCheckPermission("dataexpertsource:detail")
+    @SaCheckPermission("dataexpertsource:infosourcetype")
     @XjrLog(value = "根据sourceType查询数据导出-数据源设置信息", saveResponseData = true)
     public RT<DataExpertSourceVo> list(@RequestParam String sourceType) {
         DataExpertSource dataExpertSource = dataExpertSourceService.getOne(
@@ -89,7 +88,7 @@ public class DataExpertSourceController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询数据导出-数据源设置信息")
-    @SaCheckPermission("dataexpertsource:detail")
+    @SaCheckPermission("dataexpertsource:info")
     @XjrLog(value = "根据id查询数据导出-数据源设置信息", saveResponseData = true)
     public RT<DataExpertSourceVo> info(@RequestParam Long id) {
         DataExpertSource dataExpertSource = dataExpertSourceService.getByIdDeep(id);
@@ -99,7 +98,6 @@ public class DataExpertSourceController {
         return RT.ok(BeanUtil.toBean(dataExpertSource, DataExpertSourceVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增数据导出-数据源设置")
     @SaCheckPermission("dataexpertsource:add")
@@ -131,10 +129,9 @@ public class DataExpertSourceController {
         return RT.ok(dataExpertSourceService.delete(ids));
     }
 
-
     @GetMapping(value = "/field-list")
     @ApiOperation(value = "数据源字段")
-    @SaCheckPermission("dataexpertsource:field-list")
+    @SaCheckPermission("dataexpertsource:fieldlist")
     @XjrLog(value = "数据源字段")
     public RT<List<DataExpertSourceFieldVo>> fieldList(@Valid DataExpertSourceFieldListDto dto) {
         return RT.ok(dataExpertSourceService.getFieldList(dto));

src/main/java/com/xjrsoft/module/dataexpert/controller/DataExpertTemplateController.java

@@ -61,7 +61,7 @@ public class DataExpertTemplateController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "数据导出-数据模板列表(分页)")
-    @SaCheckPermission("dataexperttemplate:detail")
+    @SaCheckPermission("dataexperttemplate:page")
     @XjrLog(value = "数据导出-数据模板列表(分页)")
     public RT<PageOutput<DataExpertTemplatePageVo>> page(@Valid DataExpertTemplatePageDto dto) {
 
@@ -79,7 +79,7 @@ public class DataExpertTemplateController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询数据导出-数据模板信息")
-    @SaCheckPermission("dataexperttemplate:detail")
+    @SaCheckPermission("dataexperttemplate:info")
     @XjrLog(value = "根据id查询数据导出-数据模板信息", saveResponseData = true)
     public RT<DataExpertTemplateVo> info(@RequestParam Long id) {
         DataExpertTemplate dataExpertTemplate = dataExpertTemplateService.getById(id);
@@ -91,7 +91,7 @@ public class DataExpertTemplateController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "根据数据源id查询数据导出-数据模板信息")
-    @SaCheckPermission("dataexperttemplate:detail")
+    @SaCheckPermission("dataexperttemplate:list")
     @XjrLog(value = "根据数据源id查询数据导出-数据模板信息")
     public RT<List<DataExpertTemplateVo>> list(@Valid DataExpertTemplateListDto dto) {
         List<DataExpertTemplate> list = dataExpertTemplateService.list(
@@ -101,7 +101,6 @@ public class DataExpertTemplateController {
         return RT.ok(BeanUtil.copyToList(list, DataExpertTemplateVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增数据导出-数据模板")
     @SaCheckPermission("dataexperttemplate:add")
@@ -132,15 +131,15 @@ public class DataExpertTemplateController {
 
     @GetMapping(value = "/field-info")
     @ApiOperation(value = "根据id查询数据导出-数据模板信息")
-    @SaCheckPermission("dataexperttemplate:detail")
+    @SaCheckPermission("dataexperttemplate:fieldinfo")
     @XjrLog(value = "根据id查询数据导出-数据模板信息")
     public RT<List<DataExpertTemplateFieldVo>> getFieldInfo(@RequestParam Long id) {
         return RT.ok(dataExpertTemplateService.getFieldList(id));
     }
 
-
     @PostMapping("/export-query")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("dataexperttemplate:exportquery")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid @RequestBody DataExpertDto dto) throws SQLException, IOException {
         //拼接字段

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateItemController.java

@@ -35,7 +35,7 @@ public class EvaluateItemController {
 
     @GetMapping(value = "/evaluate-item")
     @ApiOperation(value = "评价模板维护评价项页面")
-    @SaCheckPermission("evaluateitem:detail")
+    @SaCheckPermission("evaluateitem:evaluateitem")
     @XjrLog(value = "评价模板维护评价项页面", saveResponseData = true)
     public RT<MakeEvaluateItemVo> list(@Valid MakeEvaluateItemDto dto) {
         MakeEvaluateItemVo makeEvaluateItemVo = evaluateItemService.getMakeEvaluateItem(dto);
@@ -44,7 +44,7 @@ public class EvaluateItemController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询评价项信息")
-    @SaCheckPermission("evaluateitem:detail")
+    @SaCheckPermission("evaluateitem:info")
     @XjrLog(value = "根据id查询评价项信息", saveResponseData = true)
     public RT<EvaluateItemVo> info(@RequestParam Long id) {
         EvaluateItem evaluateItem = evaluateItemService.getById(id);
@@ -54,7 +54,6 @@ public class EvaluateItemController {
         return RT.ok(BeanUtil.toBean(evaluateItem, EvaluateItemVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增评价项")
     @SaCheckPermission("evaluateitem:add")

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateManageController.java

@@ -47,15 +47,13 @@ import java.util.List;
 @AllArgsConstructor
 public class EvaluateManageController {
 
-
     private final IEvaluateManageService evaluateManageService;
     private final IEvaluateTemplateService templateService;
     private final IEvaluateItemService evaluateItemService;
 
-
     @GetMapping(value = "/page")
     @ApiOperation(value = "评价管理列表(分页)")
-    @SaCheckPermission("evaluatemanage:detail")
+    @SaCheckPermission("evaluatemanage:page")
     @XjrLog(value = "评价管理列表(分页)")
     public RT<PageOutput<EvaluateManagePageVo>> page(@Valid EvaluateManagePageDto dto) {
         Page<EvaluateManagePageVo> page = evaluateManageService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -65,7 +63,7 @@ public class EvaluateManageController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询评价管理信息")
-    @SaCheckPermission("evaluatemanage:detail")
+    @SaCheckPermission("evaluatemanage:info")
     @XjrLog(value = "根据id查询评价管理信息", saveResponseData = true)
     public RT<EvaluateManageVo> info(@RequestParam Long id) {
         MPJLambdaWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
@@ -90,7 +88,7 @@ public class EvaluateManageController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("evaluatemanage:edit")
+    @SaCheckPermission("evaluatemanage:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody EvaluateManageChangeStatusDto dto) {
         if (dto.getStatus() == 1) {
@@ -116,7 +114,6 @@ public class EvaluateManageController {
         return RT.ok(true);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增评价管理")
     @SaCheckPermission("evaluatemanage:add")
@@ -186,7 +183,7 @@ public class EvaluateManageController {
 
     @GetMapping(value = "/evaluate-item")
     @ApiOperation(value = "评价模板维护评价项页面")
-    @SaCheckPermission("evaluateitem:detail")
+    @SaCheckPermission("evaluatemanage:evaluateitem")
     @XjrLog(value = "评价模板维护评价项页面", saveResponseData = true)
     public RT<EvaluateManageBodyVo> list(@Valid EvaluateManageChangeStatusDto dto) {
         EvaluateManageBodyVo evaluateManageItem = evaluateItemService.getEvaluateManageItem(dto);

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateObjectController.java

@@ -30,12 +30,11 @@ import java.util.List;
 @AllArgsConstructor
 public class EvaluateObjectController {
 
-
     private final IEvaluateObjectService evaluateObjectService;
 
     @GetMapping(value = "/object-list")
     @ApiOperation(value = "评价对象列表（已生成数据）")
-    @SaCheckPermission("evaluateobject:detail")
+    @SaCheckPermission("evaluateobject:objectlist")
     @XjrLog(value = "评价对象列表（已生成数据）")
     public RT<List<EvaluateObjectListVo>> objectList(@Valid EvaluateObjectListDto dto) {
         List<EvaluateObjectListVo> list = evaluateObjectService.getObjectList(dto);
@@ -44,7 +43,7 @@ public class EvaluateObjectController {
 
     @GetMapping(value = "/object-grade-list")
     @ApiOperation(value = "评价对象根据年级分组的列表（已生成数据）")
-    @SaCheckPermission("evaluateobject:detail")
+    @SaCheckPermission("evaluateobject:objectgradelist")
     @XjrLog(value = "评价对象根据年级分组的列表（已生成数据）")
     public RT<List<EvaluateObjectGradeListVo>> objectGradeList(@Valid EvaluateObjectGradeListDto dto) {
         List<EvaluateObjectGradeListVo> list = evaluateObjectService.getObjectGradeList(dto);
@@ -53,7 +52,7 @@ public class EvaluateObjectController {
 
     @DeleteMapping(value = "/object-grade-delete")
     @ApiOperation(value = "删除根据年级评价对象根据年级分组的列表（已生成数据）")
-    @SaCheckPermission("evaluateobject:delete")
+    @SaCheckPermission("evaluateobject:objectgradedelete")
     @XjrLog(value = "删除根据年级评价对象根据年级分组的列表（已生成数据）", saveResponseData = true)
     public RT<Boolean> objectGradeDelete(@Valid @RequestBody ObjectGradeDeleteDto dto) {
         return RT.ok(evaluateObjectService.objectGradeDelete(dto));
@@ -68,10 +67,9 @@ public class EvaluateObjectController {
         return RT.ok(isSuccess);
     }
 
-
     @GetMapping(value = "/use-object-list")
     @ApiOperation(value = "评价对象列表（用于选择的数据）")
-    @SaCheckPermission("evaluateobject:detail")
+    @SaCheckPermission("evaluateobject:useobjectlist")
     @XjrLog(value = "评价对象列表（用于选择的数据）")
     public RT<List<EvaluateObjectListVo>> useObjectList(@Valid EvaluateObjectListDto dto) {
         List<EvaluateObjectListVo> list = evaluateObjectService.getNewObjectList(dto);

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateResultController.java

@@ -42,7 +42,7 @@ public class EvaluateResultController {
 
     @GetMapping(value = "/index-page")
     @ApiOperation(value = "评价结果首页列表(分页)")
-    @SaCheckPermission("evaluateresult:detail")
+    @SaCheckPermission("evaluateresult:indexpage")
     @XjrLog(value = "评价结果首页列表(分页)")
     public RT<PageOutput<EvaluateResultIndexPageVo>> indexPage(@Valid EvaluateResultIndexPageDto dto) {
         IPage<EvaluateResultIndexPageVo> page = evaluateResultService.getIndexPage(dto);
@@ -52,7 +52,7 @@ public class EvaluateResultController {
 
     @GetMapping(value = "/detail-page")
     @ApiOperation(value = "评价结果详情查看列表(分页)")
-    @SaCheckPermission("evaluateresult:detail")
+    @SaCheckPermission("evaluateresult:detailpage")
     @XjrLog(value = "评价结果详情查看列表(分页)")
     public RT<PageOutput<EvaluateResultDetailPageVo>> detailPage(@Valid EvaluateResultDetailPageDto dto) {
         IPage<EvaluateResultDetailPageVo> page = evaluateResultService.getDetailPage(dto);
@@ -62,7 +62,7 @@ public class EvaluateResultController {
 
     @GetMapping(value = "/detail-page-detail")
     @ApiOperation(value = "评价结果详情查看列表的详情")
-    @SaCheckPermission("evaluateresult:detail")
+    @SaCheckPermission("evaluateresult:etailpagedetail")
     @XjrLog(value = "评价结果详情查看列表的详情", saveResponseData = true)
     public RT<EvaluateResultDetailPageDetailVo> detailPageDetail(@Valid EvaluateResultDetailPageDetailDto dto) {
         EvaluateResultDetailPageDetailVo evaluateResultDetailPageDetailVo = evaluateResultService.getDetailPageDetail(dto);
@@ -71,7 +71,7 @@ public class EvaluateResultController {
 
     @GetMapping(value = "/result-viewing-page")
     @ApiOperation(value = "结果查看(分页)")
-    @SaCheckPermission("evaluateresult:detail")
+    @SaCheckPermission("evaluateresult:resultviewingpage")
     @XjrLog(value = "结果查看(分页)")
     public RT<List<ResultViewingPageVo>> pageResultViewing(@Valid ResultViewingPageDto dto) {
         List<ResultViewingPageVo> list = evaluateResultService.pageResultViewing(dto);
@@ -81,6 +81,7 @@ public class EvaluateResultController {
     @PostMapping("/export-query")
 //    @GetMapping("/expor")
     @ApiOperation(value = "入参导出")
+    @SaCheckPermission("evaluateresult:exportquery")
     @XjrLog(value = "入参导出")
     public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody ResultViewingPageDto dto) {
         String fileName = "recordDetailExportQuery" + ExcelTypeEnum.XLSX.getValue();

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateSubmitRecordController.java

@@ -41,7 +41,7 @@ public class EvaluateSubmitRecordController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "参评人提交记录表列表(分页)")
-    @SaCheckPermission("evaluatesubmitrecord:detail")
+    @SaCheckPermission("evaluatesubmitrecord:page")
     @XjrLog(value = "参评人提交记录表列表(分页)")
     public RT<PageOutput<EvaluateSubmitRecordPageVo>> page(@Valid EvaluateSubmitRecordPageDto dto) {
 
@@ -56,7 +56,7 @@ public class EvaluateSubmitRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询参评人提交记录表信息")
-    @SaCheckPermission("evaluatesubmitrecord:detail")
+    @SaCheckPermission("evaluatesubmitrecord:info")
     @XjrLog(value = "根据id查询参评人提交记录表信息", saveResponseData = true)
     public RT<EvaluateSubmitRecordVo> info(@RequestParam Long id) {
         EvaluateSubmitRecord evaluateSubmitRecord = evaluateSubmitRecordService.getById(id);
@@ -66,7 +66,6 @@ public class EvaluateSubmitRecordController {
         return RT.ok(BeanUtil.toBean(evaluateSubmitRecord, EvaluateSubmitRecordVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增参评人提交记录表")
     @SaCheckPermission("evaluatesubmitrecord:add")

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateTemplateController.java

@@ -44,13 +44,12 @@ import java.util.List;
 @AllArgsConstructor
 public class EvaluateTemplateController {
 
-
     private final IEvaluateTemplateService evaluateTemplateService;
     private final IEvaluateManageService evaluateManageService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "评价模版列表(分页)")
-    @SaCheckPermission("evaluatetemplate:detail")
+    @SaCheckPermission("evaluatetemplate:page")
     @XjrLog(value = "评价模版列表(分页)")
     public RT<PageOutput<EvaluateTemplatePageVo>> page(@Valid EvaluateTemplatePageDto dto) {
         Page<EvaluateTemplatePageVo> page = evaluateTemplateService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -60,7 +59,7 @@ public class EvaluateTemplateController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询评价模版信息")
-    @SaCheckPermission("evaluatetemplate:detail")
+    @SaCheckPermission("evaluatetemplate:info")
     @XjrLog(value = "根据id查询评价模版信息", saveResponseData = true)
     public RT<EvaluateTemplateVo> info(@RequestParam Long id) {
         EvaluateTemplateVo evaluateTemplateVo = evaluateTemplateService.getInfo(id);
@@ -70,7 +69,6 @@ public class EvaluateTemplateController {
         return RT.ok(evaluateTemplateVo);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增评价模版")
     @SaCheckPermission("evaluatetemplate:add")
@@ -127,6 +125,7 @@ public class EvaluateTemplateController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("evaluatetemplate:export")
     @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid EvaluateTemplatePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<EvaluateTemplatePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : page(dto).getData().getList();
@@ -138,7 +137,7 @@ public class EvaluateTemplateController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("evaluatemanage:edit")
+    @SaCheckPermission("evaluatetemplate:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody UpdateEvaluateTemplateStatusDto dto) {
         Boolean release = evaluateTemplateService.changeStatus(dto);

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateWriteController.java

@@ -31,14 +31,13 @@ import java.util.List;
 @AllArgsConstructor
 public class EvaluateWriteController {
 
-
     private final IEvaluateManageService evaluateManageService;
 
     private final IEvaluateResultService evaluateResultService;
 
     @GetMapping(value = "/index-page")
     @ApiOperation(value = "评价管理首页列表(分页)")
-    @SaCheckPermission("evaluatemanage:detail")
+    @SaCheckPermission("evaluatemanage:indexpage")
     @XjrLog(value = "评价管理首页列表(分页)")
     public RT<PageOutput<MobileIndexPageVo>> indexPage(@Valid MobileIndexPageDto dto) {
         dto.setLoginUserId(StpUtil.getLoginIdAsLong());
@@ -49,7 +48,7 @@ public class EvaluateWriteController {
 
     @GetMapping(value = "/result-page")
     @ApiOperation(value = "评价结果页列表(分页)")
-    @SaCheckPermission("evaluatemanage:detail")
+    @SaCheckPermission("evaluatemanage:resultpage")
     @XjrLog(value = "评价结果页列表(分页)")
     public RT<PageOutput<MobileResultPageVo>> resultPage(@Valid MobileResultPageDto dto) {
         dto.setLoginUserId(StpUtil.getLoginIdAsLong());
@@ -60,7 +59,7 @@ public class EvaluateWriteController {
 
     @GetMapping(value = "/drill-ev-class-list")
     @ApiOperation(value = "教官当天评价班级集合")
-    @SaCheckPermission("evaluatemanage:detail")
+    @SaCheckPermission("evaluatemanage:drillevclasslist")
     @XjrLog(value = "教官当天评价班级集合")
     public RT<List<DrillEvaluateClassListVo>> drillEvClassList(@Valid DrillEvaluateClassListDto dto) {
         dto.setLoginUserId(StpUtil.getLoginIdAsLong());
@@ -70,7 +69,7 @@ public class EvaluateWriteController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询评价项信息")
-    @SaCheckPermission("evaluateitem:detail")
+    @SaCheckPermission("evaluateitem:info")
     @XjrLog(value = "根据id查询评价项信息")
     public RT<EvaluateWriteVo> info(@RequestParam Long id) {
         EvaluateWriteVo evaluateWriteVo = evaluateManageService.getWriteInfo(id);
@@ -82,7 +81,7 @@ public class EvaluateWriteController {
 
     @GetMapping(value = "/item-list")
     @ApiOperation(value = "评价题目列表")
-    @SaCheckPermission("evaluatemanage:detail")
+    @SaCheckPermission("evaluatemanage:itemlist")
     @XjrLog(value = "评价题目列表")
     public RT<List<EvaluateManageItemVo>> itemList(@RequestParam Long id) {
         List<EvaluateManageItemVo> itemList = evaluateManageService.getItemList(id);
@@ -91,7 +90,7 @@ public class EvaluateWriteController {
 
     @GetMapping(value = "/result-list")
     @ApiOperation(value = "评价结果列表")
-    @SaCheckPermission("evaluatemanage:detail")
+    @SaCheckPermission("evaluatemanage:resultlist")
     @XjrLog(value = "评价结果列表")
     public RT<List<EvaluateManageItemVo>> resultList(@Valid ResultListDto dto) {
         List<EvaluateManageItemVo> itemList = evaluateManageService.getResultList(dto);

src/main/java/com/xjrsoft/module/feedback/controller/FeedbackController.java

@@ -42,7 +42,7 @@ public class FeedbackController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="意见反馈列表(分页)")
-    @SaCheckPermission("feedback:detail")
+    @SaCheckPermission("feedback:page")
     @XjrLog(value = "意见反馈列表(分页)")
     public RT<PageOutput<FeedbackPageVo>> page(@Valid FeedbackPageDto dto){
         IPage<FeedbackPageVo> page = feedbackService.pageRubAndHand(dto);
@@ -52,7 +52,7 @@ public class FeedbackController {
 
     @GetMapping(value = "/history-page-mobile")
     @ApiOperation(value="移动端-历史反馈列表(分页)")
-    @SaCheckPermission("feedback:detail")
+    @SaCheckPermission("feedback:historypagemobile")
     @XjrLog(value = "移动端-历史反馈列表(分页)")
     public RT<PageOutput<HistoryPageMobileVo>> historyPageMobile(@Valid HistoryPageMobileDto dto){
         IPage<HistoryPageMobileVo> page = feedbackService.historyPageMobile(dto);
@@ -62,7 +62,7 @@ public class FeedbackController {
 
     @GetMapping(value = "/item-detail-list")
     @ApiOperation(value="反馈详情列表(不分页)")
-    @SaCheckPermission("feedback:detail")
+    @SaCheckPermission("feedback:itemdetaillist")
     @XjrLog(value = "反馈详情列表(不分页)")
     public RT<List<ItemDetailListVo>> itemDetailList(@Valid ItemDetailListDto dto){
         List<ItemDetailListVo> List = feedbackService.itemDetailList(dto);
@@ -71,7 +71,7 @@ public class FeedbackController {
 
     @GetMapping(value = "isRead")
     @ApiOperation(value="当前用户的反馈的回复是否已经全部阅读")
-    @SaCheckPermission("feedback:detail")
+    @SaCheckPermission("feedback:isRead")
     @XjrLog(value = "当前用户的反馈的回复是否已经全部阅读")
     public RT<Boolean> isRead(){
         LambdaQueryWrapper<Feedback> feedbackLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -88,7 +88,7 @@ public class FeedbackController {
 
     @PostMapping("/add-feedback-item")
     @ApiOperation(value = "新增（补充）意见反馈-具体反馈单项")
-    @SaCheckPermission("feedback:add")
+    @SaCheckPermission("feedback:addfeedbackitem")
     @XjrLog(value = "新增（补充）意见反馈-具体反馈单项")
     public RT<Boolean> addFeedbackItem(@Valid @RequestBody AddFeedbackItemDto dto){
         return RT.ok(feedbackService.addFeedbackItem(dto));
@@ -96,7 +96,7 @@ public class FeedbackController {
 
     @PostMapping("/reply")
     @ApiOperation(value = "回复反馈")
-    @SaCheckPermission("feedback:edit")
+    @SaCheckPermission("feedback:reply")
     @XjrLog(value = "回复反馈")
     public RT<Boolean> replyFeedbackItem(@Valid @RequestBody ReplyFeedbackItemDto dto){
         return RT.ok(feedbackService.replyFeedbackItem(dto));
@@ -104,7 +104,7 @@ public class FeedbackController {
 
     @PostMapping("/read")
     @ApiOperation(value = "已读回复")
-    @SaCheckPermission("feedback:edit")
+    @SaCheckPermission("feedback:read")
     @XjrLog(value = "已读回复")
     public RT<Boolean> readFeedbackItem(@Valid @RequestBody ReadFeedbackItemDto dto){
         return RT.ok(feedbackService.readFeedbackItem(dto));

src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.form.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Db;
 import cn.hutool.db.Entity;
@@ -85,6 +86,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/list")
     @ApiOperation(value = "自定义表单根据配置获取列表数据 不分页")
+    @SaCheckPermission("formexecute:list")
     @XjrLog(value = "自定义表单根据配置获取列表数据 不分页")
     public R list(@Valid @RequestBody FormExecuteListDto dto) {
         return R.ok(formExecuteService.list(dto));
@@ -97,6 +99,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/app/list")
     @ApiOperation(value = "App 自定义表单根据配置获取列表数据 不分页")
+    @SaCheckPermission("formexecute:applist")
     @XjrLog(value = "App 自定义表单根据配置获取列表数据 不分页")
     public R appList(@Valid @RequestBody AppFormExecuteListDto dto) {
         return R.ok(formExecuteService.appList(dto));
@@ -109,6 +112,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/page")
     @ApiOperation(value = "自定义表单根据配置获取列表数据 分页")
+    @SaCheckPermission("formexecute:page")
     @XjrLog(value = "自定义表单根据配置获取列表数据 分页")
     public R page(@Valid @RequestBody FormExecutePageDto dto) {
         return R.ok(formExecuteService.page(dto));
@@ -121,6 +125,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/app/page")
     @ApiOperation(value = "App 自定义表单根据配置获取列表数据 分页")
+    @SaCheckPermission("formexecute:apppage")
     @XjrLog(value = "App 自定义表单根据配置获取列表数据 分页")
     public R appPage(@Valid @RequestBody AppFormExecutePageDto dto) {
         return R.ok(formExecuteService.appPage(dto));
@@ -133,6 +138,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/info")
     @ApiOperation(value = "表单数据")
+    @SaCheckPermission("formexecute:info")
     @XjrLog(value = "表单数据")
     public R info(@Valid @RequestBody FormExecuteInfoDto dto) {
         return R.ok(formExecuteService.info(dto));
@@ -145,6 +151,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/app/info")
     @ApiOperation(value = "app 表单数据")
+    @SaCheckPermission("formexecute:appinfo")
     @XjrLog(value = "app 表单数据")
     public R appInfo(@Valid @RequestBody AppFormExecuteInfoDto dto) {
         return R.ok(formExecuteService.appInfo(dto));
@@ -155,6 +162,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/add")
     @ApiOperation(value = "新增")
+    @SaCheckPermission("formexecute:add")
     @XjrLog(value = "新增表单数据")
     public R add(@Valid @RequestBody FormExecuteAddOrUpdateDto dto) {
         return R.ok(formExecuteService.add(dto));
@@ -165,6 +173,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/app/add")
     @ApiOperation(value = "app 新增")
+    @SaCheckPermission("formexecute:appadd")
     @XjrLog(value = "app 新增表单数据")
     public R appAdd(@Valid @RequestBody AppFormExecuteAddOrUpdateDto dto) {
         return R.ok(formExecuteService.appAdd(dto));
@@ -175,6 +184,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/update")
     @ApiOperation(value = "修改")
+    @SaCheckPermission("formexecute:update")
     @XjrLog(value = "修改表单数据")
     public R update(@Valid @RequestBody FormExecuteAddOrUpdateDto dto) {
         return R.ok(formExecuteService.update(dto));
@@ -185,6 +195,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/app/update")
     @ApiOperation(value = "app 修改")
+    @SaCheckPermission("formexecute:appupdate")
     @XjrLog(value = "app 修改表单数据")
     public R appUpdate(@Valid @RequestBody AppFormExecuteAddOrUpdateDto dto) {
         return R.ok(formExecuteService.appUpdate(dto));
@@ -195,6 +206,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/delete")
     @ApiOperation(value = "删除")
+    @SaCheckPermission("formexecute:delete")
     @XjrLog(value = "删除表单数据")
     public R delete(@Valid @RequestBody FormExecuteDeleteDto dto) {
         return R.ok(formExecuteService.delete(dto));
@@ -205,6 +217,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/app/delete")
     @ApiOperation(value = "app 删除")
+    @SaCheckPermission("formexecute:appdelete")
     @XjrLog(value = "app 删除表单数据")
     public R appDelete(@Valid @RequestBody AppFormExecuteDeleteDto dto) {
         return R.ok(formExecuteService.appDelete(dto));
@@ -217,6 +230,7 @@ public class FormExecuteController {
      */
     @PostMapping(value = "/workflow/info")
     @ApiOperation(value = "表单数据")
+    @SaCheckPermission("formexecute:workflowinfo")
     @XjrLog(value = "表单数据")
     public R workFlowInfo(@Valid @RequestBody FormExecuteWorkflowInfoDto dto) {
         return R.ok(formExecuteService.workFlowInfo(dto));
@@ -228,6 +242,7 @@ public class FormExecuteController {
 //    public ResponseEntity<byte[]> export(@Valid FormExecuteListDto dto) throws IOException {
     @PostMapping(value = "/export")
     @ApiOperation(value = "导出")
+    @SaCheckPermission("formexecute:export")
     @XjrLog(value = "导出表单数据")
     public ResponseEntity<byte[]> export(@Valid @RequestBody FormExecuteListDto dto) throws IOException {
         FormRelease formRelease = formReleaseService.getById(dto.getReleaseId());
@@ -454,6 +469,7 @@ public class FormExecuteController {
 
     @PostMapping("/import")
     @ApiOperation(value = "导入")
+    @SaCheckPermission("formexecute:import")
     @XjrLog(value = "导入", saveRequestData = false, saveResponseData = true)
     public R importData(@RequestParam String releaseId, @RequestParam MultipartFile file) throws IOException {
         String sql = "SELECT id,code,value,remark FROM base_system_config WHERE code= 'studentConsumeDate' ";
@@ -501,6 +517,7 @@ public class FormExecuteController {
 
     @PutMapping("/data-auth")
     @ApiOperation(value = "批量设置权限所属人")
+    @SaCheckPermission("formexecute:dataauth")
     @XjrLog(value = "批量设置权限所属人", saveResponseData = true)
     public R setDataAUth(@RequestBody BatchSetDataAuthDto dto, @RequestParam String releaseId) {
         FormRelease formRelease = formReleaseService.getById(releaseId);

src/main/java/com/xjrsoft/module/form/controller/FormHistoryController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.form.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.annotation.XjrLog;
@@ -40,6 +41,7 @@ public class FormHistoryController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "历史记录")
+    @SaCheckPermission("formhistory:list")
     @XjrLog(value = "自定义表单历史记录")
     public R list(@RequestParam Long formId) {
 
@@ -59,6 +61,7 @@ public class FormHistoryController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "表单设计模板详情")
+    @SaCheckPermission("formhistory:info")
     @XjrLog(value = "表单设计模板详情")
     public R info(@RequestParam Long id) {
         FormHistory history = formHistoryService.getById(id);

src/main/java/com/xjrsoft/module/form/controller/FormReleaseController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.form.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -45,6 +46,7 @@ public class FormReleaseController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "表单发布列表(分页)")
+    @SaCheckPermission("formrelease:page")
     @XjrLog(value = "获取表单发布列表")
     public R page(@Valid FormReleasePageDto dto) {
         //因为多表关联 会有多个表都使用了id字段，  所以必须专门指定主表的Id
@@ -69,6 +71,7 @@ public class FormReleaseController {
 
     @PostMapping
     @ApiOperation(value = "自定义表单发布")
+    @SaCheckPermission("formrelease:add")
     @XjrLog(value = "自定义表单发布")
     public R add(@Valid @RequestBody AddFormReleaseDto dto) {
         return R.ok(formReleaseService.addFormRelease(dto));
@@ -76,14 +79,15 @@ public class FormReleaseController {
 
     @PutMapping
     @ApiOperation(value = "修改自定义表单发布")
+    @SaCheckPermission("formrelease:edit")
     @XjrLog(value = "自定义表单发布")
     public R update(@Valid @RequestBody UpdateFormReleaseDto dto) {
         return R.ok(formReleaseService.updateFormRelease(dto));
     }
 
-
     @GetMapping(value = "/info")
     @ApiOperation(value = "表单发布详情")
+    @SaCheckPermission("formrelease:info")
     @XjrLog(value = "表单发布详情")
     public R info(@RequestParam Long id) {
         //因为多表关联 会有多个表都使用了id字段，  所以必须专门指定主表的Id
@@ -95,9 +99,9 @@ public class FormReleaseController {
         return R.ok(BeanUtil.toBean(release, FormReleaseVo.class));
     }
 
-
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("formrelease:delete")
     @XjrLog(value = "删除")
     public R delete(@Valid @RequestBody List<Long> ids) {
         return R.ok(formReleaseService.removeBatchByIds(ids));

src/main/java/com/xjrsoft/module/form/controller/FormTemplateController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.form.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -70,6 +71,7 @@ public class FormTemplateController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "表单设计模板(不分页)")
+    @SaCheckPermission("formtemplate:list")
     @XjrLog(value = "表单设计模板")
     public R list(@Valid FormTemplateListDto dto) {
         List<FormTemplate> list = formTemplateService.list(Wrappers.lambdaQuery(FormTemplate.class)
@@ -85,6 +87,7 @@ public class FormTemplateController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "表单设计模板(分页),过滤未启用数据")
+    @SaCheckPermission("formtemplate:page")
     @XjrLog(value = "表单设计模板")
     public R page(@Valid FormTemplatePageDto dto) {
 
@@ -109,6 +112,7 @@ public class FormTemplateController {
 
     @GetMapping(value = "/enabled-page")
     @ApiOperation(value = "表单设计模板(分页)，不过滤未启用数据")
+    @SaCheckPermission("formtemplate:enabledpage")
     @XjrLog(value = "表单设计模板")
     public R pageEnabled(@Valid FormTemplatePageDto dto) {
 
@@ -132,6 +136,7 @@ public class FormTemplateController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "表单设计模板详情")
+    @SaCheckPermission("formtemplate:info")
     @XjrLog(value = "表单设计模板详情")
     public R info(@RequestParam Long id) {
         FormTemplate template = formTemplateService.getById(id);
@@ -143,6 +148,7 @@ public class FormTemplateController {
 
     @GetMapping(value = "/info/multi")
     @ApiOperation(value = "表单设计模板详情(批量查询)")
+    @SaCheckPermission("formtemplate:infomulti")
     @XjrLog(value = "表单设计模板详情(批量查询)")
     public R multiInfo(@RequestParam String id) {
         List<FormTemplate> formTemplates = formTemplateService.listByIds(Arrays.asList(id.split(StringPool.COMMA)));
@@ -152,6 +158,7 @@ public class FormTemplateController {
 
     @PutMapping("/status")
     @ApiOperation(value = "修改表单状态")
+    @SaCheckPermission("formtemplate:status")
     @XjrLog(value = "修改表单状态")
     public R updateEnabled(@Valid @RequestBody UpdateTemplateStatusDto dto) {
         //根据id修改表单enabledMark
@@ -160,6 +167,7 @@ public class FormTemplateController {
 
     @PostMapping(value = "/data-first")
     @ApiOperation(value = "数据优先 新增")
+    @SaCheckPermission("formtemplate:datafirst")
     @XjrLog(value = "数据优先新增")
     public R addDataFirst(@Valid @RequestBody AddFormDataFirstDto dto) {
         return R.ok(formTemplateService.addDataFirst(dto));
@@ -167,6 +175,7 @@ public class FormTemplateController {
 
     @PostMapping(value = "/code-first")
     @ApiOperation(value = "界面优先 或者  简易模板 新增")
+    @SaCheckPermission("formtemplate:codefirst")
     @XjrLog(value = "界面优先 或者 简易模板新增")
     public R addCodeFirst(@Valid @RequestBody AddFormCodeFirstDto dto) {
         return R.ok(formTemplateService.addCodeFirst(dto));
@@ -174,14 +183,15 @@ public class FormTemplateController {
 
     @PutMapping(value = "/data-first")
     @ApiOperation(value = "修改数据优先")
+    @SaCheckPermission("formtemplate:datafirst")
     @XjrLog(value = "修改数据优先")
     public R updateDataFirst(@Valid @RequestBody UpdateFormDataFirstDto dto) {
         return R.ok(formTemplateService.updateDataFirst(dto));
     }
 
-
     @PutMapping(value = "/code-first")
     @ApiOperation(value = "修改界面优先")
+    @SaCheckPermission("formtemplate:codefirst")
     @XjrLog(value = "修改界面优先")
     public R updateCodeFirst(@Valid @RequestBody UpdateFormCodeFirstDto dto) {
         return R.ok(formTemplateService.updateCodeFirst(dto));
@@ -189,6 +199,7 @@ public class FormTemplateController {
 
     @DeleteMapping
     @ApiOperation(value = "删除")
+    @SaCheckPermission("formtemplate:delete")
     @XjrLog(value = "删除", saveResponseData = true)
     public R delete(@Valid @RequestBody List<Long> ids) {
         formHistoryService.remove(Wrappers.lambdaQuery(FormHistory.class).in(FormHistory::getFormId, ids));
@@ -197,6 +208,7 @@ public class FormTemplateController {
 
     @PostMapping(value = "/test-code")
     @ApiOperation(value = "表单测试代码生成器")
+    @SaCheckPermission("formtemplate:testcode")
     @XjrLog(value = "测试表单预览代码生成器")
     public R test(@Valid @RequestBody DateTestDto dto) {
         FormRelease formRelease = formReleaseService.getById(dto.getFormReleaseId());
@@ -214,6 +226,7 @@ public class FormTemplateController {
 
     @GetMapping(value = "/desk-form-page")
     @ApiOperation(value = "桌面设计-复杂列表页使用(分页),过滤未启用数据")
+    @SaCheckPermission("formtemplate:deskformpage")
     @XjrLog(value = "表单设计模板")
     public R deskFormPage(@Valid FormTemplateDeskPageDto dto) {
         //只需要已发布的，和系统表单的数据

src/main/java/com/xjrsoft/module/generator/controller/GeneratorController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.generator.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
@@ -28,6 +29,7 @@ public class GeneratorController {
 
     @PostMapping("/preview-code/data-first")
     @ApiOperation(value = "数据优先-预览代码", notes = "数据优先-预览代码")
+    @SaCheckPermission("generator:previewcodedatafirst")
     @XjrLog(value = "数据优先预览代码")
     public R previewCode(@Valid @RequestBody DataFirstPreviewDto dto) {
         return R.ok(generatorService.getPreviewCodes(dto));
@@ -35,6 +37,7 @@ public class GeneratorController {
 
     @PostMapping("/generator-code/data-first")
     @ApiOperation(value = "数据优先-生成代码", notes = "数据优先-生成代码")
+    @SaCheckPermission("generator:generatorcodedatafirst")
     @XjrLog(value = "数据优先生成代码")
     public R generatorCode(@Valid @RequestBody DataFirstGeneratorDto dto) {
         return R.ok(generatorService.generateCodes(dto));
@@ -42,6 +45,7 @@ public class GeneratorController {
 
     @PostMapping("/preview-code/code-first")
     @ApiOperation(value = "代码优先-预览代码", notes = "代码优先-预览代码")
+    @SaCheckPermission("generator:previewcodecodefirst")
     @XjrLog(value = "界面优先预览代码")
     public R previewCodeByCodeFirst(@Valid @RequestBody CodeFirstPreviewDto dto) {
         return R.ok(generatorService.getCodeFirstPreviewCodes(dto));
@@ -49,6 +53,7 @@ public class GeneratorController {
 
     @PostMapping("/generator-code/code-first")
     @ApiOperation(value = "代码优先-生成代码", notes = "代码优先-生成代码")
+    @SaCheckPermission("generator:generatorcodecodefirst")
     @XjrLog(value = "界面优先生成代码")
     public R generatorCodeByCodeFirst(@Valid @RequestBody CodeFirstGeneratorDto dto) {
         return R.ok(generatorService.generateCodeFirstCodes(dto));
@@ -57,6 +62,7 @@ public class GeneratorController {
 
     @PostMapping("/generator-code/batch")
     @ApiOperation(value = "批量生成模板-生成代码", notes = "批量生成模板-生成代码")
+    @SaCheckPermission("generator:generatorcodebatch")
     @XjrLog(value = "批量生成代码")
     public R generatorCodeBatch(@Valid @RequestBody BatchGeneratorDto dto) {
         return R.ok(generatorService.generatorCodeBatch(dto));
@@ -64,6 +70,7 @@ public class GeneratorController {
 
     @GetMapping("/table-info")
     @ApiOperation(value = "根据 tabconfig 获取 表结构信息  用于生成前端model", notes = "根据 tabconfig 获取 表结构信息  用于生成前端model")
+    @SaCheckPermission("generator:tableinfo")
     @XjrLog(value = "获取表结构信息生成前端model")
     public R tableInfo(@Valid @RequestBody TableInfoDto dto) {
         return R.ok(generatorService.getTableInfo(dto));
@@ -72,6 +79,7 @@ public class GeneratorController {
 
     @PostMapping("/generator-app-code")
     @ApiOperation(value = "生成手机端代码", notes = "生成手机端代码")
+    @SaCheckPermission("generator:generatorappcode")
     @XjrLog(value = "生成手机端代码")
     public R generatorAppCode(@Valid @RequestBody GeneratorAppDto dto) {
         return R.ok(generatorService.generateAppCodes(dto));

src/main/java/com/xjrsoft/module/hikvision/controller/EventController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.hikvision.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -53,6 +54,7 @@ public class EventController {
 
     @PostMapping("/receiveCar")
     @ApiOperation(value = "接收车辆事件")
+    @SaCheckPermission("event:receivecar")
     @XjrLog(value = "接收车辆事件")
     public ResponseEntity<Void> receiveCarEvent(@RequestBody(required = false) String eventData) {
         log.info("Received event data: {}", eventData);
@@ -72,6 +74,7 @@ public class EventController {
 
     @PostMapping("/receivePeople")
     @ApiOperation(value = "接收人员事件")
+    @SaCheckPermission("event:receivepeople")
     @XjrLog(value = "接收人员事件")
     public ResponseEntity<Void> receivePeopleEvent(@RequestBody(required = false) String eventData) {
         log.info("Received event data: {}", eventData);
@@ -154,6 +157,7 @@ public class EventController {
 
     @PostMapping("/visit")
     @ApiOperation(value = "接收访客事件")
+    @SaCheckPermission("event:visit")
     @XjrLog(value = "接收访客事件")
     public ResponseEntity<Void> receiveVisitEvent(@RequestBody(required = false) String eventData) {
         log.info("Received event data: {}", eventData);
@@ -171,6 +175,7 @@ public class EventController {
 
     @PostMapping("/subscribe")
     @ApiOperation(value = "订阅事件")
+    @SaCheckPermission("event:subscribe")
     @XjrLog(value = "订阅事件", saveResponseData = true)
     public RT<Boolean> subscribeEvent() {
         ApiUtil apiUtil = new ApiUtil();
@@ -195,6 +200,7 @@ public class EventController {
 
     @PostMapping("/query")
     @ApiOperation(value = "查询已订阅事件")
+    @SaCheckPermission("event:query")
     @XjrLog(value = "查询已订阅事件", saveResponseData = true)
     public String queryEvent() {
         ApiUtil apiUtil = new ApiUtil();
@@ -212,6 +218,7 @@ public class EventController {
 
     @PostMapping("/cancel")
     @ApiOperation(value = "取消已订阅事件")
+    @SaCheckPermission("event:cancel")
     @XjrLog(value = "取消已订阅事件", saveResponseData = true)
     public String cancelEvent() {
         ApiUtil apiUtil = new ApiUtil();

src/main/java/com/xjrsoft/module/hikvision/controller/OutInController.java

@@ -41,7 +41,7 @@ public class OutInController {
 
     @GetMapping("/page")
     @ApiOperation(value = "海康记录查询(分页)")
-    @SaCheckPermission("outin:detail")
+    @SaCheckPermission("outin:page")
     @XjrLog(value = "海康记录查询(分页)")
     public RT<PageOutput<HikvisionOutinPageVo>> page(@Valid HikvisionOutinPageDto dto) {
         ApiUtil apiUtil = new ApiUtil();
@@ -87,7 +87,7 @@ public class OutInController {
 
     @GetMapping("/car-list")
     @ApiOperation(value = "根据用户id查询车牌号")
-    @SaCheckPermission("outin:detail")
+    @SaCheckPermission("outin:carlist")
     @XjrLog(value = "根据用户id查询车牌号")
     public RT<List<HikvisionCarListVo>> carList(@Valid HikvisionCarOutinPageDto dto) {
         if (dto.getUserId() == null) {
@@ -105,10 +105,9 @@ public class OutInController {
         return RT.ok(result);
     }
 
-
     @GetMapping("/car-page")
     @ApiOperation(value = "海康车辆出入记录查询(分页)")
-    @SaCheckPermission("outin:detail")
+    @SaCheckPermission("outin:carpage")
     @XjrLog(value = "海康车辆出入记录查询(分页)")
     public RT<PageOutput<HikvisionCarOutinPageVo>> carPage(@Valid HikvisionCarOutinPageDto dto) {
         ApiUtil apiUtil = new ApiUtil();

src/main/java/com/xjrsoft/module/holiday/controller/HolidayDateController.java

@@ -37,12 +37,11 @@ import java.util.List;
 @AllArgsConstructor
 public class HolidayDateController {
 
-
     private final IHolidayDateService holidayDateService;
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "列表(不分页)")
-    @SaCheckPermission("holidaydate:detail")
+    @SaCheckPermission("holidaydate:list")
     @XjrLog(value = "列表(不分页)")
     public RT<List<HolidayDateListVo>> list(@Valid HolidayDateListDto dto) {
 
@@ -62,7 +61,7 @@ public class HolidayDateController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "列表(分页)")
-    @SaCheckPermission("holidaydate:detail")
+    @SaCheckPermission("holidaydate:page")
     @XjrLog(value = "列表(分页)")
     public RT<PageOutput<HolidayDatePageVo>> page(@Valid HolidayDatePageDto dto) {
 
@@ -78,7 +77,7 @@ public class HolidayDateController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询信息")
-    @SaCheckPermission("holidaydate:detail")
+    @SaCheckPermission("holidaydate:info")
     @XjrLog(value = "根据id查询信息", saveResponseData = true)
     public RT<HolidayDateVo> info(@RequestParam Long id) {
         HolidayDate holidayDate = holidayDateService.getById(id);
@@ -90,14 +89,13 @@ public class HolidayDateController {
 
     @PostMapping(value = "init")
     @ApiOperation(value = "初始化年节假日数据")
-    @SaCheckPermission("holidaydate:add")
+    @SaCheckPermission("holidaydate:init")
     @XjrLog(value = "初始化年节假日数据", saveResponseData = true)
     public RT<Boolean> initYear(@Valid @RequestBody InitYearDto dto) {
         boolean isSuccess = holidayDateService.initHoliday(dto.getYear());
         return RT.ok(isSuccess);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增")
     @SaCheckPermission("holidaydate:add")

src/main/java/com/xjrsoft/module/internship/controller/InternshipPlanManageController.java

@@ -44,12 +44,11 @@ import java.util.List;
 @AllArgsConstructor
 public class InternshipPlanManageController {
 
-
     private final IInternshipPlanManageService internshipPlanManageService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="实习计划管理表列表(分页)")
-    @SaCheckPermission("internshipplanmanage:detail")
+    @SaCheckPermission("internshipplanmanage:page")
     @XjrLog(value = "实习计划管理表列表(分页)")
     public RT<PageOutput<InternshipPlanManagePageVo>> page(@Valid InternshipPlanManagePageDto dto){
         Page<InternshipPlanManagePageVo> page = internshipPlanManageService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -59,7 +58,7 @@ public class InternshipPlanManageController {
 
     @GetMapping(value = "/teacher-page")
     @ApiOperation(value="实习计划管理表教师列表(分页)")
-    @SaCheckPermission("internshipplanmanage:detail")
+    @SaCheckPermission("internshipplanmanage:teacherpage")
     @XjrLog(value = "实习计划管理表教师列表(分页)")
     public RT<PageOutput<InternshipPlanManagePageVo>> teacherPage(@Valid InternshipPlanManagePageDto dto){
         if(dto.getTeacherId() == null){
@@ -72,7 +71,7 @@ public class InternshipPlanManageController {
 
     @GetMapping(value = "/student-page")
     @ApiOperation(value="实习计划管理表学生列表(分页)")
-    @SaCheckPermission("internshipplanmanage:detail")
+    @SaCheckPermission("internshipplanmanage:studentpage")
     @XjrLog(value = "实习计划管理表学生列表(分页)")
     public RT<PageOutput<InternshipPlanManagePageVo>> studentPage(@Valid InternshipPlanManagePageDto dto){
         if(dto.getStudentUserId() == null){
@@ -83,17 +82,15 @@ public class InternshipPlanManageController {
         return RT.ok(pageOutput);
     }
 
-
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询实习计划管理表信息")
-    @SaCheckPermission("internshipplanmanage:detail")
+    @SaCheckPermission("internshipplanmanage:info")
     @XjrLog(value = "根据id查询实习计划管理表信息")
     public RT<InternshipPlanManageVo> info(@RequestParam Long id){
         InternshipPlanManageVo internshipPlanManage = internshipPlanManageService.getInfoById(id);
         return RT.ok(internshipPlanManage);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增实习计划管理表")
     @SaCheckPermission("internshipplanmanage:add")
@@ -124,7 +121,7 @@ public class InternshipPlanManageController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("internshipplanmanage:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody InternshipPlanManageStatusDto dto) throws Exception {
         InternshipPlanManage internshipplanmanage = internshipPlanManageService.getById(dto.getId());

src/main/java/com/xjrsoft/module/internship/controller/InternshipPlanManageParticipantController.java

@@ -47,7 +47,7 @@ public class InternshipPlanManageParticipantController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="所有参与人(分页)")
-    @SaCheckPermission("internshipplanmanageparticipant:detail")
+    @SaCheckPermission("internshipplanmanageparticipant:page")
     @XjrLog(value = "所有参与人(分页)")
     public RT<PageOutput<InternshipPlanManageParticipantPageVo>> page(@Valid InternshipPlanManageParticipantPageDto dto){
         PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = internshipPlanManageParticipantService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -56,7 +56,7 @@ public class InternshipPlanManageParticipantController {
 
     @GetMapping(value = "/team-student-page")
     @ApiOperation(value="实习计划参与人表列表(分页)")
-    @SaCheckPermission("internshipplanmanageparticipant:detail")
+    @SaCheckPermission("internshipplanmanageparticipant:teamstudentpage")
     @XjrLog(value = "实习计划参与人表列表(分页)")
     public RT<PageOutput<InternshipPlanManageParticipantPageVo>> teamStudentPage(@Valid InternshipPlanManageParticipantPageDto dto){
         PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = internshipPlanManageParticipantService.getTeamStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -65,7 +65,7 @@ public class InternshipPlanManageParticipantController {
 
     @GetMapping(value = "/choose-student-page")
     @ApiOperation(value="实习学生选择列表(分页)")
-    @SaCheckPermission("internshipplanmanageparticipant:detail")
+    @SaCheckPermission("internshipplanmanageparticipant:choosestudentpage")
     @XjrLog(value = "实习学生选择列表(分页)")
     public RT<PageOutput<InternshipPlanManageParticipantPageVo>> studentPage(@Valid InternshipPlanManageParticipantPageDto dto){
         PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = internshipPlanManageParticipantService.getChooseStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
@@ -74,7 +74,7 @@ public class InternshipPlanManageParticipantController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询实习计划参与人表信息")
-    @SaCheckPermission("internshipplanmanageparticipant:detail")
+    @SaCheckPermission("internshipplanmanageparticipant:info")
     @XjrLog(value = "根据id查询实习计划参与人表信息")
     public RT<InternshipPlanManageParticipantVo> info(@RequestParam Long id){
         InternshipPlanManageParticipant internshipPlanManageParticipant = internshipPlanManageParticipantService.getById(id);
@@ -84,7 +84,6 @@ public class InternshipPlanManageParticipantController {
         return RT.ok(BeanUtil.toBean(internshipPlanManageParticipant, InternshipPlanManageParticipantVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增实习计划参与人表")
     @SaCheckPermission("internshipplanmanageparticipant:add")

src/main/java/com/xjrsoft/module/internship/controller/InternshipPlanTeacherController.java

@@ -44,7 +44,7 @@ public class InternshipPlanTeacherController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="实习计划带队老师表列表(分页)")
-    @SaCheckPermission("internshipplanteacher:detail")
+    @SaCheckPermission("internshipplanteacher:page")
     @XjrLog(value = "实习计划带队老师表列表(分页)")
     public RT<PageOutput<InternshipPlanTeacherPageVo>> page(@Valid InternshipPlanTeacherPageDto dto){
 
@@ -55,7 +55,7 @@ public class InternshipPlanTeacherController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询实习计划带队老师表信息")
-    @SaCheckPermission("internshipplanteacher:detail")
+    @SaCheckPermission("internshipplanteacher:info")
     @XjrLog(value = "根据id查询实习计划带队老师表信息")
     public RT<InternshipPlanTeacherVo> info(@RequestParam Long id){
         InternshipPlanTeacherVo internshipPlanTeacher = internshipPlanTeacherService.getInfoById(id);
@@ -65,7 +65,6 @@ public class InternshipPlanTeacherController {
         return RT.ok(internshipPlanTeacher);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增实习计划带队老师表")
     @SaCheckPermission("internshipplanteacher:add")

src/main/java/com/xjrsoft/module/internship/controller/InternshipTeacherCollectController.java

@@ -59,7 +59,7 @@ public class InternshipTeacherCollectController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="实习带队教师收集表列表(分页)")
-    @SaCheckPermission("internshipteachercollect:detail")
+    @SaCheckPermission("internshipteachercollect:page")
     @XjrLog(value = "实习带队教师收集表列表(分页)")
     public RT<PageOutput<InternshipTeacherCollectPageVo>> page(@Valid InternshipTeacherCollectPageDto dto){
 
@@ -79,7 +79,7 @@ public class InternshipTeacherCollectController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询实习带队教师收集表信息")
-    @SaCheckPermission("internshipteachercollect:detail")
+    @SaCheckPermission("internshipteachercollect:info")
     @XjrLog(value = "根据id查询实习带队教师收集表信息")
     public RT<InternshipTeacherCollectVo> info(@RequestParam Long id){
         InternshipTeacherCollect internshipTeacherCollect = internshipTeacherCollectService.getById(id);
@@ -89,7 +89,6 @@ public class InternshipTeacherCollectController {
         return RT.ok(BeanUtil.toBean(internshipTeacherCollect, InternshipTeacherCollectVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增实习带队教师收集表")
     @SaCheckPermission("internshipteachercollect:add")
@@ -142,7 +141,7 @@ public class InternshipTeacherCollectController {
 
     @GetMapping(value = "/enroll-page")
     @ApiOperation(value="实习带队教师报名表审核列表(分页)")
-    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @SaCheckPermission("internshipteachercollectenroll:enrollpage")
     @XjrLog(value = "实习带队教师报名表审核列表(分页)")
     public RT<PageOutput<InternshipTeacherCollectEnrollExamPageVo>> page(@Valid InternshipTeacherCollectEnrollExamPageDto dto){
 

src/main/java/com/xjrsoft/module/internship/controller/InternshipTeacherCollectEnrollController.java

@@ -67,7 +67,7 @@ public class InternshipTeacherCollectEnrollController {
 
     @GetMapping(value = "/page")
     @ApiOperation(value="实习带队教师报名表列表(分页)")
-    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @SaCheckPermission("internshipteachercollectenroll:page")
     @XjrLog(value = "实习带队教师报名表列表(分页)")
     public RT<PageOutput<InternshipTeacherCollectEnrollPageVo>> page(@Valid InternshipTeacherCollectEnrollPageDto dto){
 
@@ -86,7 +86,7 @@ public class InternshipTeacherCollectEnrollController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询实习带队教师报名表信息")
-    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @SaCheckPermission("internshipteachercollectenroll:info")
     @XjrLog(value = "根据id查询实习带队教师报名表信息")
     public RT<InternshipTeacherCollectEnrollVo> info(@RequestParam Long id){
         InternshipTeacherCollectEnroll internshipTeacherCollectEnroll = internshipTeacherCollectEnrollService.getById(id);
@@ -113,7 +113,6 @@ public class InternshipTeacherCollectEnrollController {
         return RT.ok(enrollVo);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增实习带队教师报名表")
     @SaCheckPermission("internshipteachercollectenroll:add")
@@ -161,7 +160,7 @@ public class InternshipTeacherCollectEnrollController {
 
     @PostMapping(value = "/change-status")
     @ApiOperation(value = "修改状态")
-    @SaCheckPermission("officebuild:detail")
+    @SaCheckPermission("internshipteachercollectenroll:changestatus")
     @XjrLog(value = "修改状态", saveResponseData = true)
     public RT<Boolean> changeStatus(@Valid @RequestBody InternshipTeacherCollectEnrollStatusDto dto) throws Exception {
         for (Long id : dto.getIds()) {
@@ -175,7 +174,7 @@ public class InternshipTeacherCollectEnrollController {
     //
     @GetMapping(value = "/all-page")
     @ApiOperation(value="所有带队教师(分页)")
-    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @SaCheckPermission("internshipteachercollectenroll:allpage")
     @XjrLog(value = "所有带队教师(分页)")
     public RT<PageOutput<InternshipTeacherCollectEnrollExamPageVo>> allPage(@Valid InternshipTeacherCollectEnrollPageDto dto){
 
@@ -203,7 +202,7 @@ public class InternshipTeacherCollectEnrollController {
 
     @GetMapping(value = "/list")
     @ApiOperation(value="审核通过的带队老师")
-    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @SaCheckPermission("internshipteachercollectenroll:list")
     @XjrLog(value = "审核通过的带队老师")
     public RT<List<InternshipTeacherCollectEnrollListVo>> list(@Valid InternshipTeacherCollectEnrollPageDto dto){
 

src/main/java/com/xjrsoft/module/internship/controller/StudentInternshipRecordController.java

@@ -47,13 +47,12 @@ import java.util.List;
 @AllArgsConstructor
 public class StudentInternshipRecordController {
 
-
     private final IStudentInternshipRecordService studentInternshipRecordService;
     private final IFileService fileService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="学生实习记录表列表(分页)")
-    @SaCheckPermission("studentinternshiprecord:detail")
+    @SaCheckPermission("studentinternshiprecord:page")
     @XjrLog(value = "学生实习记录表列表(分页)")
     public RT<PageOutput<StudentInternshipRecordPageVo>> page(@Valid StudentInternshipRecordPageDto dto){
 
@@ -71,7 +70,7 @@ public class StudentInternshipRecordController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询学生实习记录表信息")
-    @SaCheckPermission("studentinternshiprecord:detail")
+    @SaCheckPermission("studentinternshiprecord:info")
     @XjrLog(value = "根据id查询学生实习记录表信息")
     public RT<StudentInternshipRecordVo> info(@RequestParam Long id){
         StudentInternshipRecord studentInternshipRecord = studentInternshipRecordService.getById(id);
@@ -89,7 +88,6 @@ public class StudentInternshipRecordController {
         return RT.ok(recordVo);
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增学生实习记录表")
     @SaCheckPermission("studentinternshiprecord:add")
@@ -122,7 +120,7 @@ public class StudentInternshipRecordController {
 
     @PostMapping(value = "alone-material-submit")
     @ApiOperation(value = "自主实习材料提交")
-    @SaCheckPermission("studentinternshiprecord:add")
+    @SaCheckPermission("studentinternshiprecord:alonematerialsubmit")
     @XjrLog(value = "自主实习材料提交")
     public RT<Boolean> aloneMaterialSubmit(@Valid @RequestBody AddStudentInternshipAloneApplyDto dto){
         boolean isSuccess = studentInternshipRecordService.aloneMaterialSubmit(dto);

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.system.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -112,6 +113,7 @@ public class MenuController {
 
     @GetMapping("/allserve")
     @ApiOperation(value = "获取全部菜单服务")
+    @SaCheckPermission("menu:allserve")
     @XjrLog(value = "获取全部菜单服务")
     public RT<List<MenuAllServeVo>> menuAllServe(@Valid MenuTreeDto dto) {
         List<MenuAllServeVo> list = menuService.getAuthAllMenuServe(dto);
@@ -121,6 +123,7 @@ public class MenuController {
 
     @GetMapping("/all-tree")
     @ApiOperation(value = "获取所有菜单（树结构）")
+    @SaCheckPermission("menu:all-tree")
     @XjrLog(value = "获取所有菜单（树结构）")
     public R allMenuTree(@Valid MenuTreeDto dto) {
         if (StrUtil.isEmpty(dto.getSystemType())) {

src/main/java/com/xjrsoft/module/system/controller/XjrMenuGroupSetController.java

@@ -36,7 +36,6 @@ import java.util.List;
 @AllArgsConstructor
 public class XjrMenuGroupSetController {
 
-
     private final IXjrMenuGroupSetService xjrMenuGroupSetService;
 
     @GetMapping(value = "/page")