Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
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
haoban3.0
haoban-manage3.0
Commits
60cc99e5
Commit
60cc99e5
authored
Oct 09, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:好办权限操作日志
parent
50539874
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
27 deletions
+34
-27
HaobanRoleMenuQDTO.java
...c/haoban/manage/api/dto/qdto/role/HaobanRoleMenuQDTO.java
+15
-1
HaobanRoleController.java
...ic/haoban/manage/web/controller/HaobanRoleController.java
+19
-26
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanRoleMenuQDTO.java
View file @
60cc99e5
...
@@ -21,8 +21,14 @@ public class HaobanRoleMenuQDTO implements Serializable {
...
@@ -21,8 +21,14 @@ public class HaobanRoleMenuQDTO implements Serializable {
* 权限id
* 权限id
*/
*/
private
List
<
String
>
menuCodes
;
private
List
<
String
>
menuCodes
;
/**
* 删除权限id
*/
private
List
<
String
>
delMenuCodes
;
private
List
<
String
>
delMenuCodes
;
/**
* 新增权限id
*/
private
List
<
String
>
addMenuCodes
;
public
Long
getRoleId
()
{
public
Long
getRoleId
()
{
return
roleId
;
return
roleId
;
...
@@ -55,5 +61,13 @@ public class HaobanRoleMenuQDTO implements Serializable {
...
@@ -55,5 +61,13 @@ public class HaobanRoleMenuQDTO implements Serializable {
public
void
setDelMenuCodes
(
List
<
String
>
delMenuCodes
)
{
public
void
setDelMenuCodes
(
List
<
String
>
delMenuCodes
)
{
this
.
delMenuCodes
=
delMenuCodes
;
this
.
delMenuCodes
=
delMenuCodes
;
}
}
public
List
<
String
>
getAddMenuCodes
()
{
return
addMenuCodes
;
}
public
void
setAddMenuCodes
(
List
<
String
>
addMenuCodes
)
{
this
.
addMenuCodes
=
addMenuCodes
;
}
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java
View file @
60cc99e5
...
@@ -7,7 +7,6 @@ import com.gic.commons.webapi.reponse.RestResponse;
...
@@ -7,7 +7,6 @@ import com.gic.commons.webapi.reponse.RestResponse;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.common.anno.IgnoreLogin
;
import
com.gic.haoban.common.anno.IgnoreLogin
;
import
com.gic.haoban.common.utils.AuthWebRequestUtil
;
import
com.gic.haoban.common.utils.AuthWebRequestUtil
;
import
com.gic.haoban.common.utils.RolesListUtils
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanMenuQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanMenuQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO
;
...
@@ -62,15 +61,16 @@ public class HaobanRoleController extends WebBaseController {
...
@@ -62,15 +61,16 @@ public class HaobanRoleController extends WebBaseController {
optPage
=
"好办小程序权限-编辑"
)
optPage
=
"好办小程序权限-编辑"
)
public
RestResponse
edit
(
@RequestBody
HaobanRoleQDTO
haobanRoleQDTO
)
{
public
RestResponse
edit
(
@RequestBody
HaobanRoleQDTO
haobanRoleQDTO
)
{
WebLoginDTO
login
=
AuthWebRequestUtil
.
getLoginUser
();
WebLoginDTO
login
=
AuthWebRequestUtil
.
getLoginUser
();
StringBuffer
stringBuffer
=
getEditLog
(
haobanRoleQDTO
,
login
);
StringBuffer
logContent
=
getEditLog
(
haobanRoleQDTO
,
login
);
ServiceResponse
serviceResponse
=
haobanRoleApiService
.
edit
(
haobanRoleQDTO
,
login
);
ServiceResponse
serviceResponse
=
haobanRoleApiService
.
edit
(
haobanRoleQDTO
,
login
);
if
(!
serviceResponse
.
isSuccess
())
{
if
(!
serviceResponse
.
isSuccess
())
{
GicLogRecordEvaluationContext
.
noWriteLog
();
GicLogRecordEvaluationContext
.
noWriteLog
();
}
}
GicLogRecordEvaluationContext
.
putAttribute
(
"logContent"
,
stringBuffer
.
toString
());
if
(
logContent
!=
null
)
{
GicLogRecordEvaluationContext
.
putOptTargetId
(
AuthWebRequestUtil
.
getLoginUser
().
getClerkId
());
GicLogRecordEvaluationContext
.
putAttribute
(
"logContent"
,
logContent
.
toString
());
GicLogRecordEvaluationContext
.
putOptTargetId
(
AuthWebRequestUtil
.
getLoginUser
().
getClerkId
());
}
return
RestResponse
.
successResult
();
return
RestResponse
.
successResult
();
}
}
...
@@ -78,44 +78,37 @@ public class HaobanRoleController extends WebBaseController {
...
@@ -78,44 +78,37 @@ public class HaobanRoleController extends WebBaseController {
HaobanRoleMenuQDTO
clerkMenus
=
haobanRoleQDTO
.
getClerkMenus
();
HaobanRoleMenuQDTO
clerkMenus
=
haobanRoleQDTO
.
getClerkMenus
();
HaobanRoleMenuQDTO
manegeClerkMenus
=
haobanRoleQDTO
.
getManegeClerkMenus
();
HaobanRoleMenuQDTO
manegeClerkMenus
=
haobanRoleQDTO
.
getManegeClerkMenus
();
HaobanRoleMenuQDTO
managerMenus
=
haobanRoleQDTO
.
getManagerMenus
();
HaobanRoleMenuQDTO
managerMenus
=
haobanRoleQDTO
.
getManagerMenus
();
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
StringBuffer
stringBuffer
=
new
StringBuffer
();
StringBuffer
stringBuffer
=
new
StringBuffer
();
if
(
clerkMenus
!=
null
)
{
if
(
clerkMenus
!=
null
)
{
Integer
clerkType
=
clerkMenus
.
getClerkType
();
Integer
clerkType
=
clerkMenus
.
getClerkType
();
List
<
String
>
menuCodes
=
clerkMenus
.
get
MenuCodes
();
List
<
String
>
addMenuCodes
=
clerkMenus
.
getAdd
MenuCodes
();
List
<
String
>
delMenuCodes
=
clerkMenus
.
getDelMenuCodes
();
List
<
String
>
delMenuCodes
=
clerkMenus
.
getDelMenuCodes
();
setEditLogByType
(
wxEnterpriseId
,
stringBuffer
,
clerkType
,
m
enuCodes
,
delMenuCodes
);
setEditLogByType
(
stringBuffer
,
clerkType
,
addM
enuCodes
,
delMenuCodes
);
}
}
if
(
manegeClerkMenus
!=
null
)
{
if
(
manegeClerkMenus
!=
null
)
{
Integer
clerkType
=
manegeClerkMenus
.
getClerkType
();
Integer
clerkType
=
manegeClerkMenus
.
getClerkType
();
List
<
String
>
menuCodes
=
manegeClerkMenus
.
get
MenuCodes
();
List
<
String
>
addMenuCodes
=
manegeClerkMenus
.
getAdd
MenuCodes
();
List
<
String
>
delMenuCodes
=
manegeClerkMenus
.
getDelMenuCodes
();
List
<
String
>
delMenuCodes
=
manegeClerkMenus
.
getDelMenuCodes
();
setEditLogByType
(
wxEnterpriseId
,
stringBuffer
,
clerkType
,
m
enuCodes
,
delMenuCodes
);
setEditLogByType
(
stringBuffer
,
clerkType
,
addM
enuCodes
,
delMenuCodes
);
}
}
if
(
managerMenus
!=
null
)
{
if
(
managerMenus
!=
null
)
{
Integer
clerkType
=
managerMenus
.
getClerkType
();
Integer
clerkType
=
managerMenus
.
getClerkType
();
List
<
String
>
menuCodes
=
managerMenus
.
get
MenuCodes
();
List
<
String
>
addMenuCodes
=
managerMenus
.
getAdd
MenuCodes
();
List
<
String
>
delMenuCodes
=
managerMenus
.
getDelMenuCodes
();
List
<
String
>
delMenuCodes
=
managerMenus
.
getDelMenuCodes
();
setEditLogByType
(
wxEnterpriseId
,
stringBuffer
,
clerkType
,
m
enuCodes
,
delMenuCodes
);
setEditLogByType
(
stringBuffer
,
clerkType
,
addM
enuCodes
,
delMenuCodes
);
}
}
return
stringBuffer
;
return
stringBuffer
;
}
}
private
void
setEditLogByType
(
String
wxEnterpriseId
,
StringBuffer
stringBuffer
,
Integer
clerkType
,
List
<
String
>
menuCodes
,
List
<
String
>
delMenuCodes
)
{
private
void
setEditLogByType
(
StringBuffer
stringBuffer
,
Integer
clerkType
,
List
<
String
>
addMenuCodes
,
List
<
String
>
delMenuCodes
)
{
ServiceResponse
<
List
<
String
>>
listServiceResponse
=
haobanRoleApiService
.
getMenuCodesByClerkType
(
wxEnterpriseId
,
clerkType
,
1
);
if
(
CollectionUtils
.
isNotEmpty
(
addMenuCodes
))
{
//新勾选的
logger
.
info
(
"新增菜单code:{}"
,
JSON
.
toJSONString
(
addMenuCodes
));
List
<
String
>
roleMenuCodes
=
listServiceResponse
.
getResult
();
for
(
String
menuCode
:
addMenuCodes
)
{
if
(
CollectionUtils
.
isNotEmpty
(
roleMenuCodes
))
{
ServiceResponse
<
String
>
serviceMenuNameByCode
=
haobanMenuApiService
.
getMenuNameByCode
(
menuCode
);
List
<
String
>
newMenuCodes
=
RolesListUtils
.
differenceList
(
roleMenuCodes
,
menuCodes
);
String
menuName
=
serviceMenuNameByCode
.
getResult
();
if
(
CollectionUtils
.
isNotEmpty
(
newMenuCodes
))
{
String
log
=
RoleClerkTypeEnum
.
getNameByCode
(
clerkType
)
+
"/"
+
menuName
+
"/"
+
"勾选"
+
"\r\n"
;
logger
.
info
(
"新增菜单code:{}"
,
JSON
.
toJSONString
(
newMenuCodes
));
stringBuffer
.
append
(
log
);
for
(
String
menuCode
:
newMenuCodes
)
{
ServiceResponse
<
String
>
serviceMenuNameByCode
=
haobanMenuApiService
.
getMenuNameByCode
(
menuCode
);
String
menuName
=
serviceMenuNameByCode
.
getResult
();
String
log
=
RoleClerkTypeEnum
.
getNameByCode
(
clerkType
)
+
"/"
+
menuName
+
"/"
+
"勾选"
+
"\r\n"
;
stringBuffer
.
append
(
log
);
}
}
}
}
}
...
...
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