初始化新增讲师、学员角色

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -183,15 +183,17 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Override
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     public int addAdminRoleMenuUser(CurUser curUser) {
+
+        String privilege = "M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL,F-CATEGORY,F-LABEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-STATISTICS-VIEW,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT";
         //主管理员角色id
         String mRId = IdGen.uuid();
         //初始化角色（新加公司超级管理员）
         InitAddAdminDTO initAddAdminDTO = new InitAddAdminDTO();
         initAddAdminDTO.setRId(mRId);
-        initAddAdminDTO.setRName("主管理员");
+        initAddAdminDTO.setRName("智信主管理员(默认)");
         initAddAdminDTO.setRStatus("1");
         initAddAdminDTO.setRCreatedate(new Date());
-        initAddAdminDTO.setRPrivilege("M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-NULL,F-CATEGORY,F-LABEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-STATISTICS-VIEW,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT");
+        initAddAdminDTO.setRPrivilege(privilege);
         initAddAdminDTO.setType("1");
         initAddAdminDTO.setCorpId(curUser.getCorpId());
         initAddAdminDTO.setRType("0");
@@ -214,13 +216,13 @@ public class SysRoleServiceImpl implements SysRoleService {
 
         //子管理员角色id
         String sRId = IdGen.uuid();
-        //初始化角色（新加公司超级管理员）
+        //初始化角色（新加公司管理员）
         InitAddAdminDTO initAddSubAdminDTO = new InitAddAdminDTO();
         initAddSubAdminDTO.setRId(sRId);
-        initAddSubAdminDTO.setRName("子管理员");
+        initAddSubAdminDTO.setRName("智信子管理员(默认)");
         initAddSubAdminDTO.setRStatus("1");
         initAddSubAdminDTO.setRCreatedate(new Date());
-        initAddSubAdminDTO.setRPrivilege("M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-NULL,F-CATEGORY,F-LABEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-STATISTICS-VIEW,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT");
+        initAddSubAdminDTO.setRPrivilege(privilege);
         initAddSubAdminDTO.setType("1");
         initAddSubAdminDTO.setCorpId(curUser.getCorpId());
         initAddSubAdminDTO.setRType("1");
@@ -228,6 +230,38 @@ public class SysRoleServiceImpl implements SysRoleService {
 //        List<String> menuIds = new ArrayList<String>(MenuMap.menuMap.values());
         List<RoleMenuDTO> subRoleMenuDTOs = setRoleMenu(menuIds,sRId);
 
+        //添加默认 讲师、学生 权限
+        String teacher = IdGen.uuid();
+        InitAddAdminDTO initTeacherDTO = new InitAddAdminDTO();
+        initTeacherDTO.setRId(teacher);
+        initTeacherDTO.setRName("讲师(默认)");
+        initTeacherDTO.setRStatus("1");
+        initTeacherDTO.setRCreatedate(new Date());
+        initTeacherDTO.setRPrivilege("M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL");
+        initTeacherDTO.setType("0");
+        initTeacherDTO.setCorpId(curUser.getCorpId());
+        initTeacherDTO.setRType("1");
+        List<String> teacherMenu = new ArrayList<String>();
+        teacherMenu.add("0001");
+        teacherMenu.add("0011");
+        teacherMenu.add("0013");
+        List<RoleMenuDTO> teacherMenuDTOs = setRoleMenu(teacherMenu,teacher);
+
+        sysRoleRepository.addAdminRole(initTeacherDTO);
+        sysRoleRepository.addRoleMenu(teacherMenuDTOs);
+
+        String student = IdGen.uuid();
+        InitAddAdminDTO initStudentDTO = new InitAddAdminDTO();
+        initStudentDTO.setRId(student);
+        initStudentDTO.setRName("学员(默认)");
+        initStudentDTO.setRStatus("1");
+        initStudentDTO.setRCreatedate(new Date());
+        initStudentDTO.setRPrivilege("M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE");
+        initStudentDTO.setType("0");
+        initStudentDTO.setCorpId(curUser.getCorpId());
+        initStudentDTO.setRType("1");
+        //学院默认没有后台权限，不用加菜单
+        sysRoleRepository.addAdminRole(initStudentDTO);
 
         //将子管理员 插入tm_admin_role、s_role_menu、
         sysRoleRepository.addAdminRole(initAddSubAdminDTO);