pans 5 mesi fa
parent
commit
eff020bb98
57 ha cambiato i file con 730 aggiunte e 621 eliminazioni
  1. 1 1
      snowy-modules/snowy-biz-app/src/main/java/vip/xiaonuo/biz/core/config/AuthConfigure.java
  2. 1 1
      snowy-modules/snowy-flw-app/src/main/java/vip/xiaonuo/flw/core/config/AuthConfigure.java
  3. 1 1
      snowy-modules/snowy-ten-app/src/main/java/vip/xiaonuo/ten/core/config/AuthConfigure.java
  4. 1 1
      snowy-modules/snowy-urp-app/src/main/java/vip/xiaonuo/urp/core/config/AuthConfigure.java
  5. 1 1
      snowy-plugin/snowy-plugin-auth/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/annotation/SaClientCheckPermission.java
  6. 1 1
      snowy-plugin/snowy-plugin-auth/snowy-plugin-auth-func/src/main/java/vip/xiaonuo/auth/core/config/AuthConfigure.java
  7. 3 3
      snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/dict/controller/BizDictController.java
  8. 9 9
      snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/org/controller/BizOrgController.java
  9. 8 8
      snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/position/controller/BizPositionController.java
  10. 18 18
      snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/user/controller/BizUserController.java
  11. 7 7
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollectCourseController.java
  12. 7 7
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegeOrgController.java
  13. 7 7
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegePositionController.java
  14. 7 7
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegeUserController.java
  15. 9 9
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseChapterController.java
  16. 13 13
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseInfoController.java
  17. 5 5
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseNotebooksController.java
  18. 5 5
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseOpenController.java
  19. 2 2
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentBurialpointController.java
  20. 7 7
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentCollectController.java
  21. 6 6
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentRelateController.java
  22. 5 5
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/QuestionAnswerGiveController.java
  23. 11 11
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ResourceRecordController.java
  24. 4 4
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ResourceUserfileConvertController.java
  25. 5 5
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/RoomController.java
  26. 6 6
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/SemesterController.java
  27. 5 5
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ShareGroupController.java
  28. 46 33
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CollegeOrg.java
  29. 44 33
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CollegePosition.java
  30. 56 47
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CollegeUser.java
  31. 15 0
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/Dept.java
  32. 2 2
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/ResourceStatisticMapper.xml
  33. 4 4
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/SemesterMapper.xml
  34. 8 8
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/TeachingActivityMapper.xml
  35. 39 26
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/collegeOrg/CollegeOrgAddParam.java
  36. 36 28
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/collegePosition/CollegePositionAddParam.java
  37. 53 45
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/collegeUser/CollegeUserAddParam.java
  38. 42 39
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegeOrgServiceImpl.java
  39. 59 44
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegePositionServiceImpl.java
  40. 98 72
      snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegeUserServiceImpl.java
  41. 5 5
      snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/admin/TExamController.java
  42. 2 2
      snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/TExamController.java
  43. 18 18
      snowy-plugin/snowy-plugin-flw/snowy-plugin-flw-func/src/main/java/vip/xiaonuo/flw/modular/process/controller/FlwProcessMonitorController.java
  44. 5 5
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/chapterDiscussion/controller/ForumChapterDiscussionController.java
  45. 5 5
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/contentcorrection/controller/ForumContentCorrectionController.java
  46. 1 1
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postinfo/controller/ForumPostInfoController.java
  47. 4 4
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postlike/controller/ForumPostLikeController.java
  48. 4 4
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postnotlike/controller/ForumPostNotLikeController.java
  49. 2 2
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postreply/controller/ForumPostReplyController.java
  50. 5 5
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/posttype/controller/ForumPostTypeController.java
  51. 4 4
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/reportinfo/controller/ForumReportInfoController.java
  52. 5 5
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/sensitivity/controller/ForumSensitivityController.java
  53. 5 5
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/sensitivityrecord/controller/ForumSensitivityRecordController.java
  54. 5 5
      snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/supportenv/controller/ForumSupportEnvController.java
  55. 0 6
      snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java
  56. 2 6
      snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java
  57. 1 3
      snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml

+ 1 - 1
snowy-modules/snowy-biz-app/src/main/java/vip/xiaonuo/biz/core/config/AuthConfigure.java

@@ -43,7 +43,7 @@ public class AuthConfigure implements WebMvcConfigurer {
      * 注解的方式有以下几中,注解既可以加在接口方法上,也可加在Controller类上:
      * 1.@SaCheckLogin: 登录认证 —— 只有登录之后才能进入该方法(常用)
      * 2.@SaCheckRole("admin"): 角色认证 —— 必须具有指定角色标识才能进入该方法(常用)
-     * 3.@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
+     * 3.//@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
      * 4.@SaCheckSafe: 二级认证校验 —— 必须二级认证之后才能进入该方法
      * 5.@SaCheckBasic: HttpBasic认证 —— 只有通过 Basic 认证后才能进入该方法
      *

+ 1 - 1
snowy-modules/snowy-flw-app/src/main/java/vip/xiaonuo/flw/core/config/AuthConfigure.java

@@ -43,7 +43,7 @@ public class AuthConfigure implements WebMvcConfigurer {
      * 注解的方式有以下几中,注解既可以加在接口方法上,也可加在Controller类上:
      * 1.@SaCheckLogin: 登录认证 —— 只有登录之后才能进入该方法(常用)
      * 2.@SaCheckRole("admin"): 角色认证 —— 必须具有指定角色标识才能进入该方法(常用)
-     * 3.@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
+     * 3.//@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
      * 4.@SaCheckSafe: 二级认证校验 —— 必须二级认证之后才能进入该方法
      * 5.@SaCheckBasic: HttpBasic认证 —— 只有通过 Basic 认证后才能进入该方法
      *

+ 1 - 1
snowy-modules/snowy-ten-app/src/main/java/vip/xiaonuo/ten/core/config/AuthConfigure.java

@@ -43,7 +43,7 @@ public class AuthConfigure implements WebMvcConfigurer {
      * 注解的方式有以下几中,注解既可以加在接口方法上,也可加在Controller类上:
      * 1.@SaCheckLogin: 登录认证 —— 只有登录之后才能进入该方法(常用)
      * 2.@SaCheckRole("admin"): 角色认证 —— 必须具有指定角色标识才能进入该方法(常用)
-     * 3.@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
+     * 3.//@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
      * 4.@SaCheckSafe: 二级认证校验 —— 必须二级认证之后才能进入该方法
      * 5.@SaCheckBasic: HttpBasic认证 —— 只有通过 Basic 认证后才能进入该方法
      *

+ 1 - 1
snowy-modules/snowy-urp-app/src/main/java/vip/xiaonuo/urp/core/config/AuthConfigure.java

@@ -43,7 +43,7 @@ public class AuthConfigure implements WebMvcConfigurer {
      * 注解的方式有以下几中,注解既可以加在接口方法上,也可加在Controller类上:
      * 1.@SaCheckLogin: 登录认证 —— 只有登录之后才能进入该方法(常用)
      * 2.@SaCheckRole("admin"): 角色认证 —— 必须具有指定角色标识才能进入该方法(常用)
-     * 3.@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
+     * 3.//@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
      * 4.@SaCheckSafe: 二级认证校验 —— 必须二级认证之后才能进入该方法
      * 5.@SaCheckBasic: HttpBasic认证 —— 只有通过 Basic 认证后才能进入该方法
      *

+ 1 - 1
snowy-plugin/snowy-plugin-auth/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/annotation/SaClientCheckPermission.java

@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
  * @author xuyuxiang
  * @date 2022/3/10 10:40
  **/
-@SaCheckPermission(type = StpClientUtil.TYPE)
+//@SaCheckPermission(type = StpClientUtil.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE})
 public @interface SaClientCheckPermission {

+ 1 - 1
snowy-plugin/snowy-plugin-auth/snowy-plugin-auth-func/src/main/java/vip/xiaonuo/auth/core/config/AuthConfigure.java

@@ -57,7 +57,7 @@ public class AuthConfigure implements WebMvcConfigurer {
      * 注解的方式有以下几中,注解既可以加在接口方法上,也可加在Controller类上:
      * 1.@SaCheckLogin: 登录认证 —— 只有登录之后才能进入该方法(常用)
      * 2.@SaCheckRole("admin"): 角色认证 —— 必须具有指定角色标识才能进入该方法(常用)
-     * 3.@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
+     * 3.//@SaCheckPermission("user:add"): 权限认证 —— 必须具有指定权限才能进入该方法(常用)
      * 4.@SaCheckSafe: 二级认证校验 —— 必须二级认证之后才能进入该方法
      * 5.@SaCheckBasic: HttpBasic认证 —— 只有通过 Basic 认证后才能进入该方法
      *

+ 3 - 3
snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/dict/controller/BizDictController.java

@@ -58,7 +58,7 @@ public class BizDictController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取业务字典分页")
-    @SaCheckPermission("/biz/dict/page")
+    //@SaCheckPermission("/biz/dict/page")
     @GetMapping("/biz/dict/page")
     public CommonResult<Page<BizDict>> page(BizDictPageParam bizDictPageParam) {
         return CommonResult.data(bizDictService.page(bizDictPageParam));
@@ -72,7 +72,7 @@ public class BizDictController {
      */
     @ApiOperationSupport(order = 2)
     @ApiOperation("获取业务字典树")
-    @SaCheckPermission("/biz/dict/tree")
+    //@SaCheckPermission("/biz/dict/tree")
     @GetMapping("/biz/dict/tree")
     public CommonResult<List<Tree<String>>> tree() {
         return CommonResult.data(bizDictService.tree());
@@ -100,7 +100,7 @@ public class BizDictController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("编辑业务字典")
     @CommonLog("编辑业务字典")
-    @SaCheckPermission("/biz/dict/edit")
+    //@SaCheckPermission("/biz/dict/edit")
     @PostMapping("/biz/dict/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizDictEditParam bizDictEditParam) {
         bizDictService.edit(bizDictEditParam);

+ 9 - 9
snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/org/controller/BizOrgController.java

@@ -61,7 +61,7 @@ public class BizOrgController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取机构分页")
-    @SaCheckPermission("/biz/org/page")
+    //@SaCheckPermission("/biz/org/page")
     @GetMapping("/biz/org/page")
     public CommonResult<Page<BizOrg>> page(BizOrgPageParam bizOrgPageParam) {
         return CommonResult.data(bizOrgService.page(bizOrgPageParam));
@@ -75,7 +75,7 @@ public class BizOrgController {
      */
     @ApiOperationSupport(order = 2)
     @ApiOperation("获取机构树")
-    @SaCheckPermission("/biz/org/tree")
+    //@SaCheckPermission("/biz/org/tree")
     @GetMapping("/biz/org/tree")
     public CommonResult<List<Tree<String>>> tree() {
         return CommonResult.data(bizOrgService.tree());
@@ -90,7 +90,7 @@ public class BizOrgController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("添加机构")
     @CommonLog("添加机构")
-    @SaCheckPermission("/biz/org/add")
+    //@SaCheckPermission("/biz/org/add")
     @PostMapping("/biz/org/add")
     public CommonResult<String> add(@RequestBody @Valid BizOrgAddParam bizOrgAddParam) {
         bizOrgService.add(bizOrgAddParam);
@@ -106,7 +106,7 @@ public class BizOrgController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("编辑机构")
     @CommonLog("编辑机构")
-    @SaCheckPermission("/biz/org/edit")
+    //@SaCheckPermission("/biz/org/edit")
     @PostMapping("/biz/org/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizOrgEditParam bizOrgEditParam) {
         bizOrgService.edit(bizOrgEditParam);
@@ -122,7 +122,7 @@ public class BizOrgController {
     @ApiOperationSupport(order = 5)
     @ApiOperation("删除机构")
     @CommonLog("删除机构")
-    @SaCheckPermission("/biz/org/delete")
+    //@SaCheckPermission("/biz/org/delete")
     @PostMapping("/biz/org/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<BizOrgIdParam> bizOrgIdParamList) {
@@ -138,7 +138,7 @@ public class BizOrgController {
      */
     @ApiOperationSupport(order = 6)
     @ApiOperation("获取机构详情")
-    @SaCheckPermission("/biz/org/detail")
+    //@SaCheckPermission("/biz/org/detail")
     @GetMapping("/biz/org/detail")
     public CommonResult<BizOrg> detail(@Valid BizOrgIdParam bizOrgIdParam) {
         return CommonResult.data(bizOrgService.detail(bizOrgIdParam));
@@ -154,7 +154,7 @@ public class BizOrgController {
      */
     @ApiOperationSupport(order = 7)
     @ApiOperation("获取机构树选择器")
-    @SaCheckPermission("/biz/org/orgTreeSelector")
+    //@SaCheckPermission("/biz/org/orgTreeSelector")
     @GetMapping("/biz/org/orgTreeSelector")
     public CommonResult<List<Tree<String>>> orgTreeSelector() {
         return CommonResult.data(bizOrgService.orgTreeSelector());
@@ -168,7 +168,7 @@ public class BizOrgController {
      */
     @ApiOperationSupport(order = 8)
     @ApiOperation("获取人员选择器")
-    @SaCheckPermission("/biz/org/userSelector")
+    //@SaCheckPermission("/biz/org/userSelector")
     @GetMapping("/biz/org/userSelector")
     public CommonResult<Page<BizUser>> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) {
         return CommonResult.data(bizOrgService.userSelector(bizOrgSelectorUserParam));
@@ -182,7 +182,7 @@ public class BizOrgController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation("获取机构动态字段的配置")
-    @SaCheckPermission("/biz/org/dynamicFieldConfigList")
+    //@SaCheckPermission("/biz/org/dynamicFieldConfigList")
     @GetMapping("/biz/org/dynamicFieldConfigList")
     public CommonResult<List<JSONObject>> dynamicFieldConfigList() {
         return CommonResult.data(bizOrgService.dynamicFieldConfigList());

+ 8 - 8
snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/position/controller/BizPositionController.java

@@ -60,7 +60,7 @@ public class BizPositionController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取岗位分页")
-    @SaCheckPermission("/biz/position/page")
+    //@SaCheckPermission("/biz/position/page")
     @GetMapping("/biz/position/page")
     public CommonResult<Page<BizPosition>> page(BizPositionPageParam bizPositionPageParam) {
         return CommonResult.data(bizPositionService.page(bizPositionPageParam));
@@ -75,7 +75,7 @@ public class BizPositionController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加岗位")
     @CommonLog("添加岗位")
-    @SaCheckPermission("/biz/position/add")
+    //@SaCheckPermission("/biz/position/add")
     @PostMapping("/biz/position/add")
     public CommonResult<String> add(@RequestBody @Valid BizPositionAddParam bizPositionAddParam) {
         bizPositionService.add(bizPositionAddParam);
@@ -91,7 +91,7 @@ public class BizPositionController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑岗位")
     @CommonLog("编辑岗位")
-    @SaCheckPermission("/biz/position/edit")
+    //@SaCheckPermission("/biz/position/edit")
     @PostMapping("/biz/position/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizPositionEditParam bizPositionEditParam) {
         bizPositionService.edit(bizPositionEditParam);
@@ -107,7 +107,7 @@ public class BizPositionController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除岗位")
     @CommonLog("删除岗位")
-    @SaCheckPermission("/biz/position/delete")
+    //@SaCheckPermission("/biz/position/delete")
     @PostMapping("/biz/position/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<BizPositionIdParam> bizPositionIdParamList) {
@@ -123,7 +123,7 @@ public class BizPositionController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取岗位详情")
-    @SaCheckPermission("/biz/position/detail")
+    //@SaCheckPermission("/biz/position/detail")
     @GetMapping("/biz/position/detail")
     public CommonResult<BizPosition> detail(@Valid BizPositionIdParam bizPositionIdParam) {
         return CommonResult.data(bizPositionService.detail(bizPositionIdParam));
@@ -139,7 +139,7 @@ public class BizPositionController {
      */
     @ApiOperationSupport(order = 6)
     @ApiOperation("获取组织树选择器")
-    @SaCheckPermission("/biz/position/orgTreeSelector")
+    //@SaCheckPermission("/biz/position/orgTreeSelector")
     @GetMapping("/biz/position/orgTreeSelector")
     public CommonResult<List<Tree<String>>> orgTreeSelector() {
         return CommonResult.data(bizPositionService.orgTreeSelector());
@@ -153,7 +153,7 @@ public class BizPositionController {
      */
     @ApiOperationSupport(order = 7)
     @ApiOperation("获取岗位选择器")
-    @SaCheckPermission("/biz/position/positionSelector")
+    //@SaCheckPermission("/biz/position/positionSelector")
     @GetMapping("/biz/position/positionSelector")
     public CommonResult<Page<BizPosition>> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) {
         return CommonResult.data(bizPositionService.positionSelector(bizPositionSelectorPositionParam));
@@ -167,7 +167,7 @@ public class BizPositionController {
      */
     @ApiOperationSupport(order = 8)
     @ApiOperation("获取岗位动态字段的配置")
-    @SaCheckPermission("/biz/position/dynamicFieldConfigList")
+    //@SaCheckPermission("/biz/position/dynamicFieldConfigList")
     @GetMapping("/biz/position/dynamicFieldConfigList")
     public CommonResult<List<JSONObject>> dynamicFieldConfigList() {
         return CommonResult.data(bizPositionService.dynamicFieldConfigList());

+ 18 - 18
snowy-plugin/snowy-plugin-biz/snowy-plugin-biz-func/src/main/java/vip/xiaonuo/biz/modular/user/controller/BizUserController.java

@@ -66,7 +66,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取人员分页")
-    @SaCheckPermission("/biz/user/page")
+    //@SaCheckPermission("/biz/user/page")
     @GetMapping("/biz/user/page")
     public CommonResult<Page<BizUser>> page(BizUserPageParam bizUserPageParam) {
         return CommonResult.data(bizUserService.page(bizUserPageParam));
@@ -81,7 +81,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加人员")
     @CommonLog("添加人员")
-    @SaCheckPermission("/biz/user/add")
+    //@SaCheckPermission("/biz/user/add")
     @PostMapping("/biz/user/add")
     public CommonResult<String> add(@RequestBody @Valid BizUserAddParam bizUserAddParam) {
         bizUserService.add(bizUserAddParam);
@@ -97,7 +97,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑人员")
     @CommonLog("编辑人员")
-    @SaCheckPermission("/biz/user/edit")
+    //@SaCheckPermission("/biz/user/edit")
     @PostMapping("/biz/user/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizUserEditParam bizUserEditParam) {
         bizUserService.edit(bizUserEditParam);
@@ -113,7 +113,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除人员")
     @CommonLog("删除人员")
-    @SaCheckPermission("/biz/user/delete")
+    //@SaCheckPermission("/biz/user/delete")
     @PostMapping("/biz/user/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<BizUserIdParam> bizUserIdParamList) {
@@ -129,7 +129,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取人员详情")
-    @SaCheckPermission("/biz/user/detail")
+    //@SaCheckPermission("/biz/user/detail")
     @GetMapping("/biz/user/detail")
     public CommonResult<BizUser> detail(@Valid BizUserIdParam bizUserIdParam) {
         return CommonResult.data(bizUserService.detail(bizUserIdParam));
@@ -144,7 +144,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 6)
     @ApiOperation("禁用人员")
     @CommonLog("禁用人员")
-    @SaCheckPermission("/biz/user/disableUser")
+    //@SaCheckPermission("/biz/user/disableUser")
     @PostMapping("/biz/user/disableUser")
     public CommonResult<String> disableUser(@RequestBody BizUserIdParam bizUserIdParam) {
         bizUserService.disableUser(bizUserIdParam);
@@ -160,7 +160,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 7)
     @ApiOperation("启用人员")
     @CommonLog("启用人员")
-    @SaCheckPermission("/biz/user/enableUser")
+    //@SaCheckPermission("/biz/user/enableUser")
     @PostMapping("/biz/user/enableUser")
     public CommonResult<String> enableUser(@RequestBody @Valid BizUserIdParam bizUserIdParam) {
         bizUserService.enableUser(bizUserIdParam);
@@ -176,7 +176,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 8)
     @ApiOperation("重置人员密码")
     @CommonLog("重置人员密码")
-    @SaCheckPermission("/biz/user/resetPassword")
+    //@SaCheckPermission("/biz/user/resetPassword")
     @PostMapping("/biz/user/resetPassword")
     public CommonResult<String> resetPassword(@RequestBody @Valid BizUserIdParam bizUserIdParam) {
         bizUserService.resetPassword(bizUserIdParam);
@@ -191,7 +191,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation("获取人员拥有角色")
-    @SaCheckPermission("/biz/user/ownRole")
+    //@SaCheckPermission("/biz/user/ownRole")
     @GetMapping("/biz/user/ownRole")
     public CommonResult<List<String>> ownRole(@Valid BizUserIdParam bizUserIdParam) {
         return CommonResult.data(bizUserService.ownRole(bizUserIdParam));
@@ -206,7 +206,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 10)
     @ApiOperation("给人员授权角色")
     @CommonLog("给人员授权角色")
-    @SaCheckPermission("/biz/user/grantRole")
+    //@SaCheckPermission("/biz/user/grantRole")
     @PostMapping("/biz/user/grantRole")
     public CommonResult<String> grantRole(@RequestBody @Valid BizUserGrantRoleParam bizUserGrantRoleParam) {
         bizUserService.grantRole(bizUserGrantRoleParam);
@@ -222,7 +222,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 11)
     @ApiOperation("人员导出")
     @CommonLog("人员导出")
-    @SaCheckPermission("/biz/user/export")
+    //@SaCheckPermission("/biz/user/export")
     @GetMapping(value = "/biz/user/export", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     public void exportUser(BizUserExportParam bizUserExportParam, HttpServletResponse response) throws IOException {
         bizUserService.exportUser(bizUserExportParam, response);
@@ -237,7 +237,7 @@ public class BizUserController {
     @ApiOperationSupport(order = 12)
     @ApiOperation("导出人员个人信息")
     @CommonLog("导出人员个人信息")
-    @SaCheckPermission("/biz/user/exportUserInfo")
+    //@SaCheckPermission("/biz/user/exportUserInfo")
     @GetMapping(value = "/biz/user/exportUserInfo", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     public void exportUserInfo(BizUserIdParam bizUserIdParam, HttpServletResponse response) throws IOException {
         bizUserService.exportUserInfo(bizUserIdParam, response);
@@ -253,7 +253,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 13)
     @ApiOperation("获取机构树选择器")
-    @SaCheckPermission("/biz/user/orgTreeSelector")
+    //@SaCheckPermission("/biz/user/orgTreeSelector")
     @GetMapping("/biz/user/orgTreeSelector")
     public CommonResult<List<Tree<String>>> orgTreeSelector() {
         return CommonResult.data(bizUserService.orgTreeSelector());
@@ -267,7 +267,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 14)
     @ApiOperation("获取机构列表选择器")
-    @SaCheckPermission("/biz/user/orgListSelector")
+    //@SaCheckPermission("/biz/user/orgListSelector")
     @GetMapping("/biz/user/orgListSelector")
     public CommonResult<Page<BizOrg>> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) {
         return CommonResult.data(bizUserService.orgListSelector(bizUserSelectorOrgListParam));
@@ -281,7 +281,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 15)
     @ApiOperation("获取岗位选择器")
-    @SaCheckPermission("/biz/user/positionSelector")
+    //@SaCheckPermission("/biz/user/positionSelector")
     @GetMapping("/biz/user/positionSelector")
     public CommonResult<Page<BizPosition>> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) {
         return CommonResult.data(bizUserService.positionSelector(bizUserSelectorPositionParam));
@@ -295,7 +295,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 16)
     @ApiOperation("获取角色选择器")
-    @SaCheckPermission("/biz/user/roleSelector")
+    //@SaCheckPermission("/biz/user/roleSelector")
     @GetMapping("/biz/user/roleSelector")
     public CommonResult<Page<BizUserRoleResult>> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) {
         return CommonResult.data(bizUserService.roleSelector(bizUserSelectorRoleParam));
@@ -309,7 +309,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 17)
     @ApiOperation("获取人员选择器")
-    @SaCheckPermission("/biz/user/userSelector")
+    //@SaCheckPermission("/biz/user/userSelector")
     @GetMapping("/biz/user/userSelector")
     public CommonResult<Page<BizUser>> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) {
         return CommonResult.data(bizUserService.userSelector(bizUserSelectorUserParam));
@@ -323,7 +323,7 @@ public class BizUserController {
      */
     @ApiOperationSupport(order = 18)
     @ApiOperation("获取人员动态字段的配置")
-    @SaCheckPermission("/biz/user/dynamicFieldConfigList")
+    //@SaCheckPermission("/biz/user/dynamicFieldConfigList")
     @GetMapping("/biz/user/dynamicFieldConfigList")
     public CommonResult<List<JSONObject>> dynamicFieldConfigList() {
         return CommonResult.data(bizUserService.dynamicFieldConfigList());

+ 7 - 7
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollectCourseController.java

@@ -60,7 +60,7 @@ public class CollectCourseController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取收藏课程分页")
-    @SaCheckPermission("/disk/collectCourse/page")
+    //@SaCheckPermission("/disk/collectCourse/page")
     @GetMapping("/disk/collectCourse/page")
     public CommonResult<Page<CollectCourse>> page(CollectCoursePageParam collectCoursePageParam) {
         return CommonResult.data(collectCourseService.page(collectCoursePageParam));
@@ -75,7 +75,7 @@ public class CollectCourseController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加收藏课程")
     @CommonLog("添加收藏课程")
-    @SaCheckPermission("/disk/collectCourse/add")
+    //@SaCheckPermission("/disk/collectCourse/add")
     @PostMapping("/disk/collectCourse/add")
     public CommonResult<String> add(@RequestBody @Valid CollectCourseAddParam collectCourseAddParam) {
         collectCourseService.add(collectCourseAddParam);
@@ -91,7 +91,7 @@ public class CollectCourseController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加收藏课程")
     @CommonLog("添加收藏课程")
-    @SaCheckPermission("/disk/collectCourse/cancel")
+    //@SaCheckPermission("/disk/collectCourse/cancel")
     @PostMapping("/disk/collectCourse/cancel")
     public CommonResult<String> cancel(@RequestBody @Valid CollectCourseAddParam collectCourseAddParam) {
         collectCourseService.cancel(collectCourseAddParam);
@@ -107,7 +107,7 @@ public class CollectCourseController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加收藏课程")
     @CommonLog("添加收藏课程")
-    @SaCheckPermission("/disk/collectCourse/checkCollect")
+    //@SaCheckPermission("/disk/collectCourse/checkCollect")
     @PostMapping("/disk/collectCourse/checkCollect")
     public CommonResult<Integer> checkCollect(@RequestBody @Valid CollectCourseAddParam collectCourseAddParam) {
         return collectCourseService.checkCollect(collectCourseAddParam);
@@ -122,7 +122,7 @@ public class CollectCourseController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑收藏课程")
     @CommonLog("编辑收藏课程")
-    @SaCheckPermission("/disk/collectCourse/edit")
+    //@SaCheckPermission("/disk/collectCourse/edit")
     @PostMapping("/disk/collectCourse/edit")
     public CommonResult<String> edit(@RequestBody @Valid CollectCourseEditParam collectCourseEditParam) {
         collectCourseService.edit(collectCourseEditParam);
@@ -138,7 +138,7 @@ public class CollectCourseController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除收藏课程")
     @CommonLog("删除收藏课程")
-    @SaCheckPermission("/disk/collectCourse/delete")
+    //@SaCheckPermission("/disk/collectCourse/delete")
     @PostMapping("/disk/collectCourse/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CollectCourseIdParam> collectCourseIdParamList) {
@@ -154,7 +154,7 @@ public class CollectCourseController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取收藏课程详情")
-    @SaCheckPermission("/disk/collectCourse/detail")
+    //@SaCheckPermission("/disk/collectCourse/detail")
     @GetMapping("/disk/collectCourse/detail")
     public CommonResult<CollectCourse> detail(@Valid CollectCourseIdParam collectCourseIdParam) {
         return CommonResult.data(collectCourseService.detail(collectCourseIdParam));

+ 7 - 7
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegeOrgController.java

@@ -71,7 +71,7 @@ public class CollegeOrgController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取下发组织日志表分页")
-    @SaCheckPermission("/disk/CollegeOrg/page")
+    //@SaCheckPermission("/disk/CollegeOrg/page")
     @GetMapping("/disk/CollegeOrg/page")
     public CommonResult<Page<CollegeOrg>> page(CollegeOrgPageParam collegeOrgPageParam) {
         return CommonResult.data(collegeOrgService.page(collegeOrgPageParam));
@@ -95,9 +95,9 @@ public class CollegeOrgController {
                     log.info("=================下发组织数据为空===================");
                     return CommonResult.ok("下发组织数据为空");
                 }
-                CollegeOrgAddParam collegeOrgAddParam=collegeOrgAddParamList.get(0);
-
-                collegeOrgService.add(collegeOrgAddParam);
+                collegeOrgAddParamList.stream().forEach(collegeOrgAddParam -> {
+                    collegeOrgService.add(collegeOrgAddParam);
+                });
                 return CommonResult.ok("下发组织数据成功");
             }
         } catch (Exception e) {
@@ -116,7 +116,7 @@ public class CollegeOrgController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑下发组织日志表")
     @CommonLog("编辑下发组织日志表")
-    @SaCheckPermission("/disk/CollegeOrg/edit")
+    //@SaCheckPermission("/disk/CollegeOrg/edit")
     @PostMapping("/disk/CollegeOrg/edit")
     public CommonResult<String> edit(@RequestBody @Valid CollegeOrgEditParam collegeOrgEditParam) {
         collegeOrgService.edit(collegeOrgEditParam);
@@ -132,7 +132,7 @@ public class CollegeOrgController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除下发组织日志表")
     @CommonLog("删除下发组织日志表")
-    @SaCheckPermission("/disk/CollegeOrg/delete")
+    //@SaCheckPermission("/disk/CollegeOrg/delete")
     @PostMapping("/disk/CollegeOrg/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CollegeOrgIdParam> collegeOrgIdParamList) {
@@ -148,7 +148,7 @@ public class CollegeOrgController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取下发组织日志表详情")
-    @SaCheckPermission("/disk/CollegeOrg/detail")
+    //@SaCheckPermission("/disk/CollegeOrg/detail")
     @GetMapping("/disk/CollegeOrg/detail")
     public CommonResult<CollegeOrg> detail(@Valid CollegeOrgIdParam collegeOrgIdParam) {
         return CommonResult.data(collegeOrgService.detail(collegeOrgIdParam));

+ 7 - 7
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegePositionController.java

@@ -69,7 +69,7 @@ public class CollegePositionController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取下发岗位日志表分页")
-    @SaCheckPermission("/disk/CollegePosition/page")
+    //@SaCheckPermission("/disk/CollegePosition/page")
     @GetMapping("/disk/CollegePosition/page")
     public CommonResult<Page<CollegePosition>> page(CollegePositionPageParam collegePositionPageParam) {
         return CommonResult.data(collegePositionService.page(collegePositionPageParam));
@@ -93,9 +93,9 @@ public class CollegePositionController {
                     log.info("=================下发岗位数据为空===================");
                     return CommonResult.ok("下发岗位数据为空");
                 }
-                CollegePositionAddParam collegePositionAddParam=collegePositionAddParamList.get(0);
-
-                collegePositionService.add(collegePositionAddParam);
+                collegePositionAddParamList.stream().forEach(collegePositionAddParam -> {
+                    collegePositionService.add(collegePositionAddParam);
+                });
                 return CommonResult.ok("下发岗位数据成功");
             }
         } catch (Exception e) {
@@ -114,7 +114,7 @@ public class CollegePositionController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑下发岗位日志表")
     @CommonLog("编辑下发岗位日志表")
-    @SaCheckPermission("/disk/CollegePosition/edit")
+    //@SaCheckPermission("/disk/CollegePosition/edit")
     @PostMapping("/disk/CollegePosition/edit")
     public CommonResult<String> edit(@RequestBody @Valid CollegePositionEditParam collegePositionEditParam) {
         collegePositionService.edit(collegePositionEditParam);
@@ -130,7 +130,7 @@ public class CollegePositionController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除下发岗位日志表")
     @CommonLog("删除下发岗位日志表")
-    @SaCheckPermission("/disk/CollegePosition/delete")
+    //@SaCheckPermission("/disk/CollegePosition/delete")
     @PostMapping("/disk/CollegePosition/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CollegePositionIdParam> collegePositionIdParamList) {
@@ -146,7 +146,7 @@ public class CollegePositionController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取下发岗位日志表详情")
-    @SaCheckPermission("/disk/CollegePosition/detail")
+    //@SaCheckPermission("/disk/CollegePosition/detail")
     @GetMapping("/disk/CollegePosition/detail")
     public CommonResult<CollegePosition> detail(@Valid CollegePositionIdParam collegePositionIdParam) {
         return CommonResult.data(collegePositionService.detail(collegePositionIdParam));

+ 7 - 7
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CollegeUserController.java

@@ -79,7 +79,7 @@ public class CollegeUserController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取下发用户日志表分页")
-    @SaCheckPermission("/disk/CollegeUser/page")
+    //@SaCheckPermission("/disk/CollegeUser/page")
     @GetMapping("/disk/CollegeUser/page")
     public CommonResult<Page<CollegeUser>> page(CollegeUserPageParam collegeUserPageParam) {
         return CommonResult.data(collegeUserService.page(collegeUserPageParam));
@@ -103,9 +103,9 @@ public class CollegeUserController {
                     log.info("=================下发用户数据为空===================");
                     return CommonResult.ok("下发用户数据为空");
                 }
-                CollegeUserAddParam collegeUserAddParam=collegeUserAddParamList.get(0);
-
-                collegeUserService.add(collegeUserAddParam);
+                collegeUserAddParamList.stream().forEach(collegeUserAddParam -> {
+                    collegeUserService.add(collegeUserAddParam);
+                });
                 return CommonResult.ok("下发用户数据成功");
             }
         } catch (Exception e) {
@@ -124,7 +124,7 @@ public class CollegeUserController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑下发用户日志表")
     @CommonLog("编辑下发用户日志表")
-    @SaCheckPermission("/disk/CollegeUser/edit")
+    //@SaCheckPermission("/disk/CollegeUser/edit")
     @PostMapping("/disk/CollegeUser/edit")
     public CommonResult<String> edit(@RequestBody @Valid CollegeUserEditParam collegeUserEditParam) {
         collegeUserService.edit(collegeUserEditParam);
@@ -140,7 +140,7 @@ public class CollegeUserController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除下发用户日志表")
     @CommonLog("删除下发用户日志表")
-    @SaCheckPermission("/disk/CollegeUser/delete")
+    //@SaCheckPermission("/disk/CollegeUser/delete")
     @PostMapping("/disk/CollegeUser/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CollegeUserIdParam> collegeUserIdParamList) {
@@ -156,7 +156,7 @@ public class CollegeUserController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取下发用户日志表详情")
-    @SaCheckPermission("/disk/CollegeUser/detail")
+    //@SaCheckPermission("/disk/CollegeUser/detail")
     @GetMapping("/disk/CollegeUser/detail")
     public CommonResult<CollegeUser> detail(@Valid CollegeUserIdParam collegeUserIdParam) {
         return CommonResult.data(collegeUserService.detail(collegeUserIdParam));

+ 9 - 9
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseChapterController.java

@@ -78,7 +78,7 @@ public class CourseChapterController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程章节表-分页列表")
-    @SaCheckPermission("/disk/chapter/page")
+    //@SaCheckPermission("/disk/chapter/page")
     @GetMapping("/disk/chapter/page")
     public CommonResult<Page<Map<String,Object>>> page(ChapterPageParam chapterPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -145,7 +145,7 @@ public class CourseChapterController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程章节表-全量列表")
-    @SaCheckPermission("/disk/chapter/allList")
+    //@SaCheckPermission("/disk/chapter/allList")
     @GetMapping("/disk/chapter/allList")
     public CommonResult<List<Map<String,Object>>> allList(ChapterPageParam chapterPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -225,7 +225,7 @@ public class CourseChapterController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加课程章节表")
     @CommonLog("添加课程章节表")
-    @SaCheckPermission("/disk/chapter/add")
+    //@SaCheckPermission("/disk/chapter/add")
     @PostMapping("/disk/chapter/add")
     public CommonResult<String> add(@RequestBody @Valid ChapterAddParam chapterAddParam) {
         Chapter chapter = BeanUtil.toBean(chapterAddParam, Chapter.class);
@@ -254,7 +254,7 @@ public class CourseChapterController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑课程章节表")
     @CommonLog("编辑课程章节表")
-    @SaCheckPermission("/disk/chapter/edit")
+    //@SaCheckPermission("/disk/chapter/edit")
     @PostMapping("/disk/chapter/edit")
     public CommonResult<String> edit(@RequestBody @Valid ChapterEditParam chapterEditParam) {
         Chapter chapter = BeanUtil.toBean(chapterEditParam, Chapter.class);
@@ -294,7 +294,7 @@ public class CourseChapterController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除课程章节表")
     @CommonLog("删除课程章节表")
-    @SaCheckPermission("/disk/chapter/delete")
+    //@SaCheckPermission("/disk/chapter/delete")
     @PostMapping("/disk/chapter/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ChapterIdParam> chapterIdParamList) {
@@ -310,7 +310,7 @@ public class CourseChapterController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取课程章节表详情")
-    @SaCheckPermission("/disk/chapter/detail")
+    //@SaCheckPermission("/disk/chapter/detail")
     @GetMapping("/disk/chapter/detail")
     public CommonResult<Map<String,Object>> detail(@Valid ChapterIdParam chapterIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -347,7 +347,7 @@ public class CourseChapterController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程中心-课程章节表详情")
-    @SaCheckPermission("/disk/coursecentry/chapterDetail")
+    //@SaCheckPermission("/disk/coursecentry/chapterDetail")
     @GetMapping("/disk/coursecentry/chapterDetail")
     public CommonResult<Map<String,Object>> chapterDetail(@Valid ChapterIdParam chapterIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -382,7 +382,7 @@ public class CourseChapterController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程中心-获取课程章节关联资源")
-    @SaCheckPermission("/disk/coursecentry/chapterRelate")
+    //@SaCheckPermission("/disk/coursecentry/chapterRelate")
     @GetMapping("/disk/coursecentry/chapterRelate")
     public CommonResult<Map<String,Object>> chapterRelate(@Valid ChapterIdParam chapterIdParam, HttpServletRequest req) {
         Map result=new HashMap();
@@ -416,7 +416,7 @@ public class CourseChapterController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程中心-章节全量列表(学生端)")
-    @SaCheckPermission("/disk/coursecentry/coursechapterList")
+    //@SaCheckPermission("/disk/coursecentry/coursechapterList")
     @GetMapping("/disk/coursecentry/coursechapterList")
     public CommonResult<List<Map<String,Object>>> coursechapterList(ChapterPageParam chapterPageParam, HttpServletRequest req) {
         Map param =new HashMap();

+ 13 - 13
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseInfoController.java

@@ -86,7 +86,7 @@ public class CourseInfoController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程信息-分页列表")
-    @SaCheckPermission("/disk/courseinfo/page")
+    //@SaCheckPermission("/disk/courseinfo/page")
     @GetMapping("/disk/courseinfo/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseInfoPageParam courseInfoPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -115,7 +115,7 @@ public class CourseInfoController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程信息-全量列表")
-    @SaCheckPermission("/disk/courseinfo/allList")
+    //@SaCheckPermission("/disk/courseinfo/allList")
     @GetMapping("/disk/courseinfo/allList")
     public CommonResult<List<CourseInfo>> allList(CourseInfoPageParam courseInfoPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -144,7 +144,7 @@ public class CourseInfoController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("课程信息-添加")
     @CommonLog("课程信息-添加")
-    @SaCheckPermission("/disk/courseinfo/add")
+    //@SaCheckPermission("/disk/courseinfo/add")
     @PostMapping("/disk/courseinfo/add")
     public CommonResult<Map<String, Object>> add(@RequestBody @Valid CourseInfoAddParam courseInfoAddParam) {
         Map result = new HashMap();
@@ -184,7 +184,7 @@ public class CourseInfoController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程信息-编辑")
     @CommonLog("课程信息-编辑")
-    @SaCheckPermission("/disk/courseinfo/edit")
+    //@SaCheckPermission("/disk/courseinfo/edit")
     @PostMapping("/disk/courseinfo/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseInfoEditParam courseInfoEditParam) {
         //1.先更新课程基础信息
@@ -208,7 +208,7 @@ public class CourseInfoController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程信息-修改状态")
     @CommonLog("课程信息-修改状态")
-    @SaCheckPermission("/disk/courseinfo/updateStatus")
+    //@SaCheckPermission("/disk/courseinfo/updateStatus")
     @PostMapping("/disk/courseinfo/updateStatus")
     public CommonResult<String> updateStatus(@RequestBody @Valid CourseInfoEditParam courseInfoEditParam) {
         if(StringUtils.isEmpty(courseInfoEditParam.getVerifyStatus()) && StringUtils.isEmpty(courseInfoEditParam.getPutawayStatus()))return CommonResult.error("修改状态不能为空");
@@ -228,7 +228,7 @@ public class CourseInfoController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除课程信息表")
     @CommonLog("删除课程信息表")
-    @SaCheckPermission("/disk/courseinfo/delete")
+    //@SaCheckPermission("/disk/courseinfo/delete")
     @PostMapping("/disk/courseinfo/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseInfoIdParam> courseInfoIdParamList) {
@@ -244,7 +244,7 @@ public class CourseInfoController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取课程信息表详情")
-    @SaCheckPermission("/disk/courseinfo/detail")
+    //@SaCheckPermission("/disk/courseinfo/detail")
     @GetMapping("/disk/courseinfo/detail")
     public CommonResult<Map<String,Object>> detail(@Valid CourseInfoIdParam courseInfoIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -261,7 +261,7 @@ public class CourseInfoController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程中心-分页列表(学生端)")
-    @SaCheckPermission("/disk/coursecentry/page")
+    //@SaCheckPermission("/disk/coursecentry/page")
     @GetMapping("/disk/coursecentry/page")
     public CommonResult<Page<Map<String,Object>>> coursecentryPage(CourseInfoPageParam courseInfoPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -292,7 +292,7 @@ public class CourseInfoController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程中心-详情(学生端)")
-    @SaCheckPermission("/disk/coursecentry/detail")
+    //@SaCheckPermission("/disk/coursecentry/detail")
     @GetMapping("/disk/coursecentry/detail")
     public CommonResult<Map<String,Object>> coursecentryDetail(@Valid CourseInfoIdParam courseInfoIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -313,7 +313,7 @@ public class CourseInfoController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程中心-添加浏览次数")
     @CommonLog("课程中心-添加浏览次数")
-    @SaCheckPermission("/disk/coursecentry/addViewCount")
+    //@SaCheckPermission("/disk/coursecentry/addViewCount")
     @PostMapping("/disk/coursecentry/addViewCount")
     public CommonResult<String> addViewCount(@RequestBody @Valid CourseInfoEditParam courseInfoEditParam) {
         CourseInfo courseInfo=courseInfoService.queryEntity(courseInfoEditParam.getCourseId());
@@ -332,7 +332,7 @@ public class CourseInfoController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程信息-复制课程")
     @CommonLog("课程信息-复制课程")
-    @SaCheckPermission("/disk/courseinfo/copy")
+    //@SaCheckPermission("/disk/courseinfo/copy")
     @PostMapping("/disk/courseinfo/copy")
     public CommonResult<String> copy(@RequestBody @Valid CourseInfoEditParam courseInfoEditParam) {
         //查回课程基础信息
@@ -484,7 +484,7 @@ public class CourseInfoController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程管理-一键催交")
     @CommonLog("课程管理-一键催交")
-    @SaCheckPermission("/disk/courseinfo/urgeSubmit")
+    //@SaCheckPermission("/disk/courseinfo/urgeSubmit")
     @GetMapping("/disk/courseinfo/urgeSubmit")
     public CommonResult<String> courseinfo(HttpServletRequest req) {
         Map param=new HashMap();
@@ -518,7 +518,7 @@ public class CourseInfoController {
      * */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程中心-获取指定课程进度")
-    @SaCheckPermission("/disk/coursecentry/getFinishRate")
+    //@SaCheckPermission("/disk/coursecentry/getFinishRate")
     @GetMapping("/disk/coursecentry/getFinishRate")
     public CommonResult<Map<String,Object>> getFinishRate(@Valid CourseInfoIdParam courseInfoIdParam, HttpServletRequest req) {
         Map param =new HashMap();

+ 5 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseNotebooksController.java

@@ -75,7 +75,7 @@ public class CourseNotebooksController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取课程笔记本表分页")
-    @SaCheckPermission("/disk/courseNotebooks/page")
+    //@SaCheckPermission("/disk/courseNotebooks/page")
     @GetMapping("/disk/courseNotebooks/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseNotebooksPageParam courseNotebooksPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -95,7 +95,7 @@ public class CourseNotebooksController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加课程笔记本表")
     @CommonLog("添加课程笔记本表")
-    @SaCheckPermission("/disk/courseNotebooks/add")
+    //@SaCheckPermission("/disk/courseNotebooks/add")
     @PostMapping("/disk/courseNotebooks/add")
     public CommonResult<String> add(@RequestBody @Valid CourseNotebooksAddParam courseNotebooksAddParam) {
         courseNotebooksService.add(courseNotebooksAddParam);
@@ -111,7 +111,7 @@ public class CourseNotebooksController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑课程笔记本表")
     @CommonLog("编辑课程笔记本表")
-    @SaCheckPermission("/disk/courseNotebooks/edit")
+    //@SaCheckPermission("/disk/courseNotebooks/edit")
     @PostMapping("/disk/courseNotebooks/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseNotebooksEditParam courseNotebooksEditParam) {
         courseNotebooksService.edit(courseNotebooksEditParam);
@@ -127,7 +127,7 @@ public class CourseNotebooksController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除课程笔记本表")
     @CommonLog("删除课程笔记本表")
-    @SaCheckPermission("/disk/courseNotebooks/delete")
+    //@SaCheckPermission("/disk/courseNotebooks/delete")
     @PostMapping("/disk/courseNotebooks/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseNotebooksIdParam> courseNotebooksIdParamList) {
@@ -163,7 +163,7 @@ public class CourseNotebooksController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取课程笔记本表详情")
-    @SaCheckPermission("/disk/courseNotebooks/detail")
+    //@SaCheckPermission("/disk/courseNotebooks/detail")
     @GetMapping("/disk/courseNotebooks/detail")
     public CommonResult<CourseNotebooks> detail(@Valid CourseNotebooksIdParam courseNotebooksIdParam) {
         return CommonResult.data(courseNotebooksService.detail(courseNotebooksIdParam));

+ 5 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseOpenController.java

@@ -64,7 +64,7 @@ public class CourseOpenController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程开课-分页列表")
-    @SaCheckPermission("/disk/courseopen/page")
+    //@SaCheckPermission("/disk/courseopen/page")
     @GetMapping("/disk/courseopen/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseOpenPageParam courseOpenPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -87,7 +87,7 @@ public class CourseOpenController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("课程开课-添加")
     @CommonLog("课程开课-添加")
-    @SaCheckPermission("/disk/courseopen/add")
+    //@SaCheckPermission("/disk/courseopen/add")
     @PostMapping("/disk/courseopen/add")
     public CommonResult<String> add(@RequestBody @Valid CourseOpenAddParam courseOpenAddParam) {
         CourseOpen courseOpen = BeanUtil.toBean(courseOpenAddParam, CourseOpen.class);
@@ -104,7 +104,7 @@ public class CourseOpenController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程开课-编辑")
     @CommonLog("课程开课-编辑")
-    @SaCheckPermission("/disk/courseopen/edit")
+    //@SaCheckPermission("/disk/courseopen/edit")
     @PostMapping("/disk/courseopen/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseOpenEditParam courseOpenEditParam) {
         CourseOpen courseOpen = BeanUtil.toBean(courseOpenEditParam, CourseOpen.class);
@@ -121,7 +121,7 @@ public class CourseOpenController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("课程开课-删除")
     @CommonLog("课程开课-删除")
-    @SaCheckPermission("/disk/courseopen/delete")
+    //@SaCheckPermission("/disk/courseopen/delete")
     @PostMapping("/disk/courseopen/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseOpenIdParam> courseOpenIdParamList) {
@@ -137,7 +137,7 @@ public class CourseOpenController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程开课-详情")
-    @SaCheckPermission("/disk/courseopen/detail")
+    //@SaCheckPermission("/disk/courseopen/detail")
     @GetMapping("/disk/courseopen/detail")
     public CommonResult<Map<String,Object>> detail(@Valid CourseOpenIdParam courseOpenIdParam, HttpServletRequest req) {
         Map param =new HashMap();

+ 2 - 2
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentBurialpointController.java

@@ -160,7 +160,7 @@ public class CourseStudentBurialpointController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除课程学生-学习埋点表")
     @CommonLog("删除课程学生-学习埋点表")
-    @SaCheckPermission("/disk/coursestudentburialpoint/delete")
+    //@SaCheckPermission("/disk/coursestudentburialpoint/delete")
     @PostMapping("/disk/coursestudentburialpoint/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseStudentProgressIdParam> courseStudentProgressIdParamList) {
@@ -176,7 +176,7 @@ public class CourseStudentBurialpointController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取课程学生-学习埋点表详情")
-    @SaCheckPermission("/disk/coursestudentburialpoint/detail")
+    //@SaCheckPermission("/disk/coursestudentburialpoint/detail")
     @GetMapping("/disk/coursestudentburialpoint/detail")
     public CommonResult<CourseStudentBurialpoint> detail(@Valid CourseStudentProgressIdParam courseStudentProgressIdParam) {
         return CommonResult.data(courseStudentBurialpointService.detail(courseStudentProgressIdParam));

+ 7 - 7
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentCollectController.java

@@ -65,7 +65,7 @@ public class CourseStudentCollectController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("课程收藏-分页列表")
-    @SaCheckPermission("/disk/coursestudentcollect/page")
+    //@SaCheckPermission("/disk/coursestudentcollect/page")
     @GetMapping("/disk/coursestudentcollect/page")
     public CommonResult<Page<Map<String, Object>>> page(CourseStudentCollectPageParam courseStudentCollectPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -96,7 +96,7 @@ public class CourseStudentCollectController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("课程收藏-添加")
     @CommonLog("课程收藏-添加")
-    @SaCheckPermission("/disk/coursestudentcollect/add")
+    //@SaCheckPermission("/disk/coursestudentcollect/add")
     @PostMapping("/disk/coursestudentcollect/add")
     public CommonResult<String> add(@RequestBody @Valid CourseStudentCollectAddParam courseStudentCollectAddParam) {
         CourseStudentCollect courseStudentCollect = BeanUtil.toBean(courseStudentCollectAddParam, CourseStudentCollect.class);
@@ -114,7 +114,7 @@ public class CourseStudentCollectController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程收藏-取消收藏")
     @CommonLog("课程收藏-取消收藏")
-    @SaCheckPermission("/disk/coursestudentcollect/notCollect")
+    //@SaCheckPermission("/disk/coursestudentcollect/notCollect")
     @PostMapping("/disk/coursestudentcollect/notCollect")
     public CommonResult<String> notCollect(@RequestBody @Valid CourseStudentCollectNotCollectParam courseStudentCollectNotCollectParam) {
         Map param=new HashMap();
@@ -136,7 +136,7 @@ public class CourseStudentCollectController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("课程收藏-编辑")
     @CommonLog("课程收藏-编辑")
-    @SaCheckPermission("/disk/coursestudentcollect/edit")
+    //@SaCheckPermission("/disk/coursestudentcollect/edit")
     @PostMapping("/disk/coursestudentcollect/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseStudentCollectEditParam courseStudentCollectEditParam) {
         CourseStudentCollect courseStudentCollect = BeanUtil.toBean(courseStudentCollectEditParam, CourseStudentCollect.class);
@@ -153,7 +153,7 @@ public class CourseStudentCollectController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("课程收藏-删除")
     @CommonLog("课程收藏-删除")
-    @SaCheckPermission("/disk/coursestudentcollect/delete")
+    //@SaCheckPermission("/disk/coursestudentcollect/delete")
     @PostMapping("/disk/coursestudentcollect/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseStudentCollectIdParam> courseStudentCollectIdParamList) {
@@ -169,7 +169,7 @@ public class CourseStudentCollectController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程收藏-详情")
-    @SaCheckPermission("/disk/coursestudentcollect/detail")
+    //@SaCheckPermission("/disk/coursestudentcollect/detail")
     @GetMapping("/disk/coursestudentcollect/detail")
     public CommonResult<Map<String,Object>> detail(@Valid CourseStudentCollectIdParam courseStudentCollectIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -187,7 +187,7 @@ public class CourseStudentCollectController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程收藏-详情")
-    @SaCheckPermission("/disk/coursestudentcollect/isCollect")
+    //@SaCheckPermission("/disk/coursestudentcollect/isCollect")
     @GetMapping("/disk/coursestudentcollect/isCollect")
     public CommonResult<Map<String,Object>> isCollect(@Valid CourseStudentCollectIdParam courseStudentCollectIdParam, HttpServletRequest req) {
         Map result=new HashMap();

+ 6 - 6
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentRelateController.java

@@ -88,7 +88,7 @@ public class CourseStudentRelateController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取课程学生关联表分页")
-    @SaCheckPermission("/disk/coursestudentrelate/page")
+    //@SaCheckPermission("/disk/coursestudentrelate/page")
     @GetMapping("/disk/coursestudentrelate/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseStudentRelatePageParam courseStudentRelatePageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -149,7 +149,7 @@ public class CourseStudentRelateController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加课程学生关联表")
     @CommonLog("添加课程学生关联表")
-    @SaCheckPermission("/disk/coursestudentrelate/add")
+    //@SaCheckPermission("/disk/coursestudentrelate/add")
     @PostMapping("/disk/coursestudentrelate/add")
     public CommonResult<String> add(@RequestBody @Valid CourseStudentRelateAddParam courseStudentRelateAddParam) {
         Map param=new HashMap();
@@ -191,7 +191,7 @@ public class CourseStudentRelateController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑课程学生关联表")
     @CommonLog("编辑课程学生关联表")
-    @SaCheckPermission("/disk/coursestudentrelate/edit")
+    //@SaCheckPermission("/disk/coursestudentrelate/edit")
     @PostMapping("/disk/coursestudentrelate/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseStudentRelateEditParam courseStudentRelateEditParam) {
         CourseStudentRelate courseStudentRelate = BeanUtil.toBean(courseStudentRelateEditParam, CourseStudentRelate.class);
@@ -208,7 +208,7 @@ public class CourseStudentRelateController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除课程学生关联表")
     @CommonLog("删除课程学生关联表")
-    @SaCheckPermission("/disk/coursestudentrelate/delete")
+    //@SaCheckPermission("/disk/coursestudentrelate/delete")
     @PostMapping("/disk/coursestudentrelate/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseStudentRelateIdParam> courseStudentRelateIdParamList) {
@@ -226,7 +226,7 @@ public class CourseStudentRelateController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("课程学生关联-详情")
-    @SaCheckPermission("/disk/coursestudentrelate/detail")
+    //@SaCheckPermission("/disk/coursestudentrelate/detail")
     @GetMapping("/disk/coursestudentrelate/detail")
     public CommonResult<Map<String,Object>> detail(@Valid CourseStudentRelateIdParam courseStudentRelateIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -325,7 +325,7 @@ public class CourseStudentRelateController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取关联学生-下拉列表")
-    @SaCheckPermission("/disk/coursestudentrelate/downList")
+    //@SaCheckPermission("/disk/coursestudentrelate/downList")
     @GetMapping("/disk/coursestudentrelate/downList")
     public CommonResult<Page<Map<String,Object>>> downList(CourseStudentRelatePageParam courseStudentRelatePageParam, HttpServletRequest req) {
         Map<String,Object> param = convertRequestParamsToMapWithMultiValues(req);

+ 5 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/QuestionAnswerGiveController.java

@@ -60,7 +60,7 @@ public class QuestionAnswerGiveController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取question_answer_give分页")
-    @SaCheckPermission("/disk/answergive/page")
+    //@SaCheckPermission("/disk/answergive/page")
     @GetMapping("/disk/answergive/page")
     public CommonResult<Page<QuestionAnswerGive>> page(QuestionAnswerGivePageParam questionAnswerGivePageParam) {
         return CommonResult.data(questionAnswerGiveService.page(questionAnswerGivePageParam));
@@ -75,7 +75,7 @@ public class QuestionAnswerGiveController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加question_answer_give")
     @CommonLog("添加question_answer_give")
-    @SaCheckPermission("/disk/answergive/add")
+    //@SaCheckPermission("/disk/answergive/add")
     @PostMapping("/disk/answergive/add")
     public CommonResult<String> add(@RequestBody @Valid QuestionAnswerGiveAddParam questionAnswerGiveAddParam) {
         questionAnswerGiveService.add(questionAnswerGiveAddParam);
@@ -91,7 +91,7 @@ public class QuestionAnswerGiveController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑question_answer_give")
     @CommonLog("编辑question_answer_give")
-    @SaCheckPermission("/disk/answergive/edit")
+    //@SaCheckPermission("/disk/answergive/edit")
     @PostMapping("/disk/answergive/edit")
     public CommonResult<String> edit(@RequestBody @Valid QuestionAnswerGiveEditParam questionAnswerGiveEditParam) {
         questionAnswerGiveService.edit(questionAnswerGiveEditParam);
@@ -107,7 +107,7 @@ public class QuestionAnswerGiveController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除question_answer_give")
     @CommonLog("删除question_answer_give")
-    @SaCheckPermission("/disk/answergive/delete")
+    //@SaCheckPermission("/disk/answergive/delete")
     @PostMapping("/disk/answergive/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<QuestionAnswerGiveIdParam> questionAnswerGiveIdParamList) {
@@ -123,7 +123,7 @@ public class QuestionAnswerGiveController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取question_answer_give详情")
-    @SaCheckPermission("/disk/answergive/detail")
+    //@SaCheckPermission("/disk/answergive/detail")
     @GetMapping("/disk/answergive/detail")
     public CommonResult<QuestionAnswerGive> detail(@Valid QuestionAnswerGiveIdParam questionAnswerGiveIdParam) {
         return CommonResult.data(questionAnswerGiveService.detail(questionAnswerGiveIdParam));

+ 11 - 11
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ResourceRecordController.java

@@ -116,7 +116,7 @@ public class ResourceRecordController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("资源管理-课程下拉列表")
-    @SaCheckPermission("/disk/courseauditrecord/courceDownList")
+    //@SaCheckPermission("/disk/courseauditrecord/courceDownList")
     @GetMapping("/disk/courseauditrecord/courceDownList")
     public CommonResult<Page<Map<String,Object>>> courceDownList(CourseAuditRecordPageParam courseAuditRecordPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -143,7 +143,7 @@ public class ResourceRecordController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("资源管理-分页列表")
-    @SaCheckPermission("/disk/courseauditrecord/page")
+    //@SaCheckPermission("/disk/courseauditrecord/page")
     @GetMapping("/disk/courseauditrecord/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseAuditRecordPageParam courseAuditRecordPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -183,7 +183,7 @@ public class ResourceRecordController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("资源中心-分页列表")
-    @SaCheckPermission("/disk/resourcecentre/page")
+    //@SaCheckPermission("/disk/resourcecentre/page")
     @GetMapping("/disk/resourcecentre/page")
     public CommonResult<Page<Map<String,Object>>> resourcecentrePage(CourseAuditRecordPageParam courseAuditRecordPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -260,7 +260,7 @@ public class ResourceRecordController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("资源管理-添加")
     @CommonLog("资源管理-添加")
-    @SaCheckPermission("/disk/courseauditrecord/add")
+    //@SaCheckPermission("/disk/courseauditrecord/add")
     @PostMapping("/disk/courseauditrecord/add")
     public CommonResult<Map<String,Object>> add(@RequestBody @Valid CourseAuditRecordAddParam courseAuditRecordAddParam) {
         Map result=new HashMap();
@@ -339,7 +339,7 @@ public class ResourceRecordController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("资源管理-编辑")
     @CommonLog("资源管理-编辑")
-    @SaCheckPermission("/disk/courseauditrecord/edit")
+    //@SaCheckPermission("/disk/courseauditrecord/edit")
     @PostMapping("/disk/courseauditrecord/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
         if(StringUtils.isEmpty(courseAuditRecordEditParam.getId()))return CommonResult.error("id不能为空");
@@ -404,7 +404,7 @@ public class ResourceRecordController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("资源管理-修改状态")
     @CommonLog("资源管理-修改状态")
-    @SaCheckPermission("/disk/courseauditrecord/updateStatus")
+    //@SaCheckPermission("/disk/courseauditrecord/updateStatus")
     @PostMapping("/disk/courseauditrecord/updateStatus")
     public CommonResult<String> updateStatus(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
         if(StringUtils.isEmpty(courseAuditRecordEditParam.getIds()))return CommonResult.error("id组不能为空");
@@ -463,7 +463,7 @@ public class ResourceRecordController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("资源中心-添加浏览次数")
     @CommonLog("资源中心-添加浏览次数")
-    @SaCheckPermission("/disk/courseauditrecord/addViewCount")
+    //@SaCheckPermission("/disk/courseauditrecord/addViewCount")
     @PostMapping("/disk/courseauditrecord/addViewCount")
     public CommonResult<String> addViewCount(@RequestBody @Valid CourseAuditRecordEditParam courseAuditRecordEditParam) {
         CourseAuditRecord courseAuditRecord=courseAuditRecordService.queryEntity(courseAuditRecordEditParam.getId());
@@ -502,7 +502,7 @@ public class ResourceRecordController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("资源管理-删除")
     @CommonLog("资源管理-删除")
-    @SaCheckPermission("/disk/courseauditrecord/delete")
+    //@SaCheckPermission("/disk/courseauditrecord/delete")
     @PostMapping("/disk/courseauditrecord/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                CommonValidList<CourseAuditRecordIdParam> courseAuditRecordIdParamList) {
@@ -522,7 +522,7 @@ public class ResourceRecordController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("资源管理-详情")
-    @SaCheckPermission("/disk/courseauditrecord/detail")
+    //@SaCheckPermission("/disk/courseauditrecord/detail")
     @GetMapping("/disk/courseauditrecord/detail")
     public CommonResult<Map<String,Object>> detail(@Valid CourseAuditRecordIdParam courseAuditRecordIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -565,7 +565,7 @@ public class ResourceRecordController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("资源中心-详情")
-    @SaCheckPermission("/disk/resourcecentre/detail")
+    //@SaCheckPermission("/disk/resourcecentre/detail")
     @GetMapping("/disk/resourcecentre/detail")
     public CommonResult<Map<String,Object>> resourcecentreDetail(@Valid CourseAuditRecordIdParam courseAuditRecordIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -659,7 +659,7 @@ public class ResourceRecordController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("资源管理-查询最近一次信息")
-    @SaCheckPermission("/disk/courseauditrecord/recentlyRecord")
+    //@SaCheckPermission("/disk/courseauditrecord/recentlyRecord")
     @GetMapping("/disk/courseauditrecord/recentlyRecord")
     public CommonResult<Map<String,Object>> recentlyRecord(CourseAuditRecordIdParam courseAuditRecordIdParam, HttpServletRequest req) {
         Map param =new HashMap();

+ 4 - 4
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ResourceUserfileConvertController.java

@@ -74,7 +74,7 @@ public class ResourceUserfileConvertController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加RESOURCE_USERFILE_CONVERT")
     @CommonLog("添加RESOURCE_USERFILE_CONVERT")
-    @SaCheckPermission("/disk/userfileconvert/add")
+    //@SaCheckPermission("/disk/userfileconvert/add")
     @PostMapping("/disk/userfileconvert/add")
     public CommonResult<String> add(@RequestBody @Valid ResourceUserfileConvertAddParam resourceUserfileConvertAddParam) {
         resourceUserfileConvertService.add(resourceUserfileConvertAddParam);
@@ -90,7 +90,7 @@ public class ResourceUserfileConvertController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑RESOURCE_USERFILE_CONVERT")
     @CommonLog("编辑RESOURCE_USERFILE_CONVERT")
-    @SaCheckPermission("/disk/userfileconvert/edit")
+    //@SaCheckPermission("/disk/userfileconvert/edit")
     @PostMapping("/disk/userfileconvert/edit")
     public CommonResult<String> edit(@RequestBody @Valid ResourceUserfileConvertEditParam resourceUserfileConvertEditParam) {
         resourceUserfileConvertService.edit(resourceUserfileConvertEditParam);
@@ -106,7 +106,7 @@ public class ResourceUserfileConvertController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除RESOURCE_USERFILE_CONVERT")
     @CommonLog("删除RESOURCE_USERFILE_CONVERT")
-    @SaCheckPermission("/disk/userfileconvert/delete")
+    //@SaCheckPermission("/disk/userfileconvert/delete")
     @PostMapping("/disk/userfileconvert/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ResourceUserfileConvertIdParam> resourceUserfileConvertIdParamList) {
@@ -122,7 +122,7 @@ public class ResourceUserfileConvertController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取RESOURCE_USERFILE_CONVERT详情")
-    @SaCheckPermission("/disk/userfileconvert/detail")
+    //@SaCheckPermission("/disk/userfileconvert/detail")
     @GetMapping("/disk/userfileconvert/detail")
     public CommonResult<ResourceUserfileConvert> detail(@Valid ResourceUserfileConvertIdParam resourceUserfileConvertIdParam) {
         return CommonResult.data(resourceUserfileConvertService.detail(resourceUserfileConvertIdParam));

+ 5 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/RoomController.java

@@ -60,7 +60,7 @@ public class RoomController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取教室表分页")
-    @SaCheckPermission("/disk/room/page")
+    //@SaCheckPermission("/disk/room/page")
     @GetMapping("/disk/room/page")
     public CommonResult<Page<Room>> page(RoomPageParam roomPageParam) {
         return CommonResult.data(roomService.page(roomPageParam));
@@ -75,7 +75,7 @@ public class RoomController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加教室表")
     @CommonLog("添加教室表")
-    @SaCheckPermission("/disk/room/add")
+    //@SaCheckPermission("/disk/room/add")
     @PostMapping("/disk/room/add")
     public CommonResult<String> add(@RequestBody @Valid RoomAddParam roomAddParam) {
         roomService.add(roomAddParam);
@@ -91,7 +91,7 @@ public class RoomController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑教室表")
     @CommonLog("编辑教室表")
-    @SaCheckPermission("/disk/room/edit")
+    //@SaCheckPermission("/disk/room/edit")
     @PostMapping("/disk/room/edit")
     public CommonResult<String> edit(@RequestBody @Valid RoomEditParam roomEditParam) {
         roomService.edit(roomEditParam);
@@ -107,7 +107,7 @@ public class RoomController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除教室表")
     @CommonLog("删除教室表")
-    @SaCheckPermission("/disk/room/delete")
+    //@SaCheckPermission("/disk/room/delete")
     @PostMapping("/disk/room/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<RoomIdParam> roomIdParamList) {
@@ -123,7 +123,7 @@ public class RoomController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取教室表详情")
-    @SaCheckPermission("/disk/room/detail")
+    //@SaCheckPermission("/disk/room/detail")
     @GetMapping("/disk/room/detail")
     public CommonResult<Room> detail(@Valid RoomIdParam roomIdParam) {
         return CommonResult.data(roomService.detail(roomIdParam));

+ 6 - 6
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/SemesterController.java

@@ -66,7 +66,7 @@ public class SemesterController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("学期表-分页列表")
-    @SaCheckPermission("/disk/semester/page")
+    //@SaCheckPermission("/disk/semester/page")
     @GetMapping("/disk/semester/page")
     public CommonResult<Page<Map<String,Object>>> page(SemesterPageParam semesterPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -86,7 +86,7 @@ public class SemesterController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("学期表-下拉列表")
-    @SaCheckPermission("/disk/semester/downList")
+    //@SaCheckPermission("/disk/semester/downList")
     @GetMapping("/disk/semester/downList")
     public CommonResult<List<Map<String,Object>>> downList(SemesterPageParam semesterPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -105,7 +105,7 @@ public class SemesterController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加学期表")
     @CommonLog("添加学期表")
-    @SaCheckPermission("/disk/semester/add")
+    //@SaCheckPermission("/disk/semester/add")
     @PostMapping("/disk/semester/add")
     public CommonResult<String> add(@RequestBody @Valid SemesterAddParam semesterAddParam) {
         Semester semester = BeanUtil.toBean(semesterAddParam, Semester.class);
@@ -148,7 +148,7 @@ public class SemesterController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑学期表")
     @CommonLog("编辑学期表")
-    @SaCheckPermission("/disk/semester/edit")
+    //@SaCheckPermission("/disk/semester/edit")
     @PostMapping("/disk/semester/edit")
     public CommonResult<String> edit(@RequestBody @Valid SemesterEditParam semesterEditParam) {
         Semester semester = BeanUtil.toBean(semesterEditParam, Semester.class);
@@ -190,7 +190,7 @@ public class SemesterController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除学期表")
     @CommonLog("删除学期表")
-    @SaCheckPermission("/disk/semester/delete")
+    //@SaCheckPermission("/disk/semester/delete")
     @PostMapping("/disk/semester/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<SemesterIdParam> semesterIdParamList) {
@@ -206,7 +206,7 @@ public class SemesterController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取学期表详情")
-    @SaCheckPermission("/disk/semester/detail")
+    //@SaCheckPermission("/disk/semester/detail")
     @GetMapping("/disk/semester/detail")
     public CommonResult<Map<String,Object>> detail(@Valid SemesterIdParam semesterIdParam, HttpServletRequest req) {
         Map param =new HashMap();

+ 5 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ShareGroupController.java

@@ -83,7 +83,7 @@ public class ShareGroupController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("资源共享-群组-分页列表")
-//    @SaCheckPermission("/disk/sharegroup/page")
+//    //@SaCheckPermission("/disk/sharegroup/page")
     @GetMapping("/disk/sharegroup/page")
     public CommonResult<Page<Map<String,Object>>> page(ShareGroupUserPageParam shareGroupUserPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -101,7 +101,7 @@ public class ShareGroupController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("资源共享-群组-新增")
     @CommonLog("资源共享-群组-新增")
-//    @SaCheckPermission("/disk/sharegroup/add")
+//    //@SaCheckPermission("/disk/sharegroup/add")
     @PostMapping("/disk/sharegroup/add")
     public CommonResult<String> add(@RequestBody @Valid ShareGroupAddParam shareGroupAddParam) {
         //1.先创建一个角色为群组的用户
@@ -159,7 +159,7 @@ public class ShareGroupController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("资源共享-群组-编辑")
     @CommonLog("资源共享-群组-编辑")
-//    @SaCheckPermission("/disk/sharegroup/edit")
+//    //@SaCheckPermission("/disk/sharegroup/edit")
     @PostMapping("/disk/sharegroup/edit")
     public CommonResult<String> edit(@RequestBody @Valid ShareGroupEditParam shareGroupEditParam) {
         //1.先创建一个角色为群组的用户
@@ -221,7 +221,7 @@ public class ShareGroupController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("资源共享-群组-删除")
     @CommonLog("资源共享-群组-删除")
-//    @SaCheckPermission("/disk/sharegroup/delete")
+//    //@SaCheckPermission("/disk/sharegroup/delete")
     @PostMapping("/disk/sharegroup/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ShareGroupIdParam> shareGroupIdParamList) {
@@ -238,7 +238,7 @@ public class ShareGroupController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("资源共享-群组-详情")
-//    @SaCheckPermission("/disk/sharegroup/detail")
+//    //@SaCheckPermission("/disk/sharegroup/detail")
     @GetMapping("/disk/sharegroup/detail")
     public CommonResult<Map<String,Object>> detail(@Valid ShareGroupIdParam shareGroupIdParam) {
         Map param=new HashMap();

+ 46 - 33
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CollegeOrg.java

@@ -29,50 +29,63 @@ import java.util.Date;
 @Setter
 @TableName("COLLEGE_ORG")
 public class CollegeOrg {
-
-    /** 主键id */
+    /** ID */
     @TableId
-    @ApiModelProperty(value = "主键id", position = 1)
+    @ApiModelProperty(value = "ID", position = 1)
     private String id;
 
-    /** 组织id */
-    @ApiModelProperty(value = "组织id", position = 2)
+    /** DEPT_ID */
+    @ApiModelProperty(value = "DEPT_ID", position = 2)
     private Long deptId;
 
-    /** 名称 */
-    @ApiModelProperty(value = "名称", position = 3)
-    private String usergName;
+    /** DEPT_NAME */
+    @ApiModelProperty(value = "DEPT_NAME", position = 3)
+    private String deptName;
 
-    /** 描述 */
-    @ApiModelProperty(value = "描述", position = 4)
-    private String descRibe;
+    /** ANCESTORS */
+    @ApiModelProperty(value = "ANCESTORS", position = 4)
+    private String ancestors;
 
-    /** 0代表存在;2代表删除 */
-    @ApiModelProperty(value = "0代表存在;2代表删除", position = 5)
-    private String delFlag;
+    /** DEPT_TYPE */
+    @ApiModelProperty(value = "DEPT_TYPE", position = 5)
+    private String deptType;
 
-    /** 用户组类型(2组织用户组 1自建用户组) */
-    @ApiModelProperty(value = "用户组类型(2组织用户组 1自建用户组)", position = 6)
-    private String type;
+    /** ORDER_NUM */
+    @ApiModelProperty(value = "ORDER_NUM", position = 6)
+    private String orderNum;
 
-    /** 用户id */
-    @ApiModelProperty(value = "用户id", position = 7)
-    private String userId;
+    /** CREATE_TIME */
+    @ApiModelProperty(value = "CREATE_TIME", position = 7)
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
 
-    /** App名称 */
-    @ApiModelProperty(value = "App名称", position = 8)
-    private String appName;
+    /** 失败原因 */
+    @ApiModelProperty(value = "失败原因", position = 8)
+    private String reason;
 
-    /** App Code */
-    @ApiModelProperty(value = "App Code", position = 9)
-    private String userNumber;
+    /** 下发状态 0 失败  1正常 */
+    @ApiModelProperty(value = "下发状态 0 失败  1正常", position = 9)
+    private String issue;
 
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 10)
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
+    /** PRI_KEY */
+    @ApiModelProperty(value = "PRI_KEY", position = 10)
+    private String priKey;
+
+    /** DEPT_CODE */
+    @ApiModelProperty(value = "DEPT_CODE", position = 11)
+    private String deptCode;
+
+    /** STATUS */
+    @ApiModelProperty(value = "STATUS", position = 12)
+    private String status;
+
+    /** COMMAND_TYPE */
+    @ApiModelProperty(value = "COMMAND_TYPE", position = 13)
+    private String commandType;
 
-    /** 用户id数组 */
-    @ApiModelProperty(value = "用户id数组", position = 11)
-    private String userList;
+    /** PARENT_ID */
+    @ApiModelProperty(value = "PARENT_ID", position = 14)
+    private String parentId;
+    /** 下发的json字符串 */
+    private String info;
 }

+ 44 - 33
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CollegePosition.java

@@ -30,57 +30,68 @@ import java.util.Date;
 @TableName("COLLEGE_POSITION")
 public class CollegePosition {
 
-    /** 主键id */
+    /** ID */
     @TableId
-    @ApiModelProperty(value = "主键id", position = 1)
+    @ApiModelProperty(value = "ID", position = 1)
     private String id;
 
-    /** 岗位Id */
-    @ApiModelProperty(value = "岗位Id", position = 2)
-    private Long postId;
+    /** POST_ID */
+    @ApiModelProperty(value = "POST_ID", position = 2)
+    private String postId;
 
-    /** 名称 */
-    @ApiModelProperty(value = "名称", position = 3)
+    /** POST_CODE */
+    @ApiModelProperty(value = "POST_CODE", position = 3)
     private String postCode;
 
-    /** 描述 */
-    @ApiModelProperty(value = "描述", position = 4)
+    /** POST_NAME */
+    @ApiModelProperty(value = "POST_NAME", position = 4)
     private String postName;
 
-    /** 0代表存在;2代表删除 */
-    @ApiModelProperty(value = "0代表存在;2代表删除", position = 5)
+    /** POST_SORT */
+    @ApiModelProperty(value = "POST_SORT", position = 5)
     private Integer postSort;
 
-    /** 组织Id */
-    @ApiModelProperty(value = "组织Id", position = 6)
+    /** DEPT_ID */
+    @ApiModelProperty(value = "DEPT_ID", position = 6)
     private Long deptId;
 
-    /** 组织名称 */
-    @ApiModelProperty(value = "组织名称", position = 7)
+    /** DEPT_NAME */
+    @ApiModelProperty(value = "DEPT_NAME", position = 7)
     private String deptName;
 
-    /** 状态(0正常;1停用) */
-    @ApiModelProperty(value = "状态(0正常;1停用)", position = 8)
+    /** STATUS */
+    @ApiModelProperty(value = "STATUS", position = 8)
     private String status;
 
-    /** 创建者 */
-    @ApiModelProperty(value = "创建者", position = 9)
-    private String createBy;
-
-    /** 备注 */
-    @ApiModelProperty(value = "备注", position = 10)
+    /** REMARK */
+    @ApiModelProperty(value = "REMARK", position = 9)
     private String remark;
 
-    /** 添加系统 */
-    @ApiModelProperty(value = "添加系统", position = 11)
-    private String createApp;
-
-    /** 修改系统 */
-    @ApiModelProperty(value = "修改系统", position = 12)
-    private String updateApp;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 13)
+    /** CREATE_TIME */
+    @ApiModelProperty(value = "CREATE_TIME", position = 10)
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
+
+    /** 失败原因 */
+    @ApiModelProperty(value = "失败原因", position = 11)
+    private String reason;
+
+    /** 下发状态 0失败  1正常 */
+    @ApiModelProperty(value = "下发状态 0失败  1正常", position = 12)
+    private String issue;
+
+    /** PRI_KEY */
+    @ApiModelProperty(value = "PRI_KEY", position = 13)
+    private String priKey;
+
+    /** COMMAND_TYPE */
+    @ApiModelProperty(value = "COMMAND_TYPE", position = 14)
+    private String commandType;
+
+    /** ORDER_NUM */
+    @ApiModelProperty(value = "ORDER_NUM", position = 15)
+    private String orderNum;
+
+    /** 下发的json字符串 */
+    private String info;
 }

+ 56 - 47
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CollegeUser.java

@@ -19,6 +19,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 下发用户日志表实体
@@ -31,70 +32,78 @@ import java.util.Date;
 @TableName("COLLEGE_USER")
 public class CollegeUser {
 
-    /** 主键id */
+    /** ID */
     @TableId
-    @ApiModelProperty(value = "主键id", position = 1)
+    @ApiModelProperty(value = "ID", position = 1)
     private String id;
 
-    /** 部门id */
-    @ApiModelProperty(value = "部门id", position = 2)
-    private Long deptId;
+    /** USER_ID */
+    @ApiModelProperty(value = "USER_ID", position = 2)
+    private String userId;
 
-    /** 岗位编码 */
-    @ApiModelProperty(value = "岗位编码", position = 3)
-    private String postIds;
+    /** APP_ID */
+    @ApiModelProperty(value = "APP_ID", position = 3)
+    private String appId;
 
-    /** 岗位名称 */
-    @ApiModelProperty(value = "岗位名称", position = 4)
-    private String postName;
+    /** CALL_NAME */
+    @ApiModelProperty(value = "CALL_NAME", position = 4)
+    private String callName;
 
-    /** 账号 */
-    @ApiModelProperty(value = "账号", position = 5)
+    /** USER_NAME */
+    @ApiModelProperty(value = "USER_NAME", position = 5)
     private String userName;
 
-    /** 姓名 */
-    @ApiModelProperty(value = "姓名", position = 6)
-    private String nickName;
-
-    /** 用户邮箱 */
-    @ApiModelProperty(value = "用户邮箱", position = 7)
+    /** EMAIL */
+    @ApiModelProperty(value = "EMAIL", position = 6)
     private String email;
 
-    /** 手机号码 */
-    @ApiModelProperty(value = "手机号码", position = 8)
-    private String phone;
-
-    /** 证件号 */
-    @ApiModelProperty(value = "证件号", position = 9)
-    private String psptId;
+    /** MOBILE */
+    @ApiModelProperty(value = "MOBILE", position = 7)
+    private String mobile;
 
-    /** 用户性别( "0=男,1=女,2=未知") */
+    /** SEX */
+    @ApiModelProperty(value = "SEX", position = 8)
     private String sex;
 
-    /** 用户头像 */
-    @ApiModelProperty(value = "用户头像", position = 11)
-    private String avatar;
-
-    /** 密码 */
-    @ApiModelProperty(value = "密码", position = 12)
-    private String password;
-
-    /** 账号状态("0=正常,1=停用") */
+    /** STATUS */
+    @ApiModelProperty(value = "STATUS", position = 9)
     private String status;
 
-    /** 人员编码 */
-    @ApiModelProperty(value = "人员编码", position = 14)
-    private String personCode;
+    /** USER_CODE */
+    @ApiModelProperty(value = "USER_CODE", position = 10)
+    private String userCode;
 
-    /** 账号类型 */
-    @ApiModelProperty(value = "账号类型", position = 15)
+    /** USER_TYPE */
+    @ApiModelProperty(value = "USER_TYPE", position = 11)
     private String userType;
 
-    /** 历史密码 */
-    @ApiModelProperty(value = "历史密码", position = 16)
-    private String historyPassword;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 17)
+    /** CRATE_TIME */
+    @ApiModelProperty(value = "CRATE_TIME", position = 12)
     private Date crateTime;
+
+    /** 失败原因 */
+    @ApiModelProperty(value = "失败原因", position = 13)
+    private String reason;
+
+    /** 下发状态(0失败  1成功) */
+    @ApiModelProperty(value = "下发状态(0失败  1成功)", position = 14)
+    private String issue;
+
+    /** DEL_FLAG */
+    @ApiModelProperty(value = "DEL_FLAG", position = 15)
+    private String delFlag;
+
+    /** POST */
+    @ApiModelProperty(value = "POST", position = 16)
+    private String post;
+
+    /** PRI_KEY */
+    @ApiModelProperty(value = "PRI_KEY", position = 17)
+    private String priKey;
+
+    /** COMMAND_TYPE */
+    @ApiModelProperty(value = "COMMAND_TYPE", position = 18)
+    private String commandType;
+    /** 下发的json字符串 */
+    private String info;
 }

+ 15 - 0
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/Dept.java

@@ -0,0 +1,15 @@
+package vip.xiaonuo.disk.domain;
+
+import lombok.Data;
+
+@Data
+public class Dept {
+    private String deptId;
+    private String major;
+    private String orderNum;
+    private String postId;
+    private String postName;
+    private String userId;
+
+
+}

+ 2 - 2
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/ResourceStatisticMapper.xml

@@ -144,7 +144,7 @@
             RESOURCE_RECORD a
         LEFT JOIN RESOURCE_USERFILE b ON  a.USERFILE_ID = b.USER_FILE_ID
         <where>
-            b.EXTEND_NAME!=''
+            b.EXTEND_NAME is not null
             <if test="collegeId != null">
                 AND a.COLLEGE_ID = #{collegeId}
             </if>
@@ -170,7 +170,7 @@
         LEFT JOIN RESOURCE_USERFILE b ON 	a.USERFILE_ID = b.USER_FILE_ID
         LEFT JOIN RESOURCE_FILE c ON 	b.FILE_ID = c.FILE_ID
         <where>
-            b.EXTEND_NAME!=''
+            b.EXTEND_NAME is not null
             <if test="collegeId != null">
                 AND a.COLLEGE_ID = #{collegeId}
             </if>

+ 4 - 4
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/SemesterMapper.xml

@@ -8,7 +8,7 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS startTime,
+            IFNULL (TO_CHAR(se.START_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as startTime,
             IFNULL (se.IS_NOW ,'') AS isNow,
             IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         FROM SEMESTER se
@@ -30,7 +30,7 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS starTime,
+            IFNULL (TO_CHAR(se.START_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as startTime,
             IFNULL (se.IS_NOW ,'') AS isNow,
             IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         FROM SEMESTER se
@@ -46,7 +46,7 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS starTime,
+            IFNULL (TO_CHAR(se.START_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as startTime,
             IFNULL (se.IS_NOW ,'') AS isNow,
             IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         FROM SEMESTER se
@@ -70,7 +70,7 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS starTime,
+            IFNULL (TO_CHAR(se.START_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as startTime,
             IFNULL (se.IS_NOW ,'') AS isNow,
             IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         </if>

+ 8 - 8
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/TeachingActivityMapper.xml

@@ -25,10 +25,10 @@
               AND ci.COURSE_ID = #{courseId}
           </if>
           <if test="map.startTime != null">
-              AND ctb.create_time &gt;= #{map.startTime}
+              AND ci.create_time &gt;= #{map.startTime}
           </if>
           <if test="map.endTime != null">
-              AND ctb.create_time &lt;= #{map.endTime}
+              AND ci.create_time &lt;= #{map.endTime}
           </if>
           AND ci.DELETE_FLAG ='NOT_DELETE'
           AND cch.ID IS NOT NULL
@@ -62,10 +62,10 @@
                 AND ci.COURSE_ID = #{courseId}
             </if>
             <if test="map.startTime != null">
-                AND ctb.create_time &gt;= #{map.startTime}
+                AND ci.create_time &gt;= #{map.startTime}
             </if>
             <if test="map.endTime != null">
-                AND ctb.create_time &lt;= #{map.endTime}
+                AND ci.create_time &lt;= #{map.endTime}
             </if>
             AND ci.DELETE_FLAG ='NOT_DELETE'
             AND cch.ID IS NOT NULL
@@ -91,10 +91,10 @@
                 AND ci.COURSE_ID = #{courseId}
             </if>
             <if test="map.startTime != null">
-                AND ctb.create_time &gt;= #{map.startTime}
+                AND ci.create_time &gt;= #{map.startTime}
             </if>
             <if test="map.endTime != null">
-                AND ctb.create_time &lt;= #{map.endTime}
+                AND ci.create_time &lt;= #{map.endTime}
             </if>
             AND cch.ID IS NOT NULL
             AND cc.ID IS NOT NULL
@@ -146,10 +146,10 @@
                 AND ci.COURSE_ID = #{courseId}
             </if>
             <if test="map.startTime != null">
-                AND ctb.create_time &gt;= #{map.startTime}
+                AND ci.create_time &gt;= #{map.startTime}
             </if>
             <if test="map.endTime != null">
-                AND ctb.create_time &lt;= #{map.endTime}
+                AND ci.create_time &lt;= #{map.endTime}
             </if>
             AND cch.ID IS NOT NULL
             AND cc.ID IS NOT NULL

+ 39 - 26
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/collegeOrg/CollegeOrgAddParam.java

@@ -31,40 +31,53 @@ import java.util.Date;
 @Setter
 public class CollegeOrgAddParam {
 
-    /** 组织id */
-    @ApiModelProperty(value = "组织id", position = 2)
+    /** DEPT_ID */
+    @ApiModelProperty(value = "DEPT_ID", position = 2)
     private Long deptId;
 
-    /** 名称 */
-    @ApiModelProperty(value = "名称", position = 3)
-    private String usergName;
+    /** DEPT_NAME */
+    @ApiModelProperty(value = "DEPT_NAME", position = 3)
+    private String deptName;
 
-    /** 描述 */
-    @ApiModelProperty(value = "描述", position = 4)
-    private String descRibe;
+    /** ANCESTORS */
+    @ApiModelProperty(value = "ANCESTORS", position = 4)
+    private String ancestors;
 
-    /** 0代表存在;2代表删除 */
-    @ApiModelProperty(value = "0代表存在;2代表删除", position = 5)
-    private String delFlag;
+    /** DEPT_TYPE */
+    @ApiModelProperty(value = "DEPT_TYPE", position = 5)
+    private String deptType;
 
-    /** 用户组类型(2组织用户组 1自建用户组) */
-    @ApiModelProperty(value = "用户组类型(2组织用户组 1自建用户组)", position = 6)
-    private String type;
+    /** ORDER_NUM */
+    @ApiModelProperty(value = "ORDER_NUM", position = 6)
+    private String orderNum;
 
-    /** 用户id */
-    @ApiModelProperty(value = "用户id", position = 7)
-    private String userId;
+    /** 失败原因 */
+    @ApiModelProperty(value = "失败原因", position = 8)
+    private String reason;
 
-    /** App名称 */
-    @ApiModelProperty(value = "App名称", position = 8)
-    private String appName;
+    /** 下发状态 0 失败  1正常 */
+    @ApiModelProperty(value = "下发状态 0 失败  1正常", position = 9)
+    private String issue;
 
-    /** App Code */
-    @ApiModelProperty(value = "App Code", position = 9)
-    private String userNumber;
+    /** PRI_KEY */
+    @ApiModelProperty(value = "PRI_KEY", position = 10)
+    private String priKey;
+
+    /** DEPT_CODE */
+    @ApiModelProperty(value = "DEPT_CODE", position = 11)
+    private String deptCode;
+
+    /** STATUS */
+    @ApiModelProperty(value = "STATUS", position = 12)
+    private String status;
+
+    /** COMMAND_TYPE */
+    @ApiModelProperty(value = "COMMAND_TYPE", position = 13)
+    private String commandType;
+
+    /** PARENT_ID */
+    @ApiModelProperty(value = "PARENT_ID", position = 14)
+    private String parentId;
 
-    /** 用户id数组 */
-    @ApiModelProperty(value = "用户id数组", position = 11)
-    private String userList;
 
 }

+ 36 - 28
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/collegePosition/CollegePositionAddParam.java

@@ -30,49 +30,57 @@ import java.util.Date;
 @Getter
 @Setter
 public class CollegePositionAddParam {
+    /** POST_ID */
+    @ApiModelProperty(value = "POST_ID", position = 2)
+    private String postId;
 
-    /** 岗位Id */
-    @ApiModelProperty(value = "岗位Id", position = 2)
-    private Long postId;
-
-    /** 名称 */
-    @ApiModelProperty(value = "岗位编码", position = 3)
+    /** POST_CODE */
+    @ApiModelProperty(value = "POST_CODE", position = 3)
     private String postCode;
 
-    /** 描述 */
-    @ApiModelProperty(value = "岗位名称", position = 4)
+    /** POST_NAME */
+    @ApiModelProperty(value = "POST_NAME", position = 4)
     private String postName;
 
-    /** 0代表存在;2代表删除 */
-    @ApiModelProperty(value = "显示顺序", position = 5)
+    /** POST_SORT */
+    @ApiModelProperty(value = "POST_SORT", position = 5)
     private Integer postSort;
 
-    /** 组织Id */
-    @ApiModelProperty(value = "组织Id", position = 6)
+    /** DEPT_ID */
+    @ApiModelProperty(value = "DEPT_ID", position = 6)
     private Long deptId;
 
-    /** 组织名称 */
-    @ApiModelProperty(value = "组织名称", position = 7)
+    /** DEPT_NAME */
+    @ApiModelProperty(value = "DEPT_NAME", position = 7)
     private String deptName;
 
-    /** 状态(0正常;1停用) */
-    @ApiModelProperty(value = "状态(0正常;1停用)", position = 8)
+    /** STATUS */
+    @ApiModelProperty(value = "STATUS", position = 8)
     private String status;
 
-    /** 创建者 */
-    @ApiModelProperty(value = "创建者", position = 9)
-    private String createBy;
-
-    /** 备注 */
-    @ApiModelProperty(value = "备注", position = 10)
+    /** REMARK */
+    @ApiModelProperty(value = "REMARK", position = 9)
     private String remark;
 
-    /** 添加系统 */
-    @ApiModelProperty(value = "添加系统", position = 11)
-    private String createApp;
+    /** 失败原因 */
+    @ApiModelProperty(value = "失败原因", position = 11)
+    private String reason;
+
+    /** 下发状态 0失败  1正常 */
+    @ApiModelProperty(value = "下发状态 0失败  1正常", position = 12)
+    private String issue;
+
+    /** PRI_KEY */
+    @ApiModelProperty(value = "PRI_KEY", position = 13)
+    private String priKey;
+
+    /** COMMAND_TYPE */
+    @ApiModelProperty(value = "COMMAND_TYPE", position = 14)
+    private String commandType;
+
+    /** ORDER_NUM */
+    @ApiModelProperty(value = "ORDER_NUM", position = 15)
+    private String orderNum;
 
-    /** 修改系统 */
-    @ApiModelProperty(value = "修改系统", position = 12)
-    private String updateApp;
 
 }

+ 53 - 45
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/collegeUser/CollegeUserAddParam.java

@@ -15,11 +15,13 @@ package vip.xiaonuo.disk.param.collegeUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.disk.domain.Dept;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 下发用户日志表添加参数
@@ -31,66 +33,72 @@ import java.util.Date;
 @Setter
 public class CollegeUserAddParam {
 
-    /** 部门id */
-    @ApiModelProperty(value = "部门id", position = 2)
-    private Long deptId;
+    /** USER_ID */
+    @ApiModelProperty(value = "USER_ID", position = 2)
+    private String userId;
 
-    /** 岗位编码 */
-    @ApiModelProperty(value = "岗位编码", position = 3)
-    private String postIds;
+    /** APP_ID */
+    @ApiModelProperty(value = "APP_ID", position = 3)
+    private String appId;
 
-    /** 岗位名称 */
-    @ApiModelProperty(value = "岗位名称", position = 4)
-    private String postName;
+    /** CALL_NAME */
+    @ApiModelProperty(value = "CALL_NAME", position = 4)
+    private String callName;
 
-    /** 账号 */
-    @ApiModelProperty(value = "账号", position = 5)
+    /** USER_NAME */
+    @ApiModelProperty(value = "USER_NAME", position = 5)
     private String userName;
 
-    /** 姓名 */
-    @ApiModelProperty(value = "姓名", position = 6)
-    private String nickName;
-
-    /** 用户邮箱 */
-    @ApiModelProperty(value = "用户邮箱", position = 7)
+    /** EMAIL */
+    @ApiModelProperty(value = "EMAIL", position = 6)
     private String email;
 
-    /** 手机号码 */
-    @ApiModelProperty(value = "手机号码", position = 8)
-    private String phone;
-
-    /** 证件号 */
-    @ApiModelProperty(value = "证件号", position = 9)
-    private String psptId;
+    /** MOBILE */
+    @ApiModelProperty(value = "MOBILE", position = 7)
+    private String mobile;
 
-    /** 用户性别( "0=男,1=女,2=未知") */
+    /** SEX */
+    @ApiModelProperty(value = "SEX", position = 8)
     private String sex;
 
-    /** 用户头像 */
-    @ApiModelProperty(value = "用户头像", position = 11)
-    private String avatar;
-
-    /** 密码 */
-    @ApiModelProperty(value = "密码", position = 12)
-    private String password;
-
-    /** 账号状态("0=正常,1=停用") */
+    /** STATUS */
+    @ApiModelProperty(value = "STATUS", position = 9)
     private String status;
 
-    /** 人员编码 */
-    @ApiModelProperty(value = "人员编码", position = 14)
-    private String personCode;
+    /** USER_CODE */
+    @ApiModelProperty(value = "USER_CODE", position = 10)
+    private String userCode;
 
-    /** 账号类型 */
-    @ApiModelProperty(value = "账号类型", position = 15)
+    /** USER_TYPE */
+    @ApiModelProperty(value = "USER_TYPE", position = 11)
     private String userType;
 
-    /** 历史密码 */
-    @ApiModelProperty(value = "历史密码", position = 16)
-    private String historyPassword;
-
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间", position = 17)
+    /** CRATE_TIME */
+    @ApiModelProperty(value = "CRATE_TIME", position = 12)
     private Date crateTime;
 
+    /** 失败原因 */
+    @ApiModelProperty(value = "失败原因", position = 13)
+    private String reason;
+
+    /** 下发状态(0失败  1成功) */
+    @ApiModelProperty(value = "下发状态(0失败  1成功)", position = 14)
+    private String issue;
+
+    /** DEL_FLAG */
+    @ApiModelProperty(value = "DEL_FLAG", position = 15)
+    private String delFlag;
+
+    /** POST */
+    @ApiModelProperty(value = "POST", position = 16)
+    private List<Dept> post;
+
+    /** PRI_KEY */
+    @ApiModelProperty(value = "PRI_KEY", position = 17)
+    private String priKey;
+
+    /** COMMAND_TYPE */
+    @ApiModelProperty(value = "COMMAND_TYPE", position = 18)
+    private String commandType;
+
 }

+ 42 - 39
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegeOrgServiceImpl.java

@@ -74,53 +74,56 @@ public class CollegeOrgServiceImpl extends ServiceImpl<CollegeOrgMapper, College
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+
     @Override
     public void add(CollegeOrgAddParam collegeOrgAddParam) {
-        int count = userAddCounter.incrementAndGet();
-        log.info("下发组织数据========================>"+JSON.toJSONString(collegeOrgAddParam));
-        CollegeOrg collegeOrg = BeanUtil.toBean(collegeOrgAddParam, CollegeOrg.class);
-        collegeOrg.setCreateTime(new Date());
-        this.save(collegeOrg);
+        try {
+            int count = userAddCounter.incrementAndGet();
+            String info=JSON.toJSONString(collegeOrgAddParam);
+            log.info("下发组织数据========================>"+info);
+            CollegeOrg collegeOrg = BeanUtil.toBean(collegeOrgAddParam, CollegeOrg.class);
+            collegeOrg.setCreateTime(new Date());
+            collegeOrg.setIssue("1");
+            collegeOrg.setInfo(info);
+            this.save(collegeOrg);
 
-        //根据组织id查询组织信息是否存在
-        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysOrg::getId, collegeOrg.getDeptId());
-        SysOrg sysOrg=sysOrgMapper.selectOne(queryWrapper);
+            //根据组织id查询组织信息是否存在
+            QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(SysOrg::getId, collegeOrg.getDeptId());
+            SysOrg sysOrg=sysOrgMapper.selectOne(queryWrapper);
 
-        //如果组织存在,则进行更新
-        if(ObjectUtil.isNotEmpty(sysOrg)){
-            sysOrg.setName(collegeOrg.getUsergName());
-            sysOrg.setRemark(collegeOrg.getDescRibe());
-            if("0".equals(collegeOrg.getDelFlag())){
+            //如果组织存在,则进行更新
+            if(ObjectUtil.isNotEmpty(sysOrg)){
+                sysOrg.setName(collegeOrg.getDeptName());
+                sysOrg.setParentId(collegeOrg.getParentId());
+                sysOrg.setCode(collegeOrg.getDeptCode());
+                sysOrg.setUpdateTime(new Date());
                 sysOrg.setDeleteFlag("NOT_DELETE");
-            }else if("2".equals(collegeOrg.getDelFlag())){
-                sysOrg.setDeleteFlag("DELETED");
-            }
-            sysOrg.setParentId("0");
-            sysOrg.setType(collegeOrg.getType());
-            sysOrg.setUpdateTime(new Date());
-
-            UpdateWrapper<SysOrg> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("id", sysOrg.getId());
-            sysOrgMapper.update(sysOrg, updateWrapper);
-        }else{
-            SysOrg org=new SysOrg();
-            org.setId(String.valueOf(collegeOrg.getDeptId()));
-            org.setName(collegeOrg.getUsergName());
-            org.setRemark(collegeOrg.getDescRibe());
-            if("0".equals(collegeOrg.getDelFlag())){
+                UpdateWrapper<SysOrg> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("code", sysOrg.getCode());
+                sysOrgMapper.update(sysOrg, updateWrapper);
+            }else{
+                SysOrg org=new SysOrg();
+                org.setId(String.valueOf(collegeOrg.getDeptId()));
+                org.setName(collegeOrg.getDeptName());
+                org.setCode(collegeOrg.getDeptCode());
                 org.setDeleteFlag("NOT_DELETE");
-            }else if("2".equals(collegeOrg.getDelFlag())){
-                org.setDeleteFlag("DELETED");
+                org.setParentId(collegeOrg.getParentId());
+                org.setCreateTime(new Date());
+                sysOrgMapper.insert(org);
             }
-            org.setParentId("0");
-            org.setType(collegeOrg.getType());
-            org.setCreateTime(new Date());
-            sysOrgMapper.insert(org);
+            log.info("用户组织数据下发成功:{}", JSON.toJSONString(collegeOrgAddParam));
+            log.info("用户组织数据下发成功,下发条数:{}",count);
+        } catch (Exception e) {
+            String info=JSON.toJSONString(collegeOrgAddParam);
+            CollegeOrg collegeOrg = BeanUtil.toBean(collegeOrgAddParam, CollegeOrg.class);
+            collegeOrg.setCreateTime(new Date());
+            collegeOrg.setIssue("0");
+            collegeOrg.setReason(e.getMessage());
+            collegeOrg.setInfo(info);
+            this.save(collegeOrg);
+            throw new RuntimeException("用户组织数据下发失败:==========================>"+e.getMessage());
         }
-        log.info("用户组织数据下发成功:{}", JSON.toJSONString(collegeOrgAddParam));
-        log.info("用户组织数据下发成功,下发条数:{}",count);
     }
 
     @Transactional(rollbackFor = Exception.class)

+ 59 - 44
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegePositionServiceImpl.java

@@ -72,54 +72,69 @@ public class CollegePositionServiceImpl extends ServiceImpl<CollegePositionMappe
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+
     @Override
     public void add(CollegePositionAddParam collegePositionAddParam) {
-        int count = userAddCounter.incrementAndGet();
-        log.info("下发岗位数据========================>"+JSON.toJSONString(collegePositionAddParam));
-
-        CollegePosition collegePosition = BeanUtil.toBean(collegePositionAddParam, CollegePosition.class);
-        collegePosition.setCreateTime(new Date());
-        this.save(collegePosition);
-
-        //根据岗位编码查询岗位是否存在
-        QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysPosition::getCode, collegePosition.getPostCode());
-        SysPosition sysPosition=sysPositionMapper.selectOne(queryWrapper);
-
-        //如果用户存在,则进行更新
-        if(ObjectUtil.isNotEmpty(sysPosition)){
-
-            sysPosition.setCode(collegePosition.getPostCode());
-            sysPosition.setName(collegePosition.getPostName());
-            sysPosition.setSortCode(collegePosition.getPostSort());
-            sysPosition.setOrgId(String.valueOf(collegePosition.getDeptId()));
-            sysPosition.setStatus(collegePosition.getStatus());
-            sysPosition.setRemark(collegePosition.getRemark());
-            sysPosition.setUpdateTime(new Date());
-
-            UpdateWrapper<SysPosition> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("code", sysPosition.getCode());
-            sysPositionMapper.update(sysPosition, updateWrapper);
-
-        }else{
-            SysPosition position=new SysPosition();
-
-            position.setId(String.valueOf(collegePosition.getPostId()));
-            position.setCode(collegePosition.getPostCode());
-            position.setName(collegePosition.getPostName());
-            position.setSortCode(collegePosition.getPostSort());
-            position.setOrgId(String.valueOf(collegePosition.getDeptId()));
-            position.setStatus(collegePosition.getStatus());
-            position.setRemark(collegePosition.getRemark());
-            position.setCreateTime(new Date());
-
-            sysPositionMapper.insert(position);
+        try {
+            int count = userAddCounter.incrementAndGet();
+            String info=JSON.toJSONString(collegePositionAddParam);
+            log.info("下发岗位数据========================>"+info);
+
+            CollegePosition collegePosition = BeanUtil.toBean(collegePositionAddParam, CollegePosition.class);
+            collegePosition.setCreateTime(new Date());
+            collegePosition.setIssue("1");
+            collegePosition.setInfo(info);
+            this.save(collegePosition);
+
+            //根据岗位编码查询岗位是否存在
+            QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(SysPosition::getId, collegePosition.getPostId());
+            SysPosition sysPosition=sysPositionMapper.selectOne(queryWrapper);
+
+            //如果用户存在,则进行更新
+            if(ObjectUtil.isNotEmpty(sysPosition)){
+
+                sysPosition.setCode(collegePosition.getPostCode());
+                sysPosition.setName(collegePosition.getPostName());
+                sysPosition.setSortCode(collegePosition.getPostSort());
+                sysPosition.setOrgId(String.valueOf(collegePosition.getDeptId()));
+                sysPosition.setStatus(collegePosition.getStatus());
+                sysPosition.setRemark(collegePosition.getRemark());
+                sysPosition.setUpdateTime(new Date());
+                sysPosition.setDeleteFlag("NOT_DELETE");
+                sysPosition.setDeleteFlag("");
+                UpdateWrapper<SysPosition> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("code", sysPosition.getCode());
+                sysPositionMapper.update(sysPosition, updateWrapper);
+
+            }else{
+                SysPosition position=new SysPosition();
+
+                position.setId(String.valueOf(collegePosition.getPostId()));
+                position.setCode(collegePosition.getPostCode());
+                position.setName(collegePosition.getPostName());
+                position.setSortCode(collegePosition.getPostSort());
+                position.setOrgId(String.valueOf(collegePosition.getDeptId()));
+                position.setStatus(collegePosition.getStatus());
+                position.setRemark(collegePosition.getRemark());
+                position.setCreateTime(new Date());
+                position.setDeleteFlag("NOT_DELETE");
+
+                sysPositionMapper.insert(position);
+            }
+
+            log.info("用户岗位数据下发成功:{}", JSON.toJSONString(collegePositionAddParam));
+            log.info("用户岗位数据下发成功,下发条数:{}",count);
+        } catch (Exception e) {
+            String info=JSON.toJSONString(collegePositionAddParam);
+            CollegePosition collegePosition = BeanUtil.toBean(collegePositionAddParam, CollegePosition.class);
+            collegePosition.setCreateTime(new Date());
+            collegePosition.setIssue("0");
+            collegePosition.setReason(e.getMessage());
+            collegePosition.setInfo(info);
+            throw new RuntimeException("用户岗位数据下发失败:==========================>"+e.getMessage());
         }
 
-        log.info("用户岗位数据下发成功:{}", JSON.toJSONString(collegePositionAddParam));
-        log.info("用户岗位数据下发成功,下发条数:{}",count);
-
     }
 
     @Transactional(rollbackFor = Exception.class)

+ 98 - 72
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CollegeUserServiceImpl.java

@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
@@ -42,6 +43,7 @@ import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.disk.domain.CollegeUser;
+import vip.xiaonuo.disk.domain.Dept;
 import vip.xiaonuo.disk.mapper.CollegeUserMapper;
 import vip.xiaonuo.disk.param.collegeUser.CollegeUserAddParam;
 import vip.xiaonuo.disk.param.collegeUser.CollegeUserEditParam;
@@ -108,83 +110,103 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+
     @Override
     public void add(CollegeUserAddParam collegeUserAddParam) {
-        int count = userAddCounter.incrementAndGet();
-        log.info("下发用户数据========================>"+JSON.toJSONString(collegeUserAddParam));
-        //添加用户下发日志表
-        CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
-        collegeUser.setCrateTime(new Date());
-        this.save(collegeUser);
-
-        //根据账号查询用户表是否存在
-        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysUser::getAccount, collegeUser.getUserName());
-        SysUser sysUser=sysUserMapper.selectOne(queryWrapper);
-        //如果用户存在,则进行更新
-        if(ObjectUtil.isNotEmpty(sysUser)){
-
-            sysUser.setOrgId(String.valueOf(collegeUser.getDeptId()));   //组织id
-            sysUser.setPostCode(collegeUser.getPostIds());   //岗位编码
-            sysUser.setAccount(collegeUser.getUserName());   //账号
-            sysUser.setNickname(collegeUser.getNickName());  //昵称
-            sysUser.setEmail(collegeUser.getEmail());    //邮箱
-            sysUser.setPhone(collegeUser.getPhone());    //电话
-            sysUser.setIdCardNumber(collegeUser.getPsptId());  //身份证号
-            sysUser.setEduIdentity("1");      //身份认证
-            if("0".equals(collegeUser.getSex())){    //性别
-                sysUser.setGender("男");
-            }else if("1".equals(collegeUser.getSex())){
-                sysUser.setGender("女");
-            }else{
-                sysUser.setGender("未知");
-            }
-            sysUser.setAvatar(collegeUser.getAvatar());  //头像
-            if("0".equals(collegeUser.getStatus())){
-                sysUser.setUserStatus("ENABLE");
-            }else{
-                sysUser.setUserStatus("DISABLED");
+        try {
+            int count = userAddCounter.incrementAndGet();
+            log.info("下发用户数据========================>"+JSON.toJSONString(collegeUserAddParam));
+            //添加用户下发日志表
+            CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
+            if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
+                String postJson = JSON.toJSONString(collegeUserAddParam.getPost());
+                collegeUser.setPost(postJson);
             }
-            sysUser.setCode(collegeUser.getPersonCode());  //人员编码
-            sysUser.setUserType(collegeUser.getUserType());  //账号类型
-            sysUser.setUpdateTime(new Date());
-
-            UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("account", sysUser.getAccount());
-            sysUserMapper.update(sysUser, updateWrapper);
-        }else{
-            //如果用户存在,进行插入
-            SysUser user =new SysUser();
-            user.setId(IdUtil.getSnowflakeNextIdStr());
-            user.setOrgId(String.valueOf(collegeUser.getDeptId()));
-            user.setPostCode(collegeUser.getPostIds());
-            user.setAccount(collegeUser.getUserName());
-            user.setNickname(collegeUser.getNickName());
-            user.setEmail(collegeUser.getEmail());
-            user.setPhone(collegeUser.getPhone());
-            user.setIdCardNumber(collegeUser.getPsptId());
-            user.setEduIdentity("1");
-            if("0".equals(collegeUser.getSex())){
-                user.setGender("男");
-            }else if("1".equals(collegeUser.getSex())){
-                user.setGender("女");
+            collegeUser.setCrateTime(new Date());
+            collegeUser.setIssue("1");
+            collegeUser.setInfo(JSON.toJSONString(collegeUserAddParam));
+            this.save(collegeUser);
+
+            //根据账号查询用户表是否存在
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(SysUser::getAccount, collegeUser.getUserName());
+            SysUser sysUser=sysUserMapper.selectOne(queryWrapper);
+            //如果用户存在,则进行更新
+            if(ObjectUtil.isNotEmpty(sysUser)){
+                if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
+                    @NotNull List<String> depIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
+                    String result = String.join(",", depIds);
+                    sysUser.setOrgId(result);   //组织id
+                }
+
+                sysUser.setUserCode(collegeUser.getUserCode());   //岗位编码
+                sysUser.setAccount(collegeUser.getUserName());   //账号
+                sysUser.setName(collegeUser.getCallName());  //昵称
+                sysUser.setEmail(collegeUser.getEmail());    //邮箱
+                sysUser.setPhone(collegeUser.getMobile());    //电话
+                sysUser.setEduIdentity("1");      //身份认证
+                sysUser.setPassword("123456");
+                if("0".equals(collegeUser.getSex())){    //性别
+                    sysUser.setGender("男");
+                }else if("1".equals(collegeUser.getSex())){
+                    sysUser.setGender("女");
+                }else{
+                    sysUser.setGender("未知");
+                }
+
+                if("0".equals(collegeUser.getStatus())){
+                    sysUser.setUserStatus("ENABLE");
+                }else{
+                    sysUser.setUserStatus("DISABLED");
+                }
+                sysUser.setUpdateTime(new Date());
+                UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("account", sysUser.getAccount());
+                sysUserMapper.update(sysUser, updateWrapper);
             }else{
-                user.setGender("未知");
+                //如果用户存在,进行插入
+                SysUser user =new SysUser();
+                user.setId(IdUtil.getSnowflakeNextIdStr());
+
+                if(CollectionUtil.isNotEmpty(collegeUserAddParam.getPost())){
+                    @NotNull List<String> depIds = collegeUserAddParam.getPost().stream().map(Dept::getDeptId).collect(Collectors.toList());
+                    String result = String.join(",", depIds);
+                    user.setOrgId(result);   //组织id
+                }
+                user.setUserCode(collegeUser.getUserCode());
+                user.setAccount(collegeUser.getUserName());
+                user.setName(collegeUser.getCallName());
+                user.setEmail(collegeUser.getEmail());
+                user.setPhone(collegeUser.getMobile());
+                user.setPassword("123456");
+                user.setEduIdentity("1");
+                if("0".equals(collegeUser.getSex())){
+                    user.setGender("男");
+                }else if("1".equals(collegeUser.getSex())){
+                    user.setGender("女");
+                }else{
+                    user.setGender("未知");
+                }
+
+                if("0".equals(collegeUser.getStatus())){
+                   user.setUserStatus("ENABLE");
+                }else{
+                   user.setUserStatus("DISABLED");
+                }
+                user.setCreateTime(new Date());
+                sysUserMapper.insert(user);
             }
-            user.setAvatar(collegeUser.getAvatar());
-            if("0".equals(collegeUser.getStatus())){
-               user.setUserStatus("ENABLE");
-            }else{
-               user.setUserStatus("DISABLED");
-            }
-            user.setCode(collegeUser.getPersonCode());
-            user.setUserType(collegeUser.getUserType());
-            user.setCreateTime(new Date());
-            sysUserMapper.insert(user);
+            log.info("用户数据下发成功:{}", JSON.toJSONString(collegeUserAddParam));
+            log.info("用户数据下发成功,下发条数:{}",count);
+        } catch (Exception e) {
+            CollegeUser collegeUser = BeanUtil.toBean(collegeUserAddParam, CollegeUser.class);
+            collegeUser.setCrateTime(new Date());
+            collegeUser.setIssue("0");
+            collegeUser.setReason(e.getMessage());
+            collegeUser.setInfo(JSON.toJSONString(collegeUserAddParam));
+            this.save(collegeUser);
+            throw new RuntimeException("用户数据下发失败=============================>"+e.getMessage());
         }
-        log.info("用户数据下发成功:{}", JSON.toJSONString(collegeUserAddParam));
-        log.info("用户数据下发成功,下发条数:{}",count);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -249,7 +271,7 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
         paramUser.put("token",token);
         paramUser.put("key",key);
         paramUser.put("secret",secret);
-        String userUrl = ssoUrl+"/resourcesb/resources/index";
+        String userUrl = ssoUrl+"/oauth2/resources/index";
 
         log.info("根据token获取用户信息请求参数============"+paramUser.toString());
 
@@ -257,6 +279,10 @@ public class CollegeUserServiceImpl extends ServiceImpl<CollegeUserMapper, Colle
         String rs = HttpRequest.sendPost(userUrl, paramUser.toString());
         JSONObject userRs = JSONObject.parseObject(rs);
 
+        log.info("根据token获取用户信息结果============"+userRs.toString());
+
+
+
         JSONObject user=userRs.getJSONObject("data");
         String account=user.getString("iamUserCode");
 //        String account="";

+ 5 - 5
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/admin/TExamController.java

@@ -61,7 +61,7 @@ public class TExamController extends BaseApiController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("作业名称")
-    @SaCheckPermission("/api/admin/t_exam/page")
+    //@SaCheckPermission("/api/admin/t_exam/page")
     @GetMapping("/page")
     public CommonResult<Page<TExamVo>> page(TExamPageParam tExamPageParam) {
         return CommonResult.data(tExamService.page(tExamPageParam));
@@ -76,7 +76,7 @@ public class TExamController extends BaseApiController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加作业")
     @CommonLog("添加考试表")
-    @SaCheckPermission("/api/admin/t_exam/add")
+    //@SaCheckPermission("/api/admin/t_exam/add")
     @PostMapping("/add")
     public CommonResult<String> add(@RequestBody @Valid TExamAddParam tExamAddParam) {
 
@@ -92,7 +92,7 @@ public class TExamController extends BaseApiController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("修改作业")
     @CommonLog("编辑考试表")
-    @SaCheckPermission("/api/admin/t_exam/edit")
+    //@SaCheckPermission("/api/admin/t_exam/edit")
     @PostMapping("/edit")
     public CommonResult<String> edit(@RequestBody @Valid TExamEditParam tExamEditParam) {
 
@@ -108,7 +108,7 @@ public class TExamController extends BaseApiController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除作业")
     @CommonLog("删除考试表")
-    @SaCheckPermission("/api/admin/t_exam/delete")
+    //@SaCheckPermission("/api/admin/t_exam/delete")
     @PostMapping("/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<TExamIdParam> tExamIdParamList) {
@@ -124,7 +124,7 @@ public class TExamController extends BaseApiController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("作业详情")
-    @SaCheckPermission("/api/admin/t_exam/detail")
+    //@SaCheckPermission("/api/admin/t_exam/detail")
     @GetMapping("/detail")
     public CommonResult<TExamVo> detail(@Valid TExamIdParam tExamIdParam) {
         return CommonResult.data(tExamService.detail(tExamIdParam));

+ 2 - 2
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/TExamController.java

@@ -56,7 +56,7 @@ public class TExamController extends BaseApiController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("每个错题的错误选项与对应发生的比例")
-    @SaCheckPermission("/api/admin/s_exam/page")
+    //@SaCheckPermission("/api/admin/s_exam/page")
     @GetMapping("/page")
     public CommonResult<Page<TExamVo>> page(TExamPageParam tExamPageParam) {
         return CommonResult.data(tExamService.studentPage(tExamPageParam));
@@ -70,7 +70,7 @@ public class TExamController extends BaseApiController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("班级人均完成比例")
-    @SaCheckPermission("/api/admin/s_exam/detail")
+    //@SaCheckPermission("/api/admin/s_exam/detail")
     @GetMapping("/detail")
     public CommonResult<TExamVo> detail(@Valid TExamIdParam tExamIdParam) {
         return CommonResult.data(tExamService.detail(tExamIdParam));

+ 18 - 18
snowy-plugin/snowy-plugin-flw/snowy-plugin-flw-func/src/main/java/vip/xiaonuo/flw/modular/process/controller/FlwProcessMonitorController.java

@@ -59,7 +59,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取所有流程分页")
-    @SaCheckPermission("/flw/process/monitor/monitorPage")
+    //@SaCheckPermission("/flw/process/monitor/monitorPage")
     @GetMapping("/flw/process/monitor/monitorPage")
     public CommonResult<Page<FlwProcessResult>> monitorPage(FlwProcessMonitorPageParam flwProcessMonitorPageParam) {
         return CommonResult.data(flwProcessService.monitorPage(flwProcessMonitorPageParam));
@@ -74,7 +74,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("删除流程")
     @CommonLog("删除流程")
-    @SaCheckPermission("/flw/process/monitor/delete")
+    //@SaCheckPermission("/flw/process/monitor/delete")
     @PostMapping("/flw/process/monitor/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<FlwProcessIdParam> flwProcessIdParamList) {
@@ -91,7 +91,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("终止流程")
     @CommonLog("终止流程")
-    @SaCheckPermission("/flw/process/monitor/end")
+    //@SaCheckPermission("/flw/process/monitor/end")
     @PostMapping("/flw/process/monitor/end")
     public CommonResult<String> end(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                CommonValidList<FlwProcessIdParam> flwProcessIdParamList) {
@@ -108,7 +108,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("撤回流程")
     @CommonLog("撤回流程")
-    @SaCheckPermission("/flw/process/monitor/revoke")
+    //@SaCheckPermission("/flw/process/monitor/revoke")
     @PostMapping("/flw/process/monitor/revoke")
     public CommonResult<String> revoke(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                             CommonValidList<FlwProcessIdParam> flwProcessIdParamList) {
@@ -125,7 +125,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 5)
     @ApiOperation("挂起流程")
     @CommonLog("挂起流程")
-    @SaCheckPermission("/flw/process/monitor/suspend")
+    //@SaCheckPermission("/flw/process/monitor/suspend")
     @PostMapping("/flw/process/monitor/suspend")
     public CommonResult<String> suspend(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                CommonValidList<FlwProcessIdParam> flwProcessIdParamList) {
@@ -142,7 +142,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 6)
     @ApiOperation("激活流程")
     @CommonLog("激活流程")
-    @SaCheckPermission("/flw/process/monitor/active")
+    //@SaCheckPermission("/flw/process/monitor/active")
     @PostMapping("/flw/process/monitor/active")
     public CommonResult<String> active(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                 CommonValidList<FlwProcessIdParam> flwProcessIdParamList) {
@@ -159,7 +159,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 7)
     @ApiOperation("转办流程")
     @CommonLog("转办流程")
-    @SaCheckPermission("/flw/process/monitor/turn")
+    //@SaCheckPermission("/flw/process/monitor/turn")
     @PostMapping("/flw/process/monitor/turn")
     public CommonResult<String> turn(@RequestBody @Valid FlwProcessTurnParam flwProcessTurnParam) {
         flwProcessService.turn(flwProcessTurnParam);
@@ -175,7 +175,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 7)
     @ApiOperation("跳转流程")
     @CommonLog("跳转流程")
-    @SaCheckPermission("/flw/process/monitor/jump")
+    //@SaCheckPermission("/flw/process/monitor/jump")
     @PostMapping("/flw/process/monitor/jump")
     public CommonResult<String> jump(@RequestBody @Valid FlwProcessJumpParam flwProcessJumpParam) {
         flwProcessService.jump(flwProcessJumpParam);
@@ -191,7 +191,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 8)
     @ApiOperation("复活流程")
     @CommonLog("复活流程")
-    @SaCheckPermission("/flw/process/monitor/restart")
+    //@SaCheckPermission("/flw/process/monitor/restart")
     @PostMapping("/flw/process/monitor/restart")
     public CommonResult<String> restart(@RequestBody @Valid FlwProcessRestartParam flwProcessRestartParam) {
         flwProcessService.restart(flwProcessRestartParam);
@@ -207,7 +207,7 @@ public class FlwProcessMonitorController {
     @ApiOperationSupport(order = 9)
     @ApiOperation("迁移流程")
     @CommonLog("迁移流程")
-    @SaCheckPermission("/flw/process/monitor/migrate")
+    //@SaCheckPermission("/flw/process/monitor/migrate")
     @PostMapping("/flw/process/monitor/migrate")
     public CommonResult<String> migrate(@RequestBody @Valid FlwProcessMigrateParam flwProcessMigrateParam) {
         flwProcessService.migrate(flwProcessMigrateParam);
@@ -222,7 +222,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 10)
     @ApiOperation("获取流程变量分页")
-    @SaCheckPermission("/flw/process/monitor/variablePage")
+    //@SaCheckPermission("/flw/process/monitor/variablePage")
     @GetMapping("/flw/process/monitor/variablePage")
     public CommonResult<Page<FlwProcessVariableResult>> variablePage(@Valid FlwProcessIdParam flwProcessIdParam) {
         return CommonResult.data(flwProcessService.variablePage(flwProcessIdParam));
@@ -236,7 +236,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 11)
     @ApiOperation("批量编辑流程变量")
-    @SaCheckPermission("/flw/process/monitor/variableUpdateBatch")
+    //@SaCheckPermission("/flw/process/monitor/variableUpdateBatch")
     @PostMapping("/flw/process/monitor/variableUpdateBatch")
     public CommonResult<String> variableUpdateBatch(@RequestBody @Valid FlwProcessVariableUpdateParam flwProcessVariableUpdateParam) {
         flwProcessService.variableUpdateBatch(flwProcessVariableUpdateParam);
@@ -251,7 +251,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 12)
     @ApiOperation("获取流程详情")
-    @SaCheckPermission("/flw/process/monitor/detail")
+    //@SaCheckPermission("/flw/process/monitor/detail")
     @GetMapping("/flw/process/monitor/detail")
     public CommonResult<FlwProcessDetailResult> detail(@Valid FlwProcessIdParam flwProcessIdParam) {
         return CommonResult.data(flwProcessService.detail(flwProcessIdParam));
@@ -265,7 +265,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 13)
     @ApiOperation("获取可跳转节点列表")
-    @SaCheckPermission("/flw/process/monitor/getCanJumpNodeInfoList")
+    //@SaCheckPermission("/flw/process/monitor/getCanJumpNodeInfoList")
     @GetMapping("/flw/process/monitor/getCanJumpNodeInfoList")
     public CommonResult<List<FlwProcessJumpNodeResult>> getCanJumpNodeInfoList(@Valid FlwProcessIdParam flwProcessIdParam) {
         return CommonResult.data(flwProcessService.getCanJumpNodeInfoList(flwProcessIdParam));
@@ -279,7 +279,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 14)
     @ApiOperation("获取可复活到节点列表")
-    @SaCheckPermission("/flw/process/monitor/getCanRestartNodeInfoList")
+    //@SaCheckPermission("/flw/process/monitor/getCanRestartNodeInfoList")
     @GetMapping("/flw/process/monitor/getCanRestartNodeInfoList")
     public CommonResult<List<FlwProcessRestartNodeResult>> getCanRestartNodeInfoList(@Valid FlwProcessIdParam flwProcessIdParam) {
         return CommonResult.data(flwProcessService.getCanRestartNodeInfoList(flwProcessIdParam));
@@ -293,7 +293,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 15)
     @ApiOperation("获取可迁移到节点列表")
-    @SaCheckPermission("/flw/process/monitor/getCanMigrateNodeInfoList")
+    //@SaCheckPermission("/flw/process/monitor/getCanMigrateNodeInfoList")
     @GetMapping("/flw/process/monitor/getCanMigrateNodeInfoList")
     public CommonResult<List<FlwProcessRestartNodeResult>> getCanMigrateNodeInfoList(@Valid FlwProcessIdParam flwProcessIdParam) {
         return CommonResult.data(flwProcessService.getCanMigrateNodeInfoList(flwProcessIdParam));
@@ -307,7 +307,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 16)
     @ApiOperation("获取组织树选择器")
-    @SaCheckPermission("/flw/process/monitor/orgTreeSelector")
+    //@SaCheckPermission("/flw/process/monitor/orgTreeSelector")
     @GetMapping("/flw/process/monitor/orgTreeSelector")
     public CommonResult<List<Tree<String>>> orgTreeSelector() {
         return CommonResult.data(flwProcessService.orgTreeSelector());
@@ -321,7 +321,7 @@ public class FlwProcessMonitorController {
      */
     @ApiOperationSupport(order = 17)
     @ApiOperation("获取用户选择器")
-    @SaCheckPermission("/flw/process/monitor/userSelector")
+    //@SaCheckPermission("/flw/process/monitor/userSelector")
     @GetMapping("/flw/process/monitor/userSelector")
     public CommonResult<Page<FlwProcessUserResult>> userSelector(FlwProcessSelectorUserParam flwProcessSelectorUserParam) {
         return CommonResult.data(flwProcessService.userSelector(flwProcessSelectorUserParam));

+ 5 - 5
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/chapterDiscussion/controller/ForumChapterDiscussionController.java

@@ -60,7 +60,7 @@ public class ForumChapterDiscussionController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取论坛-章节讨论表分页")
-    @SaCheckPermission("/forum/chapterDiscussion/page")
+    //@SaCheckPermission("/forum/chapterDiscussion/page")
     @GetMapping("/forum/chapterDiscussion/page")
     public CommonResult<Page<ForumChapterDiscussion>> page(ForumChapterDiscussionPageParam forumChapterDiscussionPageParam) {
         return CommonResult.data(forumChapterDiscussionService.page(forumChapterDiscussionPageParam));
@@ -75,7 +75,7 @@ public class ForumChapterDiscussionController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加论坛-章节讨论表")
     @CommonLog("添加论坛-章节讨论表")
-    @SaCheckPermission("/forum/chapterDiscussion/add")
+    //@SaCheckPermission("/forum/chapterDiscussion/add")
     @PostMapping("/forum/chapterDiscussion/add")
     public CommonResult<String> add(@RequestBody @Valid ForumChapterDiscussionAddParam forumChapterDiscussionAddParam) {
         forumChapterDiscussionService.add(forumChapterDiscussionAddParam);
@@ -91,7 +91,7 @@ public class ForumChapterDiscussionController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑论坛-章节讨论表")
     @CommonLog("编辑论坛-章节讨论表")
-    @SaCheckPermission("/forum/chapterDiscussion/edit")
+    //@SaCheckPermission("/forum/chapterDiscussion/edit")
     @PostMapping("/forum/chapterDiscussion/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumChapterDiscussionEditParam forumChapterDiscussionEditParam) {
         forumChapterDiscussionService.edit(forumChapterDiscussionEditParam);
@@ -107,7 +107,7 @@ public class ForumChapterDiscussionController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除论坛-章节讨论表")
     @CommonLog("删除论坛-章节讨论表")
-    @SaCheckPermission("/forum/chapterDiscussion/delete")
+    //@SaCheckPermission("/forum/chapterDiscussion/delete")
     @PostMapping("/forum/chapterDiscussion/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                        CommonValidList<ForumChapterDiscussionIdParam> forumChapterDiscussionIdParamList) {
@@ -123,7 +123,7 @@ public class ForumChapterDiscussionController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取论坛-章节讨论表详情")
-    @SaCheckPermission("/forum/chapterDiscussion/detail")
+    //@SaCheckPermission("/forum/chapterDiscussion/detail")
     @GetMapping("/forum/chapterDiscussion/detail")
     public CommonResult<ForumChapterDiscussion> detail(@Valid ForumChapterDiscussionIdParam forumChapterDiscussionIdParam) {
         return CommonResult.data(forumChapterDiscussionService.detail(forumChapterDiscussionIdParam));

+ 5 - 5
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/contentcorrection/controller/ForumContentCorrectionController.java

@@ -60,7 +60,7 @@ public class ForumContentCorrectionController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取内容纠错表分页")
-//    @SaCheckPermission("/forum/contentcorrection/page")
+//    //@SaCheckPermission("/forum/contentcorrection/page")
     @GetMapping("/forum/contentcorrection/page")
     public CommonResult<Page<ForumContentCorrection>> page(ForumContentCorrectionPageParam forumContentCorrectionPageParam) {
         return CommonResult.data(forumContentCorrectionService.page(forumContentCorrectionPageParam));
@@ -75,7 +75,7 @@ public class ForumContentCorrectionController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加内容纠错表")
     @CommonLog("添加内容纠错表")
-//    @SaCheckPermission("/forum/contentcorrection/add")
+//    //@SaCheckPermission("/forum/contentcorrection/add")
     @PostMapping("/forum/contentcorrection/add")
     public CommonResult<String> add(@RequestBody @Valid ForumContentCorrectionAddParam forumContentCorrectionAddParam) {
         forumContentCorrectionService.add(forumContentCorrectionAddParam);
@@ -91,7 +91,7 @@ public class ForumContentCorrectionController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑内容纠错表")
     @CommonLog("编辑内容纠错表")
-//    @SaCheckPermission("/forum/contentcorrection/edit")
+//    //@SaCheckPermission("/forum/contentcorrection/edit")
     @PostMapping("/forum/contentcorrection/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumContentCorrectionEditParam forumContentCorrectionEditParam) {
         forumContentCorrectionService.edit(forumContentCorrectionEditParam);
@@ -107,7 +107,7 @@ public class ForumContentCorrectionController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除内容纠错表")
     @CommonLog("删除内容纠错表")
-//    @SaCheckPermission("/forum/contentcorrection/delete")
+//    //@SaCheckPermission("/forum/contentcorrection/delete")
     @PostMapping("/forum/contentcorrection/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumContentCorrectionIdParam> forumContentCorrectionIdParamList) {
@@ -123,7 +123,7 @@ public class ForumContentCorrectionController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取内容纠错表详情")
-//    @SaCheckPermission("/forum/contentcorrection/detail")
+//    //@SaCheckPermission("/forum/contentcorrection/detail")
     @GetMapping("/forum/contentcorrection/detail")
     public CommonResult<ForumContentCorrection> detail(@Valid ForumContentCorrectionIdParam forumContentCorrectionIdParam) {
         return CommonResult.data(forumContentCorrectionService.detail(forumContentCorrectionIdParam));

+ 1 - 1
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postinfo/controller/ForumPostInfoController.java

@@ -135,7 +135,7 @@ public class ForumPostInfoController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除帖子信息表")
     @CommonLog("删除帖子信息表")
-//    @SaCheckPermission("/forum/postinfo/delete")
+//    //@SaCheckPermission("/forum/postinfo/delete")
     @PostMapping("/forum/postinfo/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumPostInfoIdParam> forumPostInfoIdParamList) {

+ 4 - 4
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postlike/controller/ForumPostLikeController.java

@@ -57,7 +57,7 @@ public class ForumPostLikeController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取点赞记录表分页")
-//    @SaCheckPermission("/forum/postlike/page")
+//    //@SaCheckPermission("/forum/postlike/page")
     @GetMapping("/forum/postlike/page")
     public CommonResult<Page<ForumPostLike>> page(ForumPostLikePageParam forumPostLikePageParam) {
         return CommonResult.data(forumPostLikeService.page(forumPostLikePageParam));
@@ -97,7 +97,7 @@ public class ForumPostLikeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑点赞记录表")
     @CommonLog("编辑点赞记录表")
-//    @SaCheckPermission("/forum/postlike/edit")
+//    //@SaCheckPermission("/forum/postlike/edit")
     @PostMapping("/forum/postlike/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumPostLikeEditParam forumPostLikeEditParam) {
         forumPostLikeService.edit(forumPostLikeEditParam);
@@ -113,7 +113,7 @@ public class ForumPostLikeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除点赞记录表")
     @CommonLog("删除点赞记录表")
-//    @SaCheckPermission("/forum/postlike/delete")
+//    //@SaCheckPermission("/forum/postlike/delete")
     @PostMapping("/forum/postlike/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumPostLikeIdParam> forumPostLikeIdParamList) {
@@ -129,7 +129,7 @@ public class ForumPostLikeController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取点赞记录表详情")
-//    @SaCheckPermission("/forum/postlike/detail")
+//    //@SaCheckPermission("/forum/postlike/detail")
     @GetMapping("/forum/postlike/detail")
     public CommonResult<ForumPostLike> detail(@Valid ForumPostLikeIdParam forumPostLikeIdParam) {
         return CommonResult.data(forumPostLikeService.detail(forumPostLikeIdParam));

+ 4 - 4
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postnotlike/controller/ForumPostNotLikeController.java

@@ -60,7 +60,7 @@ public class ForumPostNotLikeController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取论坛-点踩记录表分页")
-    @SaCheckPermission("/forum/postnotlike/page")
+    //@SaCheckPermission("/forum/postnotlike/page")
     @GetMapping("/forum/postnotlike/page")
     public CommonResult<Page<ForumPostNotLike>> page(ForumPostNotLikePageParam forumPostNotLikePageParam) {
         return CommonResult.data(forumPostNotLikeService.page(forumPostNotLikePageParam));
@@ -103,7 +103,7 @@ public class ForumPostNotLikeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑论坛-点踩记录表")
     @CommonLog("编辑论坛-点踩记录表")
-    @SaCheckPermission("/forum/postnotlike/edit")
+    //@SaCheckPermission("/forum/postnotlike/edit")
     @PostMapping("/forum/postnotlike/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumPostNotLikeEditParam forumPostNotLikeEditParam) {
         forumPostNotLikeService.edit(forumPostNotLikeEditParam);
@@ -119,7 +119,7 @@ public class ForumPostNotLikeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除论坛-点踩记录表")
     @CommonLog("删除论坛-点踩记录表")
-    @SaCheckPermission("/forum/postnotlike/delete")
+    //@SaCheckPermission("/forum/postnotlike/delete")
     @PostMapping("/forum/postnotlike/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumPostNotLikeIdParam> forumPostNotLikeIdParamList) {
@@ -135,7 +135,7 @@ public class ForumPostNotLikeController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取论坛-点踩记录表详情")
-    @SaCheckPermission("/forum/postnotlike/detail")
+    //@SaCheckPermission("/forum/postnotlike/detail")
     @GetMapping("/forum/postnotlike/detail")
     public CommonResult<ForumPostNotLike> detail(@Valid ForumPostNotLikeIdParam forumPostNotLikeIdParam) {
         return CommonResult.data(forumPostNotLikeService.detail(forumPostNotLikeIdParam));

+ 2 - 2
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/postreply/controller/ForumPostReplyController.java

@@ -60,7 +60,7 @@ public class ForumPostReplyController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取帖子回复表分页")
-//    @SaCheckPermission("/forum/postreply/page")
+//    //@SaCheckPermission("/forum/postreply/page")
     @GetMapping("/forum/postreply/page")
     public CommonResult<Page<ForumPostReply>> page(ForumPostReplyPageParam forumPostReplyPageParam) {
         return CommonResult.data(forumPostReplyService.page(forumPostReplyPageParam));
@@ -117,7 +117,7 @@ public class ForumPostReplyController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取帖子回复表详情")
-//    @SaCheckPermission("/forum/postreply/detail")
+//    //@SaCheckPermission("/forum/postreply/detail")
     @GetMapping("/forum/postreply/detail")
     public CommonResult<ForumPostReply> detail(@Valid ForumPostReplyIdParam forumPostReplyIdParam) {
         return CommonResult.data(forumPostReplyService.detail(forumPostReplyIdParam));

+ 5 - 5
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/posttype/controller/ForumPostTypeController.java

@@ -61,7 +61,7 @@ public class ForumPostTypeController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取帖子分类表分页")
-//    @SaCheckPermission("/forum/posttype/page")
+//    //@SaCheckPermission("/forum/posttype/page")
     @GetMapping("/forum/posttype/page")
     public CommonResult<Page<ForumPostType>> page(ForumPostTypePageParam forumPostTypePageParam) {
         return CommonResult.data(forumPostTypeService.page(forumPostTypePageParam));
@@ -76,7 +76,7 @@ public class ForumPostTypeController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加帖子分类表")
     @CommonLog("添加帖子分类表")
-//    @SaCheckPermission("/forum/posttype/add")
+//    //@SaCheckPermission("/forum/posttype/add")
     @PostMapping("/forum/posttype/add")
     public CommonResult<String> add(@RequestBody @Valid ForumPostTypeAddParam forumPostTypeAddParam) {
         forumPostTypeService.add(forumPostTypeAddParam);
@@ -92,7 +92,7 @@ public class ForumPostTypeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑帖子分类表")
     @CommonLog("编辑帖子分类表")
-//    @SaCheckPermission("/forum/posttype/edit")
+//    //@SaCheckPermission("/forum/posttype/edit")
     @PostMapping("/forum/posttype/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumPostTypeEditParam forumPostTypeEditParam) {
         forumPostTypeService.edit(forumPostTypeEditParam);
@@ -108,7 +108,7 @@ public class ForumPostTypeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除帖子分类表")
     @CommonLog("删除帖子分类表")
-    @SaCheckPermission("/forum/posttype/delete")
+    //@SaCheckPermission("/forum/posttype/delete")
     @PostMapping("/forum/posttype/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumPostTypeIdParam> forumPostTypeIdParamList) {
@@ -124,7 +124,7 @@ public class ForumPostTypeController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取帖子分类表详情")
-//    @SaCheckPermission("/forum/posttype/detail")
+//    //@SaCheckPermission("/forum/posttype/detail")
     @GetMapping("/forum/posttype/detail")
     public CommonResult<ForumPostType> detail(@Valid ForumPostTypeIdParam forumPostTypeIdParam) {
         return CommonResult.data(forumPostTypeService.detail(forumPostTypeIdParam));

+ 4 - 4
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/reportinfo/controller/ForumReportInfoController.java

@@ -60,7 +60,7 @@ public class ForumReportInfoController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取论坛-帖子举报信息表分页")
-//    @SaCheckPermission("/forum/reportinfo/page")
+//    //@SaCheckPermission("/forum/reportinfo/page")
     @GetMapping("/forum/reportinfo/page")
     public CommonResult<Page<ForumReportInfo>> page(ForumReportInfoPageParam forumReportInfoPageParam) {
         return CommonResult.data(forumReportInfoService.page(forumReportInfoPageParam));
@@ -97,7 +97,7 @@ public class ForumReportInfoController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑论坛-帖子举报信息表")
     @CommonLog("编辑论坛-帖子举报信息表")
-//    @SaCheckPermission("/forum/reportinfo/edit")
+//    //@SaCheckPermission("/forum/reportinfo/edit")
     @PostMapping("/forum/reportinfo/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumReportInfoEditParam forumReportInfoEditParam) {
         forumReportInfoService.edit(forumReportInfoEditParam);
@@ -113,7 +113,7 @@ public class ForumReportInfoController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除论坛-帖子举报信息表")
     @CommonLog("删除论坛-帖子举报信息表")
-//    @SaCheckPermission("/forum/reportinfo/delete")
+//    //@SaCheckPermission("/forum/reportinfo/delete")
     @PostMapping("/forum/reportinfo/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumReportInfoIdParam> forumReportInfoIdParamList) {
@@ -129,7 +129,7 @@ public class ForumReportInfoController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取论坛-帖子举报信息表详情")
-//    @SaCheckPermission("/forum/reportinfo/detail")
+//    //@SaCheckPermission("/forum/reportinfo/detail")
     @GetMapping("/forum/reportinfo/detail")
     public CommonResult<ForumReportInfo> detail(@Valid ForumReportInfoIdParam forumReportInfoIdParam) {
         return CommonResult.data(forumReportInfoService.detail(forumReportInfoIdParam));

+ 5 - 5
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/sensitivity/controller/ForumSensitivityController.java

@@ -60,7 +60,7 @@ public class ForumSensitivityController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取论坛-敏感词分页")
-//    @SaCheckPermission("/forum/sensitivity/page")
+//    //@SaCheckPermission("/forum/sensitivity/page")
     @GetMapping("/forum/sensitivity/page")
     public CommonResult<Page<ForumSensitivity>> page(ForumSensitivityPageParam forumSensitivityPageParam) {
         return CommonResult.data(forumSensitivityService.page(forumSensitivityPageParam));
@@ -75,7 +75,7 @@ public class ForumSensitivityController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加论坛-敏感词")
     @CommonLog("添加论坛-敏感词")
-//    @SaCheckPermission("/forum/sensitivity/add")
+//    //@SaCheckPermission("/forum/sensitivity/add")
     @PostMapping("/forum/sensitivity/add")
     public CommonResult<String> add(@RequestBody @Valid ForumSensitivityAddParam forumSensitivityAddParam) {
         forumSensitivityService.add(forumSensitivityAddParam);
@@ -91,7 +91,7 @@ public class ForumSensitivityController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑论坛-敏感词")
     @CommonLog("编辑论坛-敏感词")
-//    @SaCheckPermission("/forum/sensitivity/edit")
+//    //@SaCheckPermission("/forum/sensitivity/edit")
     @PostMapping("/forum/sensitivity/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumSensitivityEditParam forumSensitivityEditParam) {
         forumSensitivityService.edit(forumSensitivityEditParam);
@@ -107,7 +107,7 @@ public class ForumSensitivityController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除论坛-敏感词")
     @CommonLog("删除论坛-敏感词")
-//    @SaCheckPermission("/forum/sensitivity/delete")
+//    //@SaCheckPermission("/forum/sensitivity/delete")
     @PostMapping("/forum/sensitivity/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumSensitivityIdParam> forumSensitivityIdParamList) {
@@ -123,7 +123,7 @@ public class ForumSensitivityController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取论坛-敏感词详情")
-//    @SaCheckPermission("/forum/sensitivity/detail")
+//    //@SaCheckPermission("/forum/sensitivity/detail")
     @GetMapping("/forum/sensitivity/detail")
     public CommonResult<ForumSensitivity> detail(@Valid ForumSensitivityIdParam forumSensitivityIdParam) {
         return CommonResult.data(forumSensitivityService.detail(forumSensitivityIdParam));

+ 5 - 5
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/sensitivityrecord/controller/ForumSensitivityRecordController.java

@@ -60,7 +60,7 @@ public class ForumSensitivityRecordController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取敏感词过滤记录分页")
-//    @SaCheckPermission("/forum/sensitivityrecord/page")
+//    //@SaCheckPermission("/forum/sensitivityrecord/page")
     @GetMapping("/forum/sensitivityrecord/page")
     public CommonResult<Page<ForumSensitivityRecord>> page(ForumSensitivityRecordPageParam forumSensitivityRecordPageParam) {
         return CommonResult.data(forumSensitivityRecordService.page(forumSensitivityRecordPageParam));
@@ -75,7 +75,7 @@ public class ForumSensitivityRecordController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加敏感词过滤记录")
     @CommonLog("添加敏感词过滤记录")
-//    @SaCheckPermission("/forum/sensitivityrecord/add")
+//    //@SaCheckPermission("/forum/sensitivityrecord/add")
     @PostMapping("/forum/sensitivityrecord/add")
     public CommonResult<String> add(@RequestBody @Valid ForumSensitivityRecordAddParam forumSensitivityRecordAddParam) {
         forumSensitivityRecordService.add(forumSensitivityRecordAddParam);
@@ -91,7 +91,7 @@ public class ForumSensitivityRecordController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑敏感词过滤记录")
     @CommonLog("编辑敏感词过滤记录")
-//    @SaCheckPermission("/forum/sensitivityrecord/edit")
+//    //@SaCheckPermission("/forum/sensitivityrecord/edit")
     @PostMapping("/forum/sensitivityrecord/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumSensitivityRecordEditParam forumSensitivityRecordEditParam) {
         forumSensitivityRecordService.edit(forumSensitivityRecordEditParam);
@@ -107,7 +107,7 @@ public class ForumSensitivityRecordController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除敏感词过滤记录")
     @CommonLog("删除敏感词过滤记录")
-//    @SaCheckPermission("/forum/sensitivityrecord/delete")
+//    //@SaCheckPermission("/forum/sensitivityrecord/delete")
     @PostMapping("/forum/sensitivityrecord/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumSensitivityRecordIdParam> forumSensitivityRecordIdParamList) {
@@ -123,7 +123,7 @@ public class ForumSensitivityRecordController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取敏感词过滤记录详情")
-//    @SaCheckPermission("/forum/sensitivityrecord/detail")
+//    //@SaCheckPermission("/forum/sensitivityrecord/detail")
     @GetMapping("/forum/sensitivityrecord/detail")
     public CommonResult<ForumSensitivityRecord> detail(@Valid ForumSensitivityRecordIdParam forumSensitivityRecordIdParam) {
         return CommonResult.data(forumSensitivityRecordService.detail(forumSensitivityRecordIdParam));

+ 5 - 5
snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/supportenv/controller/ForumSupportEnvController.java

@@ -60,7 +60,7 @@ public class ForumSupportEnvController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取技术支持表分页")
-//    @SaCheckPermission("/forum/supportenv/page")
+//    //@SaCheckPermission("/forum/supportenv/page")
     @GetMapping("/forum/supportenv/page")
     public CommonResult<Page<ForumSupportEnv>> page(ForumSupportEnvPageParam forumSupportEnvPageParam) {
         return CommonResult.data(forumSupportEnvService.page(forumSupportEnvPageParam));
@@ -75,7 +75,7 @@ public class ForumSupportEnvController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加技术支持表")
     @CommonLog("添加技术支持表")
-//    @SaCheckPermission("/forum/supportenv/add")
+//    //@SaCheckPermission("/forum/supportenv/add")
     @PostMapping("/forum/supportenv/add")
     public CommonResult<String> add(@RequestBody @Valid ForumSupportEnvAddParam forumSupportEnvAddParam) {
         forumSupportEnvService.add(forumSupportEnvAddParam);
@@ -91,7 +91,7 @@ public class ForumSupportEnvController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑技术支持表")
     @CommonLog("编辑技术支持表")
-//    @SaCheckPermission("/forum/supportenv/edit")
+//    //@SaCheckPermission("/forum/supportenv/edit")
     @PostMapping("/forum/supportenv/edit")
     public CommonResult<String> edit(@RequestBody @Valid ForumSupportEnvEditParam forumSupportEnvEditParam) {
         forumSupportEnvService.edit(forumSupportEnvEditParam);
@@ -107,7 +107,7 @@ public class ForumSupportEnvController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除技术支持表")
     @CommonLog("删除技术支持表")
-//    @SaCheckPermission("/forum/supportenv/delete")
+//    //@SaCheckPermission("/forum/supportenv/delete")
     @PostMapping("/forum/supportenv/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<ForumSupportEnvIdParam> forumSupportEnvIdParamList) {
@@ -123,7 +123,7 @@ public class ForumSupportEnvController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取技术支持表详情")
-//    @SaCheckPermission("/forum/supportenv/detail")
+//    //@SaCheckPermission("/forum/supportenv/detail")
     @GetMapping("/forum/supportenv/detail")
     public CommonResult<ForumSupportEnv> detail(@Valid ForumSupportEnvIdParam forumSupportEnvIdParam) {
         return CommonResult.data(forumSupportEnvService.detail(forumSupportEnvIdParam));

+ 0 - 6
snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java

@@ -101,11 +101,5 @@ public class SysOrg extends CommonEntity {
     @TableField(exist = false,insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private String propagandizePicPath;
 
-    /** 描述 */
-    private String remark;
-
-    /** 用户组类型("用户组类型 2组织用户组 1自建用户组")*/
-    private String type;
-
 
 }

+ 2 - 6
snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -347,11 +347,7 @@ public class SysUser extends CommonEntity {
     @ApiModelProperty(value = "学届", position = 7)
     private String fallDue;
 
-    /** 人员编码 */
-    private String code;
-
     /** 账号类型 */
-    private String userType;
-    /** 岗位编码 */
-    private String postCode;
+    private String userCode;
+
 }

+ 1 - 3
snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml

@@ -56,9 +56,7 @@
             IFNULL (t1.GRADES_ID,'') AS gradesId,
             IFNULL (gr.grades_name,'') AS gradesIdName,
             IFNULL (t1.STUDENT_NUM ,'') AS studentNum,
-            IFNULL (t1.FALL_DUE  ,'') AS fallDue,
-            t1.code,
-            t1.user_type AS userType
+            IFNULL (t1.FALL_DUE  ,'') AS fallDue
         FROM SYS_USER t1
         LEFT JOIN SYS_ORG co1 ON t1.COLLEGE_ID=co1.id AND co1.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co2 ON t1.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'