Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李丛阳
education
Commits
2f707571
Commit
2f707571
authored
Jul 13, 2020
by
luzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 初始化菜单权限
parent
ca152d0c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
10 deletions
+9
-10
20.6.18.sql
dbscript/20.6.18.sql
+2
-2
BChapterServiceImpl.java
...t/business/bchapter/service/impl/BChapterServiceImpl.java
+5
-6
MenuMap.java
src/main/java/org/rcisoft/common/model/MenuMap.java
+1
-1
SysRoleServiceImpl.java
...org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java
+1
-1
No files found.
dbscript/20.6.18.sql
View file @
2f707571
...
@@ -15,8 +15,8 @@ INSERT INTO `b_message` VALUES (uuid(), '', '2020-06-17 11:07:11', '104983787261
...
@@ -15,8 +15,8 @@ INSERT INTO `b_message` VALUES (uuid(), '', '2020-06-17 11:07:11', '104983787261
-- 添加菜单表中 新消息设置
-- 添加菜单表中 新消息设置
INSERT
INTO
`s_menu`
VALUES
(
'0055'
,
'0005'
,
NULL
,
'新消息
管理'
,
'F-NEW-MANAGE'
,
'new
Manage'
,
NULL
,
NULL
,
5
,
'1'
,
'1'
,
'F-NEW-MANAGE'
,
NULL
,
'2019-11-25 10:45:07'
,
NULL
,
'2019-11-25 10:45:15'
,
NULL
,
'0'
,
'1'
,
'20'
,
2
);
INSERT
INTO
`s_menu`
VALUES
(
'0055'
,
'0005'
,
NULL
,
'新消息
设置'
,
'F-NEW-MANAGE'
,
'newInfo
Manage'
,
NULL
,
NULL
,
5
,
'1'
,
'1'
,
'F-NEW-MANAGE'
,
NULL
,
'2019-11-25 10:45:07'
,
NULL
,
'2019-11-25 10:45:15'
,
NULL
,
'0'
,
'1'
,
'20'
,
2
);
INSERT
INTO
`s_menu`
VALUES
(
'0056'
,
'0005'
,
NULL
,
'
资源共享管理'
,
'F-SYCN-MANAGE'
,
'new
Manage'
,
NULL
,
NULL
,
6
,
'1'
,
'1'
,
'F-SYCN-MANAGE'
,
NULL
,
'2019-11-25 10:45:07'
,
NULL
,
'2019-11-25 10:45:15'
,
NULL
,
'0'
,
'1'
,
'20'
,
2
);
INSERT
INTO
`s_menu`
VALUES
(
'0056'
,
'0005'
,
NULL
,
'
共享设置'
,
'F-SYCN-MANAGE'
,
'share
Manage'
,
NULL
,
NULL
,
6
,
'1'
,
'1'
,
'F-SYCN-MANAGE'
,
NULL
,
'2019-11-25 10:45:07'
,
NULL
,
'2019-11-25 10:45:15'
,
NULL
,
'0'
,
'1'
,
'20'
,
2
);
-- 为 主管理员添加 新消息管理菜单 权限
-- 为 主管理员添加 新消息管理菜单 权限
update
tm_admin_role
set
r_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,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,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,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE,F-NEW-MANAGE,F-SYNCH-MANAGE'
where
r_type
=
0
;
update
tm_admin_role
set
r_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,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,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,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE,F-NEW-MANAGE,F-SYNCH-MANAGE'
where
r_type
=
0
;
...
...
src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java
View file @
2f707571
...
@@ -870,16 +870,15 @@ public class BChapterServiceImpl implements BChapterService {
...
@@ -870,16 +870,15 @@ public class BChapterServiceImpl implements BChapterService {
//遍历每个id
//遍历每个id
for
(
String
id
:
lessonIds
)
{
for
(
String
id
:
lessonIds
)
{
List
<
BFile
>
fileList
=
bFileRepository
.
getFileByLessonId
(
id
);
List
<
BFile
>
fileList
=
bFileRepository
.
getFileByLessonId
(
id
);
//batch是zip打包文件夹 bFile.getLessonId()替换形成name
String
filePath
=
global
.
getBASE_UPLOAD_SERVER_LOCATION
()
+
global
.
getCOURSE_LOCATION
()
+
File
.
separator
+
batchUDID
+
File
.
separator
+
bLessonRepository
.
selectByPrimaryKey
(
id
).
getLessonName
();
File
file
=
new
File
(
filePath
);
if
(
fileList
==
null
||
fileList
.
size
()
<
1
)
if
(
fileList
==
null
||
fileList
.
size
()
<
1
)
continue
;
continue
;
//下载文件 并将这些文件包装成File
//下载文件 并将这些文件包装成File
fileList
.
forEach
(
bFile
->
{
fileList
.
forEach
(
bFile
->
{
if
(
StringUtils
.
isEmpty
(
bFile
.
getVideoUrl
())
||
StringUtils
.
isEmpty
(
bFile
.
getLessonId
()))
if
(
StringUtils
.
isNotEmpty
(
bFile
.
getVideoUrl
()))
return
;
downLoadFile
(
bFile
,
file
,
filePath
,
"1"
);
//batch是zip打包文件夹 bFile.getLessonId()替换形成name
String
filePath
=
global
.
getBASE_UPLOAD_SERVER_LOCATION
()
+
global
.
getCOURSE_LOCATION
()
+
File
.
separator
+
batchUDID
+
File
.
separator
+
bLessonRepository
.
selectByPrimaryKey
(
bFile
.
getLessonId
()).
getLessonName
();
File
file
=
new
File
(
filePath
);
downLoadFile
(
bFile
,
file
,
filePath
,
"1"
);
});
});
}
}
String
uuid
=
IdGen
.
uuid
();
String
uuid
=
IdGen
.
uuid
();
...
...
src/main/java/org/rcisoft/common/model/MenuMap.java
View file @
2f707571
...
@@ -41,6 +41,6 @@ public class MenuMap {
...
@@ -41,6 +41,6 @@ public class MenuMap {
menuMap
.
put
(
"F-ROLE-MANAGE"
,
"0053"
);
menuMap
.
put
(
"F-ROLE-MANAGE"
,
"0053"
);
menuMap
.
put
(
"F-NOTICE-MANAGE"
,
"0054"
);
menuMap
.
put
(
"F-NOTICE-MANAGE"
,
"0054"
);
menuMap
.
put
(
"F-NEW-MANAGE"
,
"0055"
);
menuMap
.
put
(
"F-NEW-MANAGE"
,
"0055"
);
menuMap
.
put
(
"F-SY
NCH
-MANAGE"
,
"0056"
);
menuMap
.
put
(
"F-SY
CN
-MANAGE"
,
"0056"
);
}
}
}
}
src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java
View file @
2f707571
...
@@ -191,7 +191,7 @@ public class SysRoleServiceImpl implements SysRoleService {
...
@@ -191,7 +191,7 @@ public class SysRoleServiceImpl implements SysRoleService {
@Transactional
(
propagation
=
Propagation
.
REQUIRED
,
isolation
=
Isolation
.
DEFAULT
,
rollbackFor
=
Exception
.
class
)
@Transactional
(
propagation
=
Propagation
.
REQUIRED
,
isolation
=
Isolation
.
DEFAULT
,
rollbackFor
=
Exception
.
class
)
public
int
addAdminRoleMenuUser
(
CurUser
curUser
)
{
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,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,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,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE,F-NEW-MANAGE,F-SY
NCH
-MANAGE"
;
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,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,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,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE,F-NEW-MANAGE,F-SY
CN
-MANAGE"
;
//主管理员角色id
//主管理员角色id
String
mRId
=
IdGen
.
uuid
();
String
mRId
=
IdGen
.
uuid
();
//初始化角色(新加公司超级管理员)
//初始化角色(新加公司超级管理员)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment