wangliang 4 роки тому
батько
коміт
afaeb98338

+ 8 - 8
themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -73,13 +73,13 @@ public class SysController {
             throw new BusinessException(ExceptionResultEnum.LOGIN_NO);
         }
         List<TBPrivilege> tbPrivilegeList = null;
-        if (Objects.nonNull(tbUser.getRemark()) && Objects.equals(tbUser.getRemark(), RoleEnum.SUPER_ADMIN.getCode())) {
-            QueryWrapper<TBPrivilege> wrapper = new QueryWrapper<>();
-            wrapper.lambda().eq(TBPrivilege::getType, SystemConstant.MENU).orderByAsc(TBPrivilege::getParentId, TBPrivilege::getSequence);
-            tbPrivilegeList = tbPrivilegeService.list(wrapper);
-        } else {
-            tbPrivilegeList = tbPrivilegeService.getMenu(tbUser.getId());
-        }
+//        if (Objects.nonNull(tbUser.getRemark()) && Objects.equals(tbUser.getRemark(), RoleEnum.SUPER_ADMIN.getCode())) {
+//            QueryWrapper<TBPrivilege> wrapper = new QueryWrapper<>();
+//            wrapper.lambda().eq(TBPrivilege::getType, SystemConstant.MENU).orderByAsc(TBPrivilege::getParentId, TBPrivilege::getSequence);
+//            tbPrivilegeList = tbPrivilegeService.list(wrapper);
+//        } else {
+        tbPrivilegeList = tbPrivilegeService.getMenu(tbUser.getId());
+//        }
         Map map = new HashMap();
         map.put(SystemConstant.RECORDS, tbPrivilegeList);
         return ResultUtil.ok(map);
@@ -219,7 +219,7 @@ public class SysController {
         List<TBRole> tbRoleList = (List<TBRole>) EhcacheUtil.get(SystemConstant.roleCache, SystemConstant.roleCache);
         if (Objects.isNull(tbRoleList)) {
             QueryWrapper<TBRole> tbRoleQueryWrapper = new QueryWrapper<>();
-            tbRoleQueryWrapper.lambda().notIn(TBRole::getRoleCode, RoleEnum.SUPER_ADMIN.name(),RoleEnum.STUDENT.name());
+            tbRoleQueryWrapper.lambda().notIn(TBRole::getRoleCode, RoleEnum.SUPER_ADMIN.name(), RoleEnum.STUDENT.name());
             tbRoleList = tbRoleService.list(tbRoleQueryWrapper);
             if (Objects.nonNull(tbRoleList)) {
                 EhcacheUtil.put(SystemConstant.roleCache, SystemConstant.roleCache, tbRoleList);

+ 3 - 3
themis-backend/src/main/java/com/qmth/themis/backend/interceptor/AuthInterceptor.java

@@ -114,9 +114,9 @@ public class AuthInterceptor implements HandlerInterceptor {
                     }
                     request.setAttribute(SystemConstant.ORG, authDto.getTbOrg());
                     //系统管理员拥有所有权限
-                    if (authDto.getRoleCodes().contains(RoleEnum.SUPER_ADMIN.name())) {
-                        return true;
-                    }
+//                    if (authDto.getRoleCodes().contains(RoleEnum.SUPER_ADMIN.name())) {
+//                        return true;
+//                    }
                     //系统公用接口不拦截
                     List<String> sysUrls = dictionaryConfig.systemUrlDomain().getUrls();
                     int sysCount = (int) sysUrls.stream().filter(s -> {

+ 20 - 20
themis-business/src/main/java/com/qmth/themis/business/service/impl/CacheServiceImpl.java

@@ -75,26 +75,26 @@ public class CacheServiceImpl implements CacheService {
             List<TBUserRole> tbUserRoleList = tbUserRoleService.list(uWrapper);
             if (Objects.nonNull(tbUserRoleList)) {
                 //是否是系统管理员
-                long count = tbUserRoleList.stream().filter(s -> Objects.equals(s.getRoleCode(), RoleEnum.SUPER_ADMIN.name())).count();
-                if (count > 0) {
-                    //系统管理员获取所有权限
-                    QueryWrapper<TBPrivilege> pWrapper = new QueryWrapper<>();
-                    pWrapper.lambda().eq(TBPrivilege::getType, SystemConstant.LINK);
-                    List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.list(pWrapper);
-                    authDto = new AuthDto(tbUserRoleList.stream().map(s -> s.getRoleCode()).collect(Collectors.toSet()), tbPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
-                } else {
-                    TBOrg tbOrg = Objects.isNull(redisUtil.getOrg(user.getOrgId())) ? tbOrgService.getById(user.getOrgId()) : (TBOrg) redisUtil.getOrg(user.getOrgId());
-                    //根据角色名查权限
-                    Set<String> roleCodes = tbUserRoleList.stream().map(s -> s.getRoleCode()).collect(Collectors.toSet());
-                    QueryWrapper<TBRolePrivilege> rpWrapper = new QueryWrapper<>();
-                    rpWrapper.lambda().in(TBRolePrivilege::getRoleCode, roleCodes);
-                    List<TBRolePrivilege> tbRolePrivilegeList = tbRolePrivilegeService.list(rpWrapper);
-                    Set<Long> privilegeIds = tbRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
-                    QueryWrapper<TBPrivilege> pWrapper = new QueryWrapper<>();
-                    pWrapper.lambda().in(TBPrivilege::getId, privilegeIds).eq(TBPrivilege::getType, SystemConstant.LINK);
-                    List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.list(pWrapper);
-                    authDto = new AuthDto(roleCodes, tbPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()), tbOrg);
-                }
+//                long count = tbUserRoleList.stream().filter(s -> Objects.equals(s.getRoleCode(), RoleEnum.SUPER_ADMIN.name())).count();
+//                if (count > 0) {
+//                    //系统管理员获取所有权限
+//                    QueryWrapper<TBPrivilege> pWrapper = new QueryWrapper<>();
+//                    pWrapper.lambda().eq(TBPrivilege::getType, SystemConstant.LINK);
+//                    List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.list(pWrapper);
+//                    authDto = new AuthDto(tbUserRoleList.stream().map(s -> s.getRoleCode()).collect(Collectors.toSet()), tbPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
+//                } else {
+                TBOrg tbOrg = Objects.isNull(redisUtil.getOrg(user.getOrgId())) ? tbOrgService.getById(user.getOrgId()) : (TBOrg) redisUtil.getOrg(user.getOrgId());
+                //根据角色名查权限
+                Set<String> roleCodes = tbUserRoleList.stream().map(s -> s.getRoleCode()).collect(Collectors.toSet());
+                QueryWrapper<TBRolePrivilege> rpWrapper = new QueryWrapper<>();
+                rpWrapper.lambda().in(TBRolePrivilege::getRoleCode, roleCodes);
+                List<TBRolePrivilege> tbRolePrivilegeList = tbRolePrivilegeService.list(rpWrapper);
+                Set<Long> privilegeIds = tbRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
+                QueryWrapper<TBPrivilege> pWrapper = new QueryWrapper<>();
+                pWrapper.lambda().in(TBPrivilege::getId, privilegeIds).eq(TBPrivilege::getType, SystemConstant.LINK);
+                List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.list(pWrapper);
+                authDto = new AuthDto(roleCodes, tbPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()), tbOrg);
+//                }
             }
         } catch (Exception e) {
             e.printStackTrace();

+ 112 - 19
themis-business/src/main/resources/db/init.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80020
  File Encoding         : 65001
 
- Date: 01/08/2020 11:48:00
+ Date: 01/08/2020 15:11:41
 */
 
 SET NAMES utf8mb4;
@@ -376,14 +376,65 @@ CREATE TABLE `t_b_privilege` (
 -- Records of t_b_privilege
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_b_privilege` VALUES (1, '基础管理', 'basicManager', 'MENU', NULL, 1, NULL, '2020-07-02 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (2, '用户管理', 'userManager', 'MENU', NULL, 1, NULL, '2020-07-02 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (3, '考务管理', 'examinationsManager', 'MENU', NULL, 1, NULL, '2020-07-02 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (4, '监考管理', 'invigilateManager', 'MENU', NULL, 1, NULL, '2020-07-02 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (5, '考情监控', 'invigilateMenu', 'MENU', 4, 1, NULL, '2020-07-02 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (6, '考情监控实时列表', '/api/admin/invigilate/list', 'LINK', 5, 1, NULL, '2020-07-02 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (7, '考情监控实时视频列表', '/api/admin/invigilate/list/video', 'LINK', 5, 2, NULL, '2020-07-02 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (8, '在线巡考', 'patrolMenuMenu', 'MENU', 4, 2, NULL, '2020-07-02 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (1, '系统设置', 'system', 'MENU', NULL, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (2, '用户管理', 'userManager', 'MENU', 1, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (3, '机构管理', 'orgManager', 'MENU', 1, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (4, '考务设置', 'examination', 'MENU', NULL, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (5, '批次管理', 'examActivityManager', 'MENU', 4, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (6, '考生管理', 'examStudentManager', 'MENU', 4, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (7, '调卷规则', 'rotationRulesManager', 'MENU', 4, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (8, '学生档案', 'studentManager', 'MENU', 4, 4, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (9, '考场监考设置', 'examInvigilateManager', 'MENU', 4, 5, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (10, '监考设置', 'invigilate', 'MENU', NULL, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (11, '考情监控', 'invigilateManager', 'MENU', 10, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (12, '考情监控', 'invigilateSecondManager', 'MENU', 11, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (13, '在线巡考', 'onlineInvigilateManager', 'MENU', 11, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (14, '监考管理', 'monitorManager', 'MENU', 10, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (15, '实时监控台', 'monitoringStations', 'MENU', 14, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (16, '监考明细', 'monitorDetail', 'MENU', 14, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (17, '预警提醒', 'warn', 'MENU', 14, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (18, '重考申请', 'reexam', 'MENU', 14, 4, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (19, '进度查询', 'progress', 'MENU', 14, 5, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (20, '重考审批', 'reexamManager', 'MENU', 10, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (21, '重考待审', 'reexamTrial', 'MENU', 20, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (22, '重考已审', 'reexamApproved', 'MENU', 20, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (23, '查询统计', 'queryStatisticsManager', 'MENU', 10, 4, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (24, '考情综合报表分析', 'comprehensiveReportAnalysis', 'MENU', 23, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (25, '考生端日志管理', 'clientLog', 'MENU', 23, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (26, '查询用户', '/api/admin/user/query', 'LINK', 2, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (27, '新增用户', '/api/admin/user/save', 'LINK', 2, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (28, '修改用户', '/api/admin/user/save', 'LINK', 2, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (29, '重置用户密码', '/api/admin/user/updatePwd', 'LINK', 2, 4, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (30, '启用/禁用用户', '/api/admin/user/enable', 'LINK', 2, 5, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (31, '查询机构', '/api/admin/org/query', 'LINK', 3, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (32, '新增机构', '/api/admin/org/save', 'LINK', 3, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (33, '修改机构', '/api/admin/org/save', 'LINK', 3, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (34, '启用/禁用机构', '/api/admin/org/enable', 'LINK', 3, 4, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (35, '查询批次', '/api/admin/exam/query', 'LINK', 5, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (36, '新增批次', '/api/admin/exam/save', 'LINK', 5, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (37, '复制批次', '/api/admin/exam/copy', 'LINK', 5, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (38, '启用/禁用批次', '/api/admin/exam/toggle', 'LINK', 5, 4, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (39, '修改批次', '/api/admin/exam/save', 'LINK', 5, 5, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (40, '场次设置', '/api/admin/activity/query', 'LINK', 5, 6, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (41, '重新算分', '/api/admin/exam/score/calculate', 'LINK', 5, 7, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (42, '考生导入', 'examStudentImportManager', 'MENU', 6, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (43, '查询考生', '/api/admin/examStudent/query', 'LINK', 6, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (44, '新增考生', '/api/admin/examStudent/save', 'LINK', 6, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (45, '修改考生', '/api/admin/examStudent/save', 'LINK', 6, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (46, '启用/禁用考生', '/api/admin/examStudent/toggle', 'LINK', 6, 4, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (47, '删除考生', '/api/admin/examStudent/delete', 'LINK', 6, 5, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (48, '导入考生', '/api/admin/examStudent/import', 'LINK', 42, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (49, '考生下载文件', '/api/admin/examStudent/download', 'LINK', 42, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (50, '考生导出报告', '/api/admin/examStudent/export', 'LINK', 42, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (51, '查询调卷规则', '/api/admin/course/query', 'LINK', 7, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (52, '导入试卷', '/api/admin/paper/import', 'LINK', 7, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (53, '编辑试卷', '/api/admin/paper/save', 'LINK', 7, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (54, '查询学生', '/api/admin/student/query', 'LINK', 8, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (55, '重置学生密码', '/api/admin/student/updatePwd', 'LINK', 8, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (56, '启用/禁用学生', '/api/admin/student/toggle', 'LINK', 8, 3, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (57, '查询监考信息', '/api/admin/invigilateUser/query', 'LINK', 9, 1, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (58, '导入监考信息', '/api/admin/invigilateUser/import', 'LINK', 9, 2, NULL, '2020-08-01 12:08:31');
+INSERT INTO `t_b_privilege` VALUES (59, '修改监考信息', '/api/admin/invigilateUser/save', 'LINK', 9, 3, NULL, '2020-08-01 12:08:31');
 COMMIT;
 
 -- ----------------------------
@@ -425,14 +476,53 @@ CREATE TABLE `t_b_role_privilege` (
 -- Records of t_b_role_privilege
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_b_role_privilege` VALUES (1, 'STUDENT', 7);
-INSERT INTO `t_b_role_privilege` VALUES (2, 'ADMIN', 6);
-INSERT INTO `t_b_role_privilege` VALUES (3, 'INSPECTION', 8);
-INSERT INTO `t_b_role_privilege` VALUES (8, 'INVIGILATE', 1);
-INSERT INTO `t_b_role_privilege` VALUES (9, 'INVIGILATE', 2);
-INSERT INTO `t_b_role_privilege` VALUES (10, 'INVIGILATE', 3);
-INSERT INTO `t_b_role_privilege` VALUES (11, 'INVIGILATE', 6);
-INSERT INTO `t_b_role_privilege` VALUES (12, 'INVIGILATE', 4);
+INSERT INTO `t_b_role_privilege` VALUES (1, 'SUPER_ADMIN', 1);
+INSERT INTO `t_b_role_privilege` VALUES (2, 'SUPER_ADMIN', 2);
+INSERT INTO `t_b_role_privilege` VALUES (3, 'SUPER_ADMIN', 3);
+INSERT INTO `t_b_role_privilege` VALUES (4, 'SUPER_ADMIN', 26);
+INSERT INTO `t_b_role_privilege` VALUES (5, 'SUPER_ADMIN', 27);
+INSERT INTO `t_b_role_privilege` VALUES (6, 'SUPER_ADMIN', 28);
+INSERT INTO `t_b_role_privilege` VALUES (7, 'SUPER_ADMIN', 29);
+INSERT INTO `t_b_role_privilege` VALUES (8, 'SUPER_ADMIN', 30);
+INSERT INTO `t_b_role_privilege` VALUES (9, 'SUPER_ADMIN', 31);
+INSERT INTO `t_b_role_privilege` VALUES (10, 'SUPER_ADMIN', 32);
+INSERT INTO `t_b_role_privilege` VALUES (11, 'SUPER_ADMIN', 33);
+INSERT INTO `t_b_role_privilege` VALUES (12, 'SUPER_ADMIN', 34);
+INSERT INTO `t_b_role_privilege` VALUES (13, 'ADMIN', 1);
+INSERT INTO `t_b_role_privilege` VALUES (14, 'ADMIN', 2);
+INSERT INTO `t_b_role_privilege` VALUES (15, 'ADMIN', 26);
+INSERT INTO `t_b_role_privilege` VALUES (16, 'ADMIN', 27);
+INSERT INTO `t_b_role_privilege` VALUES (17, 'ADMIN', 28);
+INSERT INTO `t_b_role_privilege` VALUES (18, 'ADMIN', 29);
+INSERT INTO `t_b_role_privilege` VALUES (19, 'ADMIN', 30);
+INSERT INTO `t_b_role_privilege` VALUES (20, 'ADMIN', 4);
+INSERT INTO `t_b_role_privilege` VALUES (21, 'ADMIN', 5);
+INSERT INTO `t_b_role_privilege` VALUES (22, 'ADMIN', 6);
+INSERT INTO `t_b_role_privilege` VALUES (23, 'ADMIN', 7);
+INSERT INTO `t_b_role_privilege` VALUES (24, 'ADMIN', 8);
+INSERT INTO `t_b_role_privilege` VALUES (25, 'ADMIN', 9);
+INSERT INTO `t_b_role_privilege` VALUES (26, 'ADMIN', 35);
+INSERT INTO `t_b_role_privilege` VALUES (27, 'ADMIN', 36);
+INSERT INTO `t_b_role_privilege` VALUES (28, 'ADMIN', 37);
+INSERT INTO `t_b_role_privilege` VALUES (29, 'ADMIN', 38);
+INSERT INTO `t_b_role_privilege` VALUES (30, 'ADMIN', 39);
+INSERT INTO `t_b_role_privilege` VALUES (31, 'ADMIN', 40);
+INSERT INTO `t_b_role_privilege` VALUES (32, 'ADMIN', 41);
+INSERT INTO `t_b_role_privilege` VALUES (33, 'ADMIN', 42);
+INSERT INTO `t_b_role_privilege` VALUES (34, 'ADMIN', 43);
+INSERT INTO `t_b_role_privilege` VALUES (35, 'ADMIN', 44);
+INSERT INTO `t_b_role_privilege` VALUES (36, 'ADMIN', 45);
+INSERT INTO `t_b_role_privilege` VALUES (37, 'ADMIN', 46);
+INSERT INTO `t_b_role_privilege` VALUES (38, 'ADMIN', 47);
+INSERT INTO `t_b_role_privilege` VALUES (39, 'ADMIN', 51);
+INSERT INTO `t_b_role_privilege` VALUES (40, 'ADMIN', 52);
+INSERT INTO `t_b_role_privilege` VALUES (41, 'ADMIN', 53);
+INSERT INTO `t_b_role_privilege` VALUES (42, 'ADMIN', 54);
+INSERT INTO `t_b_role_privilege` VALUES (43, 'ADMIN', 55);
+INSERT INTO `t_b_role_privilege` VALUES (44, 'ADMIN', 56);
+INSERT INTO `t_b_role_privilege` VALUES (45, 'ADMIN', 57);
+INSERT INTO `t_b_role_privilege` VALUES (46, 'ADMIN', 58);
+INSERT INTO `t_b_role_privilege` VALUES (47, 'ADMIN', 59);
 COMMIT;
 
 -- ----------------------------
@@ -459,7 +549,7 @@ CREATE TABLE `t_b_session` (
 -- Records of t_b_session
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_b_session` VALUES ('1-1591624781-admin_web', '1', '[SUPER_ADMIN]', 'admin_web', 'web', '1234567891', '0:0:0:0:0:0:0:1', 'naTglrPSpnVPvOe2G0n2lcbbP115P2Ov', '2020-07-29 14:02:27', NULL, '2020-07-30 14:12:03', '2020-07-31 14:12:02');
+INSERT INTO `t_b_session` VALUES ('1-1591624781-admin_web', '1', '[SUPER_ADMIN]', 'admin_web', 'web', '1234567891', '0:0:0:0:0:0:0:1', 'ThgbvMsuNv3LPd9IX54sZMnMLif1rm8R', '2020-07-29 14:02:27', NULL, '2020-08-01 12:14:17', '2020-08-02 12:14:17');
 INSERT INTO `t_b_session` VALUES ('3-984239618-admin_web', '3', '[INVIGILATE]', 'admin_web', 'web', '1234567891', '0:0:0:0:0:0:0:1', 'VmRElUyzRpYKYDvFzEzQPvBIbfvNftW7', '2020-07-30 14:11:54', NULL, '2020-07-30 14:11:57', '2020-07-31 14:11:54');
 INSERT INTO `t_b_session` VALUES ('42112319900101001X-1389046525-admin_web', '18747031182901248', '[STUDENT]', 'admin_web', 'web', '1234567891', '0:0:0:0:0:0:0:1', 'Sg9SxWXUfR3uMsV56JN9ipg8nCiQhUyP', '2020-07-30 14:30:04', NULL, '2020-07-30 14:30:34', '2020-07-31 14:30:04');
 COMMIT;
@@ -938,6 +1028,7 @@ INSERT INTO `t_e_user_log` VALUES (21554764969934848, 1, 5, '登录', '{\"id\":\
 INSERT INTO `t_e_user_log` VALUES (21564640530006016, 1, 5, '登录', '{\"id\":\"e3547ff0fdcb46ba9d175cf6a9d12d7e\",\"topic\":\"themis-topic-userLog\",\"tag\":\"user\",\"timestamp\":1596082209988,\"body\":\"LOGIN\",\"type\":\"USER_LOG\",\"objId\":\"1\",\"objName\":\"sysadmin\",\"ack\":0,\"sequence\":null,\"properties\":null}', '2020-07-30 12:10:11');
 INSERT INTO `t_e_user_log` VALUES (21595281766219776, 3, 5, '登录', '{\"id\":\"ab3e2a8d73e64b048b79e33f02ba926e\",\"topic\":\"themis-topic-userLog\",\"tag\":\"user\",\"timestamp\":1596089515253,\"body\":\"LOGIN\",\"type\":\"USER_LOG\",\"objId\":\"3\",\"objName\":\"i1\",\"ack\":0,\"sequence\":null,\"properties\":null}', '2020-07-30 14:11:56');
 INSERT INTO `t_e_user_log` VALUES (21595310149074944, 1, 5, '登录', '{\"id\":\"89bed224f72e46aab085f790007f7609\",\"topic\":\"themis-topic-userLog\",\"tag\":\"user\",\"timestamp\":1596089522387,\"body\":\"LOGIN\",\"type\":\"USER_LOG\",\"objId\":\"1\",\"objName\":\"sysadmin\",\"ack\":0,\"sequence\":null,\"properties\":null}', '2020-07-30 14:12:03');
+INSERT INTO `t_e_user_log` VALUES (22290447552479232, 1, 5, '登录', '{\"id\":\"6574a1e3d71642d182dcdb636623740c\",\"topic\":\"themis-topic-exam\",\"tag\":\"user\",\"timestamp\":1596255256741,\"body\":\"LOGIN\",\"type\":\"USER_LOG\",\"objId\":\"1\",\"objName\":\"sysadmin\",\"ack\":0,\"sequence\":null,\"properties\":null}', '2020-08-01 12:14:17');
 COMMIT;
 
 -- ----------------------------
@@ -1020,8 +1111,10 @@ CREATE TABLE `t_m_rocket_message` (
 -- ----------------------------
 BEGIN;
 INSERT INTO `t_m_rocket_message` VALUES ('16fcfc76ad9b4b0eaf6428b4b24f8cda', 'themis-topic-quartz', 'examActivity', '[{\"id\":21598704100179968,\"createId\":1,\"createTime\":1596090332418,\"updateId\":null,\"updateTime\":1596090332418,\"examId\":21598702946746368,\"code\":\"examActivity21598704100179969\",\"prepareSeconds\":10,\"maxDurationSeconds\":120,\"enable\":null,\"openingSeconds\":10,\"startTime\":1595927940000,\"finishTime\":1595931480000}]', 'QUARTZ_LOG', '21598702946746368', 'sysadmin', 2, NULL, NULL, '2020-07-30 14:25:42', 1596090332500);
+INSERT INTO `t_m_rocket_message` VALUES ('17bd404d126446a7a23824f09cc7fbb1', 'themis-topic-exam', 'web', '{\"id\":\"1-1591624781-admin_web\",\"identity\":\"1\",\"type\":\"[SUPER_ADMIN]\",\"source\":\"admin_web\",\"platform\":\"web\",\"deviceId\":\"1234567891\",\"address\":\"0:0:0:0:0:0:0:1\",\"accessToken\":\"ThgbvMsuNv3LPd9IX54sZMnMLif1rm8R\",\"lastAccessTime\":1.596255256645E12,\"expireTime\":1.596341656641E12}', 'SESSION', '1-1591624781-admin_web', 'sysadmin', 2, NULL, NULL, '2020-08-01 12:14:17', 1596255256650);
 INSERT INTO `t_m_rocket_message` VALUES ('40ef1a2b8765436d9ee99e4d57be8f7a', 'themis-topic-quartz', 'examActivity', '[{\"id\":21597202770034688,\"createId\":1,\"createTime\":1596089974478,\"updateId\":null,\"updateTime\":1596089974479,\"examId\":21597201704681472,\"code\":\"examActivity21597202770034689\",\"prepareSeconds\":10,\"maxDurationSeconds\":120,\"enable\":null,\"openingSeconds\":10,\"startTime\":1595927940000,\"finishTime\":1595931480000}]', 'QUARTZ_LOG', '21597201704681472', 'sysadmin', 2, NULL, NULL, '2020-07-30 14:19:35', 1596089974603);
 INSERT INTO `t_m_rocket_message` VALUES ('5372baf7f79f4c2ab3f26cfd5705ce6e', 'themis-topic-quartz', 'examActivity', '[{\"id\":21597021538353152,\"createId\":1,\"createTime\":1596089931288,\"updateId\":null,\"updateTime\":1596089931288,\"examId\":21597017226608640,\"code\":\"examActivity21597021538353153\",\"prepareSeconds\":10,\"maxDurationSeconds\":120,\"enable\":null,\"openingSeconds\":10,\"startTime\":1595927940000,\"finishTime\":1595931480000}]', 'QUARTZ_LOG', '21597017226608640', 'sysadmin', 2, NULL, NULL, '2020-07-30 14:20:01', 1596089931363);
+INSERT INTO `t_m_rocket_message` VALUES ('6574a1e3d71642d182dcdb636623740c', 'themis-topic-exam', 'user', '\"LOGIN\"', 'USER_LOG', '1', 'sysadmin', 2, NULL, NULL, '2020-08-01 12:14:17', 1596255256741);
 INSERT INTO `t_m_rocket_message` VALUES ('6e5b81864cd2414d90887f4a1529bc34', 'themis-topic-userLog', 'student', 'LOGIN', 'EXAM_STUDENT_LOG', '18747031182901248', '42112319900101001X', 2, NULL, NULL, '2020-07-30 14:30:23', 1596090623062);
 INSERT INTO `t_m_rocket_message` VALUES ('e1d2a53d5585479cbc9232a1db004f31', 'themis-topic-session', 'web', '{\"id\":\"42112319900101001X-1389046525-admin_web\",\"identity\":\"18747031182901248\",\"type\":\"[STUDENT]\",\"source\":\"admin_web\",\"platform\":\"web\",\"deviceId\":\"1234567891\",\"address\":\"0:0:0:0:0:0:0:1\",\"accessToken\":\"Sg9SxWXUfR3uMsV56JN9ipg8nCiQhUyP\",\"lastAccessTime\":1.596090604152E12,\"expireTime\":1.596177004089E12}', 'SESSION', '42112319900101001X-1389046525-admin_web', '42112319900101001X', 2, NULL, NULL, '2020-07-30 14:30:34', 1596090622747);
 INSERT INTO `t_m_rocket_message` VALUES ('e5895edd369743979790bb74c3269650', 'themis-topic-quartz', 'examActivity', '[{\"id\":21599667867353088,\"createId\":1,\"createTime\":1596090562213,\"updateId\":null,\"updateTime\":1596090562214,\"examId\":21599666630033408,\"code\":\"examActivity21599667867353089\",\"prepareSeconds\":10,\"maxDurationSeconds\":120,\"enable\":null,\"openingSeconds\":10,\"startTime\":1595927940000,\"finishTime\":1595931480000}]', 'QUARTZ_LOG', '21599666630033408', 'sysadmin', 2, NULL, NULL, '2020-07-30 14:29:22', 1596090562291);
@@ -1209,4 +1302,4 @@ CREATE TABLE `t_oe_simulate_paper` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='模拟试卷';
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;

+ 3 - 3
themis-exam/src/main/java/com/qmth/themis/exam/interceptor/AuthInterceptor.java

@@ -114,9 +114,9 @@ public class AuthInterceptor implements HandlerInterceptor {
                     }
                     request.setAttribute(SystemConstant.ORG, authDto.getTbOrg());
                     //系统管理员拥有所有权限
-                    if (authDto.getRoleCodes().contains(RoleEnum.SUPER_ADMIN.name())) {
-                        return true;
-                    }
+//                    if (authDto.getRoleCodes().contains(RoleEnum.SUPER_ADMIN.name())) {
+//                        return true;
+//                    }
                     //系统公用接口不拦截
                     List<String> sysUrls = dictionaryConfig.systemUrlDomain().getUrls();
                     int sysCount = (int) sysUrls.stream().filter(s -> {