|
@@ -9,14 +9,14 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
|
9
|
9
|
import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
|
10
|
10
|
import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
|
11
|
11
|
import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
|
12
|
|
-import com.huiju.estateagents.entity.SysMenu;
|
13
|
|
-import com.huiju.estateagents.entity.TaRole;
|
14
|
|
-import com.huiju.estateagents.entity.TaRoleMenu;
|
|
12
|
+import com.huiju.estateagents.entity.*;
|
|
13
|
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
|
15
|
14
|
import com.huiju.estateagents.mapper.TaRoleMapper;
|
16
|
15
|
import com.huiju.estateagents.mapper.TaRoleMenuMapper;
|
17
|
16
|
import org.springframework.beans.factory.annotation.Autowired;
|
18
|
17
|
import org.springframework.stereotype.Service;
|
19
|
18
|
|
|
19
|
+import java.time.LocalDateTime;
|
20
|
20
|
import java.util.ArrayList;
|
21
|
21
|
import java.util.Arrays;
|
22
|
22
|
import java.util.List;
|
|
@@ -41,6 +41,9 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
|
41
|
41
|
@Autowired
|
42
|
42
|
private TaRoleMapper taRoleMapper;
|
43
|
43
|
|
|
44
|
+ @Autowired
|
|
45
|
+ private TaRoleButtonMapper taRoleButtonMapper;
|
|
46
|
+
|
44
|
47
|
/**
|
45
|
48
|
* 根据用户id获取授权菜单
|
46
|
49
|
* @param pageNum
|
|
@@ -77,11 +80,10 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
|
77
|
80
|
}
|
78
|
81
|
|
79
|
82
|
@Override
|
80
|
|
- public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgid) {
|
|
83
|
+ public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
|
81
|
84
|
ResponseBean responseBean = new ResponseBean();
|
82
|
85
|
if (null == roleId){
|
83
|
|
- Boolean isA = addUserAuthMenu( sysMenuList,name,orgid);
|
84
|
|
- responseBean.addSuccess(isA==true?"成功":"失败");
|
|
86
|
+ addUserAuthMenu( sysMenuList,name,orgId,sysButtonInMenuList);
|
85
|
87
|
return responseBean;
|
86
|
88
|
}
|
87
|
89
|
try {
|
|
@@ -97,9 +99,18 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
|
97
|
99
|
TaRole taRole = new TaRole();
|
98
|
100
|
taRole.setRoleId(roleId);
|
99
|
101
|
taRole.setRoleName(name);
|
100
|
|
- taRole.setOrgId(orgid);
|
101
|
102
|
taRoleMapper.updateById(taRole);
|
102
|
|
- responseBean.addSuccess("操作成功");
|
|
103
|
+
|
|
104
|
+ // 当前角色的所有按钮再重新插入
|
|
105
|
+
|
|
106
|
+ taRoleButtonMapper.deleteCurrentBut(roleId);
|
|
107
|
+ for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList) {
|
|
108
|
+ TaRoleButton taRoleButton = new TaRoleButton();
|
|
109
|
+ taRoleButton.setRoleId(taRole.getRoleId());
|
|
110
|
+ taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
|
|
111
|
+ taRoleButtonMapper.insert(taRoleButton);
|
|
112
|
+ }
|
|
113
|
+ responseBean.addSuccess("操作成功");
|
103
|
114
|
return responseBean;
|
104
|
115
|
} catch (Exception e) {
|
105
|
116
|
responseBean.addSuccess("操作失败");
|
|
@@ -108,18 +119,29 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
|
108
|
119
|
}
|
109
|
120
|
}
|
110
|
121
|
|
111
|
|
- public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgid) {
|
|
122
|
+ public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
|
112
|
123
|
ResponseBean responseBean = new ResponseBean();
|
113
|
124
|
try{
|
|
125
|
+ // 新增角色
|
114
|
126
|
TaRole taRole = new TaRole();
|
115
|
127
|
taRole.setRoleName(name);
|
116
|
|
- taRole.setOrgId(orgid);
|
|
128
|
+ taRole.setOrgId(orgId);
|
|
129
|
+ taRole.setCreateDate(LocalDateTime.now());
|
117
|
130
|
taRoleMapper.insert(taRole);
|
|
131
|
+
|
|
132
|
+ // 新增角色需要的菜单
|
118
|
133
|
for (SysMenu sysMenu: sysMenuList){
|
119
|
134
|
TaRoleMenu taRoleMenu = new TaRoleMenu();
|
120
|
135
|
taRoleMenu.setRoleId(taRole.getRoleId());
|
121
|
136
|
taRoleMenu.setMenuId(sysMenu.getMenuId());
|
122
|
137
|
taRoleMenuMapper.insert(taRoleMenu);
|
|
138
|
+ }
|
|
139
|
+ // 新增角色按钮
|
|
140
|
+ for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList){
|
|
141
|
+ TaRoleButton taRoleButton = new TaRoleButton();
|
|
142
|
+ taRoleButton.setRoleId(taRole.getRoleId());
|
|
143
|
+ taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
|
|
144
|
+ taRoleButtonMapper.insert(taRoleButton);
|
123
|
145
|
}
|
124
|
146
|
responseBean.addSuccess("操作成功");
|
125
|
147
|
return true;
|