Commit 272c3fc7 by 周海峰

添加公告角色方法

parent 5fc73721
......@@ -104,7 +104,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
"/api/ps/account_sel/**", "/znzl/file/**", "/auth/v1/**", "/auth/user/**",
"/error/**", "/weixin/wxuserinfo/**", "/weixin/information/**", "/auth/dt/**",
"/avatar/**", "/user/updateWxPlatformPersonnelByAccount", "/wechatApi/**",
"/PlatformUserFavoriteAppsController/**"
"/PlatformUserFavoriteAppsController/**", "/roleuser/addUserNoticeRole"
).permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证
......
......@@ -27,17 +27,19 @@ import com.metro.auth.platform.domain.ResultJson;
import com.metro.auth.platform.domain.auth.PlatformPersonnel;
import com.metro.auth.platform.domain.auth.PlatformSysRole;
import com.metro.auth.platform.domain.auth.PlatformSysUserRole;
import com.metro.auth.platform.outlineapi.PlatformUrlManager;
import com.metro.auth.platform.service.PlatformRoleUserService;
import org.apache.catalina.LifecycleState;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* @ClassName: PlatformRoleUserController
* @Description: ${description}
* @Description: ${description}
* @Authror zhouy
* @Date 2019-09-11 17:17
*/
......@@ -49,10 +51,10 @@ public class PlatformRoleUserController {
@Resource
PlatformRoleUserService platformRoleUserService;
/**
* 功能描述: <br>权限-用户列表
* 〈〉
*
* @Param: [pageNum, pageSize, platformSysRole]
* @Return: [pageNum, pageSize, platformSysRole]
* @Author: zhouy
......@@ -60,16 +62,17 @@ public class PlatformRoleUserController {
*/
@GetMapping("/pagedlist")
public ResultJson pagedlist(@RequestParam(required=true,value="pageNum",defaultValue="1") int pageNum,
@RequestParam(required=true,value="pageSize",defaultValue="15") int pageSize,
PlatformSysRole platformSysRole){
PageInfo<PlatformSysRole> page = platformRoleUserService.pageRoledlist(platformSysRole,pageNum,pageSize);
public ResultJson pagedlist(@RequestParam(required = true, value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(required = true, value = "pageSize", defaultValue = "15") int pageSize,
PlatformSysRole platformSysRole) {
PageInfo<PlatformSysRole> page = platformRoleUserService.pageRoledlist(platformSysRole, pageNum, pageSize);
return ResultJson.ok(page);
}
/**
* 功能描述: <br>权限-用户列表
* 〈〉
*
* @Param: [pageNum, pageSize, platformSysRole]
* @Return: [pageNum, pageSize, platformSysRole]
* @Author: zhouy
......@@ -77,10 +80,10 @@ public class PlatformRoleUserController {
*/
@GetMapping("/roleuserpagedlist")
public ResultJson roleuserpagedlist(@RequestParam(required=true,value="pageNum",defaultValue="1") int pageNum,
@RequestParam(required=true,value="pageSize",defaultValue="15") int pageSize,
PlatformPersonnel platformPersonnel){
PageInfo<PlatformPersonnel> page = platformRoleUserService.roleuserpagedlist(platformPersonnel,pageNum,pageSize);
public ResultJson roleuserpagedlist(@RequestParam(required = true, value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(required = true, value = "pageSize", defaultValue = "15") int pageSize,
PlatformPersonnel platformPersonnel) {
PageInfo<PlatformPersonnel> page = platformRoleUserService.roleuserpagedlist(platformPersonnel, pageNum, pageSize);
return ResultJson.ok(page);
}
......@@ -88,18 +91,20 @@ public class PlatformRoleUserController {
/**
* 周海峰
* 获取角色下的所有用户
*
* @param platformPersonnel
* @return
*/
@GetMapping("/roleuserlist")
public ResultJson roleuserpagedlist(PlatformPersonnel platformPersonnel){
List<PlatformSysUserRole> page = platformRoleUserService.roleuserlist(platformPersonnel);
public ResultJson roleuserpagedlist(PlatformPersonnel platformPersonnel) {
List<PlatformSysUserRole> page = platformRoleUserService.roleuserlist(platformPersonnel);
return ResultJson.ok(page);
}
/**
* 功能描述: <br>更新权限角色
* 〈〉
*
* @Param: [platformSysRole]
* @Return: [platformSysRole]
* @Author: zhouy
......@@ -107,32 +112,33 @@ public class PlatformRoleUserController {
*/
@RequestMapping("/editroleuser")
public ResultJson editroleuser(@RequestBody PlatformSysUserRole platformSysUserRole){
int count =platformRoleUserService.editroleuser(platformSysUserRole);
if (count>0){
public ResultJson editroleuser(@RequestBody PlatformSysUserRole platformSysUserRole) {
int count = platformRoleUserService.editroleuser(platformSysUserRole);
if (count > 0) {
return ResultJson.ok();
}else {
} else {
return ResultJson.failure(ResultCode.RESPONSE_ERROR);
}
}
@RequestMapping("/delUserRole")
public ResultJson delUserRole(@RequestBody PlatformSysUserRole platformSysUserRole){
int count =platformRoleUserService.delUserRole(platformSysUserRole);
if (count>0){
public ResultJson delUserRole(@RequestBody PlatformSysUserRole platformSysUserRole) {
int count = platformRoleUserService.delUserRole(platformSysUserRole);
if (count > 0) {
return ResultJson.ok();
}else {
} else {
return ResultJson.failure(ResultCode.RESPONSE_ERROR);
}
}
@RequestMapping("/addroleuser")
public ResultJson addroleuser(@RequestBody PlatformSysUserRole platformSysUserRole){
int count =platformRoleUserService.addroleuser(platformSysUserRole);
if (count>0){
public ResultJson addroleuser(@RequestBody PlatformSysUserRole platformSysUserRole) {
int count = platformRoleUserService.addroleuser(platformSysUserRole);
if (count > 0) {
return ResultJson.ok();
}else {
} else {
return ResultJson.failure(ResultCode.RESPONSE_ERROR);
}
......@@ -141,18 +147,47 @@ public class PlatformRoleUserController {
/**
* 周海峰20200307
* 保存角色用户信息(单角色多用户)
*
* @param map
* @return
*/
@RequestMapping("/editUserRoleList")
public ResultJson editUserRoleList(@RequestBody Map<String,String> map ){
int count =platformRoleUserService.editUserRoleList(map);
if (count>0){
public ResultJson editUserRoleList(@RequestBody Map<String, String> map) {
int count = platformRoleUserService.editUserRoleList(map);
if (count > 0) {
return ResultJson.ok();
}else {
} else {
return ResultJson.failure(ResultCode.SERVER_ERROR);
}
}
/**
* 给用户添加公告角色
*
* @param map 用户ID
*/
@PostMapping("/addUserNoticeRole")
public ResultJson addUserNoticeRole(@RequestBody Map<String, String> map) {
String roleId = PlatformUrlManager.notice_role_id;
String userId = map.get("userId");
PlatformPersonnel req = new PlatformPersonnel();
req.setId(Integer.parseInt(userId));
List<PlatformSysUserRole> platformSysUserRoles = platformRoleUserService.userRoleList(req);
List<String> collect = platformSysUserRoles.stream()
.map(PlatformSysUserRole::getRoleId)
.collect(Collectors.toList());
if (!collect.isEmpty() && collect.contains(roleId)) {
// 用户已拥有该角色,直接返回成功
return ResultJson.ok();
}
String id = UUID.randomUUID().toString().replace("-", "");
PlatformSysUserRole platformSysUserRole = new PlatformSysUserRole(id, Integer.parseInt(userId), roleId);
int count = platformRoleUserService.addUserRole(platformSysUserRole);
if (count > 0) {
return ResultJson.ok();
} else {
return ResultJson.failure(ResultCode.SERVER_ERROR);
}
}
}
......@@ -169,6 +169,17 @@ public class PlatformUrlManager {
*/
public static String API_USER_LOGIN_URL;
/**
* 公告发布角色ID
*/
public static String notice_role_id;
@Value("${notice-manage.notice_role_id}")
public void setNotice_role_id(String notice_role_id) {
PlatformUrlManager.notice_role_id = notice_role_id;
}
@Value("${weixin-params.wx_sToken}")
public void setWxSToken(String wxSToken) {WX_sToken = wxSToken;}
......
......@@ -95,11 +95,6 @@ public class PlatformApplicationsServiceImpl implements PlatformApplicationsServ
example.createCriteria().andQyflagEqualTo("1");
List<PlatformApplications> allApplications = platformApplicationsMapper.selectByExample(example);
// 2. 将所有应用转换为以ID为Key的Map,方便后续快速查找
// 使用 Collectors.toMap 是一个高效且清晰的做法
Map<Integer, PlatformApplications> appMap = allApplications.stream()
.collect(Collectors.toMap(PlatformApplications::getId, app -> app));
// 3. 安全地解析userid并查询用户角色
Set<String> roleIds = new HashSet<>();
int userIdInt = Integer.parseInt(userid);
......
......@@ -31,7 +31,7 @@ import java.util.Map;
/**
* @ClassName: PlatformRoleUserService
* @Description: ${description}
* @Description: ${description}
* @Authror zhouy
* @Date 2019-09-11 17:19
*/
......@@ -40,9 +40,30 @@ public interface PlatformRoleUserService {
PageInfo<PlatformSysRole> pageRoledlist(PlatformSysRole platformSysRole, int pageNum, int pageSize);
int editroleuser(PlatformSysUserRole platformSysUserRole);
int delUserRole(PlatformSysUserRole platformSysUserRole);
int editUserRoleList(Map<String,String> map);
PageInfo<PlatformPersonnel> roleuserpagedlist(PlatformPersonnel platformPersonnel,int pageNum, int pageSize);
int editUserRoleList(Map<String, String> map);
PageInfo<PlatformPersonnel> roleuserpagedlist(PlatformPersonnel platformPersonnel, int pageNum, int pageSize);
List<PlatformSysUserRole> roleuserlist(PlatformPersonnel platformPersonnel);
int addroleuser(PlatformSysUserRole platformSysUserRole);
/**
* 功能描述: <br>根据用户查询用户角色列表
*
* @param platformPersonnel
* @return
*/
List<PlatformSysUserRole> userRoleList(PlatformPersonnel platformPersonnel);
/**
* 功能描述: <br>新增用户角色
*
* @param platformSysUserRole
* @return
*/
int addUserRole(PlatformSysUserRole platformSysUserRole);
}
......@@ -47,7 +47,7 @@ import java.util.UUID;
/**
* @author zhouy
* @ClassName: PlatformRoleUserServiceImpl
* @Description: ${description}
* @Description: ${description}
* @Date 2019-09-11 17:22
*/
@Service
......@@ -72,6 +72,7 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
/**
* 功能描述: <br>用户角色功能查询角色信息
* 〈〉
*
* @Param: [platformSysRole, pageNum, pageSize]
* @Return: [platformSysRole, pageNum, pageSize]
* @Author: zhouy
......@@ -87,21 +88,21 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
PlatformSysRoleExample platformSysRoleExample = new PlatformSysRoleExample();
PlatformSysRoleExample.Criteria criteria = platformSysRoleExample.createCriteria();
if(platformSysRole!=null&&!EmptyUtilHelper.isEmpty(platformSysRole.getName())){
criteria.andNameLike("%"+platformSysRole.getName()+"%");
if (platformSysRole != null && !EmptyUtilHelper.isEmpty(platformSysRole.getName())) {
criteria.andNameLike("%" + platformSysRole.getName() + "%");
}else if (platformSysRole!=null&&!EmptyUtilHelper.isEmpty(platformSysRole.getNamezh())){
criteria.andNamezhLike("%"+platformSysRole.getNamezh()+"%");
} else if (platformSysRole != null && !EmptyUtilHelper.isEmpty(platformSysRole.getNamezh())) {
criteria.andNamezhLike("%" + platformSysRole.getNamezh() + "%");
}
List<PlatformSysRole> list = platformSysRoleMapper.selectByExample(platformSysRoleExample);
List<PlatformSysUserRole> userRoleList = this.userRolelist();
list.stream().forEach(t->{
for (int i=0;i<userRoleList.size();i++){
if(t.getId().equals(userRoleList.get(i).getRoleId())&&userRoleList.get(i).getUserId()==platformSysRole.getUserId()){
list.stream().forEach(t -> {
for (int i = 0; i < userRoleList.size(); i++) {
if (t.getId().equals(userRoleList.get(i).getRoleId()) && userRoleList.get(i).getUserId() == platformSysRole.getUserId()) {
t.setIsAdd("1");
break;
}else{
} else {
t.setIsAdd("2");
}
}
......@@ -114,6 +115,7 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
/**
* 功能描述: 修改用户角色权限信息
* 〈〉
*
* @Param: [platformSysUserRole]
* @Return: [platformSysUserRole]
* @Author: zhouy
......@@ -122,23 +124,23 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
@Override
public int editroleuser(PlatformSysUserRole platformSysUserRole) {
int count=0;
int count = 0;
//配置角色时候先删除原角色,不支持一个用户多个角色
PlatformSysUserRoleExample platformSysUserRoleExample = new PlatformSysUserRoleExample();
platformSysUserRoleExample.createCriteria()//.andRoleIdEqualTo(platformSysUserRole.getRoleId())
.andUserIdEqualTo(platformSysUserRole.getUserId());
if(!EmptyUtilHelper.isEmpty(platformSysUserRole.getUserId())){
if (!EmptyUtilHelper.isEmpty(platformSysUserRole.getUserId())) {
// count = platformSysUserRoleMapper.deleteByExample(platformSysUserRoleExample);
}
if(platformSysUserRole!=null&& "1".equals(platformSysUserRole.getAction())){
if (platformSysUserRole != null && "1".equals(platformSysUserRole.getAction())) {
platformSysUserRole.setId(StrUtil.makePramykey());
count = platformSysUserRoleMapper.insert(platformSysUserRole);
if(count>0){
platformPersonnelMapper.updateRoleByUserid(platformSysUserRole.getUserId(),platformSysUserRole.getRoleId());
count = platformSysUserRoleMapper.insert(platformSysUserRole);
if (count > 0) {
platformPersonnelMapper.updateRoleByUserid(platformSysUserRole.getUserId(), platformSysUserRole.getRoleId());
}
}else{
if(count>0){
platformPersonnelMapper.updateRoleByUserid(platformSysUserRole.getUserId(),"");
} else {
if (count > 0) {
platformPersonnelMapper.updateRoleByUserid(platformSysUserRole.getUserId(), "");
}
}
......@@ -146,10 +148,10 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
}
@Override
public int addroleuser(PlatformSysUserRole platformSysUserRole){
public int addroleuser(PlatformSysUserRole platformSysUserRole) {
platformSysUserRoleMapper.deleteByroleId(platformSysUserRole.getRoleId());
List<PlatformSysUserRole> list = platformSysUserRole.getContactList();
if(list.size()>0){
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
PlatformSysUserRole contact = list.get(i);
contact.setId(StrUtil.makePramykey());
......@@ -159,29 +161,30 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
}
return 1;
}
@Override
public int delUserRole(PlatformSysUserRole platformSysUserRole) {
int count=0;
int count = 0;
//配置角色时候先删除原角色,不支持一个用户多个角色
PlatformSysUserRoleExample platformSysUserRoleExample = new PlatformSysUserRoleExample();
platformSysUserRoleExample.createCriteria()//.andRoleIdEqualTo(platformSysUserRole.getRoleId())
.andUserIdEqualTo(platformSysUserRole.getUserId()).andRoleIdEqualTo(platformSysUserRole.getRoleId());
if(!EmptyUtilHelper.isEmpty(platformSysUserRole.getUserId()) && !EmptyUtilHelper.isEmpty(platformSysUserRole.getRoleId())){
if (!EmptyUtilHelper.isEmpty(platformSysUserRole.getUserId()) && !EmptyUtilHelper.isEmpty(platformSysUserRole.getRoleId())) {
count = platformSysUserRoleMapper.deleteByExample(platformSysUserRoleExample);
}
return count;
}
@Override
public int editUserRoleList(Map<String,String> map) {
public int editUserRoleList(Map<String, String> map) {
String roleid = map.get("roleId");
String userids = map.get("userIds");
int count=0;
if(EmptyUtilHelper.isEmpty(roleid)){
return 0 ;
int count = 0;
if (EmptyUtilHelper.isEmpty(roleid)) {
return 0;
}
if(EmptyUtilHelper.isEmpty(userids)){
if (EmptyUtilHelper.isEmpty(userids)) {
platformSysUserRoleMapper.deleteByroleId(roleid);
return 1;
}
......@@ -189,21 +192,21 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
//获取数据库中当前的角色用户
PlatformSysUserRoleExample example = new PlatformSysUserRoleExample();
example.createCriteria().andRoleIdEqualTo(roleid);
List<PlatformSysUserRole> cu_list = platformSysUserRoleMapper.selectByExample(example);
List<PlatformSysUserRole> cu_list = platformSysUserRoleMapper.selectByExample(example);
String[] strs = userids.split(",");
List<Integer> u_list = new ArrayList<>();//前台传回的用户
for(int i=0;i<strs.length;i++){
for (int i = 0; i < strs.length; i++) {
int u = Integer.parseInt(strs[i]);
u_list.add(u);
}
//遍历两个结合重复的代表不用修改,移除
for(int i=0;i<cu_list.size();i++){
for (int i = 0; i < cu_list.size(); i++) {
PlatformSysUserRole ur = cu_list.get(i);
for(int k=0;k<u_list.size();k++){
for (int k = 0; k < u_list.size(); k++) {
Integer u = u_list.get(k);
if(u.compareTo(ur.getUserId())==0){
if (u.compareTo(ur.getUserId()) == 0) {
cu_list.remove(ur);
i--;
u_list.remove(u);
......@@ -214,15 +217,15 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
}
//此时cu_list中剩余的删掉
if(cu_list.size()>0){
if (cu_list.size() > 0) {
platformSysUserRoleMapper.batchDeleteById(cu_list);
}
//此时u_list中剩余的新增
if(u_list.size()>0){
if (u_list.size() > 0) {
List<PlatformSysUserRole> add_list = new ArrayList<>();
for (int i=0;i<u_list.size();i++){
for (int i = 0; i < u_list.size(); i++) {
PlatformSysUserRole entity =
new PlatformSysUserRole(StrUtil.makePramykey(),u_list.get(i),roleid);
new PlatformSysUserRole(StrUtil.makePramykey(), u_list.get(i), roleid);
add_list.add(entity);
}
platformSysUserRoleMapper.batchInsert(add_list);
......@@ -235,6 +238,7 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
/**
* 功能描述: <br>角色用户列表
* 〈〉
*
* @Param: [platformPersonnel, pageNum, pageSize]
* @Return: [platformPersonnel, pageNum, pageSize]
* @Author: zhouy
......@@ -243,28 +247,9 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
@Override
public PageInfo<PlatformPersonnel> roleuserpagedlist(PlatformPersonnel platformPersonnel, int pageNum, int pageSize) {
PageHelper.startPage(pageNum, pageSize);
// PlatformPersonnelExample platformPersonnelExample = new PlatformPersonnelExample();
// PlatformPersonnelExample.Criteria criteria = platformPersonnelExample.createCriteria();
// if (platformPersonnel!=null){
// if (!EmptyUtilHelper.isEmpty(platformPersonnel.getAccount())){
// criteria.andAccountLike("%"+platformPersonnel.getAccount()+"%");
// }
// if (!EmptyUtilHelper.isEmpty(platformPersonnel.getUsername())){
// criteria.andUsernameLike("%"+platformPersonnel.getUsername()+"%");
// }
// if(!EmptyUtilHelper.isEmpty(platformPersonnel.getRole())){
// criteria.andRoleEqualTo(platformPersonnel.getRole());
// }
// }
// List<PlatformPersonnel> list=platformPersonnelMapper.selectByExample(platformPersonnelExample);
List<PlatformPersonnel> list = platformPersonnelMapper.selectByroleId(platformPersonnel.getRole());
PageInfo<PlatformPersonnel> pageInfo = new PageInfo<>(list);
return pageInfo;
return new PageInfo<>(list);
}
......@@ -272,22 +257,42 @@ public class PlatformRoleUserServiceImpl implements PlatformRoleUserService {
public List<PlatformSysUserRole> roleuserlist(PlatformPersonnel platformPersonnel) {
PlatformSysUserRoleExample example = new PlatformSysUserRoleExample();
example.createCriteria().andRoleIdEqualTo(platformPersonnel.getRole());
List<PlatformSysUserRole> list = platformSysUserRoleMapper.selectByExample(example);
return list;
return platformSysUserRoleMapper.selectByExample(example);
}
/**
* 功能描述: <b>用户角色信息
* 〈〉
*
* @Param: []
* @Return: []
* @Author: zhouy
* @Date: 2019-09-12 09:36
*/
public List<PlatformSysUserRole> userRolelist(){
public List<PlatformSysUserRole> userRolelist() {
PlatformSysUserRoleExample platformSysUserRoleExample = new PlatformSysUserRoleExample();
return platformSysUserRoleMapper.selectByExample(platformSysUserRoleExample);
}
/**
* 功能描述: <br>根据用户查询用户角色列表
*
* @param platformPersonnel
* @return
*/
@Override
public List<PlatformSysUserRole> userRoleList(PlatformPersonnel platformPersonnel) {
PlatformSysUserRoleExample example = new PlatformSysUserRoleExample();
example.createCriteria().andUserIdEqualTo(platformPersonnel.getId());
return platformSysUserRoleMapper.selectByExample(example);
}
/**
* 功能描述: <br>新增用户角色
* @param platformSysUserRole
* @return
*/
public int addUserRole(PlatformSysUserRole platformSysUserRole){
return platformSysUserRoleMapper.insert(platformSysUserRole);
}
}
......@@ -119,6 +119,8 @@ metro-daily:
daily_entity_url : ${IP.url-daily}/md/MetroDailyAssembleController/metroDailyAssemble
#公告
notice-manage:
# 公告系统调用设置角色方法时,设置的角色id
notice_role_id: db0a394ec1af4ebba6cb85be1043eb7d
#栏目全部列表
api_column_url : ${IP.url-notice}/NoticeManage/api/portalController/listColumn
#栏目列表-可见范围内
......
......@@ -114,6 +114,8 @@ metro-daily:
daily_entity_url : http://10.12.111.48:6107/znzl/MetroDailyAssembleController/metroDailyAssemble
notice-manage:
# 公告系统调用设置角色方法时,设置的角色id
notice_role_id: db0a394ec1af4ebba6cb85be1043eb7d
#栏目全部列表
api_column_url : http://localhost:9083/NoticeManage/api/portalController/listColumn
#栏目列表-可见范围内
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论