Skip to content

S
sv-springboot
Commit 498b9063 by Suvalue
Options

1.菜单配置接口 

2.角色配置接口
3.机构配置接口
parent 2cd91dc8
Showing with 921 additions and 18 deletions
bsoft-admin/src/main/java/com/bsoft/admin/controller/MenuController.java
......@@ -4,9 +4,9 @@ import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.SysRoleMenuRs;
import com.bsoft.admin.model.SysUserMenuRs;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.reqmodel.RoleReq;
import com.bsoft.admin.service.SysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -74,4 +74,42 @@ public class MenuController {
else
return Result.error();
}
@PostMapping("usermenu")
@Token
@ApiOperation("查询用户菜单")
public Object getUserMenu(@RequestBody MenuReq.GetUserMenuReq menu)throws Exception{
List<SysUserMenuRs> list = sysMenuService.getUserMenu(menu.getUserId());
return Result.success(list);
}
@PostMapping("saveusermenu")
@Token
@ApiOperation("保存用户菜单")
public Object saveUserMenu(@ApiIgnore @CurrentUser Long userId,@RequestBody MenuReq.SaveUserMenuReq menu)throws Exception{
boolean result = sysMenuService.saveUserMenu(userId,menu);
if(result)
return Result.success(null);
else
return Result.error();
}
@PostMapping("rolemenu")
@Token
@ApiOperation("查询角色菜单")
public Object getRoleMenu(@RequestBody MenuReq.GetRoleMenuReq menu)throws Exception{
List<SysRoleMenuRs> list = sysMenuService.getRoleMenu(menu.getRoleId());
return Result.success(list);
}
@PostMapping("saverolemenu")
@Token
@ApiOperation("保存角色菜单")
public Object saveRoleMenu(@ApiIgnore @CurrentUser Long userId,@RequestBody MenuReq.SaveRoleMenuReq menu)throws Exception{
boolean result = sysMenuService.saveRoleMenu(userId,menu);
if(result)
return Result.success(null);
else
return Result.error();
}
}
bsoft-admin/src/main/java/com/bsoft/admin/controller/OrgController.java 0 → 100644
package com.bsoft.admin.controller;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.SysUserOrgRs;
import com.bsoft.admin.model.reqmodel.OrgReq;
import com.bsoft.admin.service.DicOrgService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@Api(tags = "机构API",produces="produces",consumes="consumes",protocols="protocols")
@RequestMapping("/org")
@RestController
public class OrgController {
@Autowired
private DicOrgService dicOrgService;
@PostMapping("all")
@Token
@ApiOperation("查询机构列表")
public Object getAll(@RequestBody OrgReq.GetOrgReq org)throws Exception{
List<DicOrg> list = dicOrgService.getAll(org);
return Result.success(list);
}
@PostMapping("info")
@Token
@ApiOperation("查询机构详细信息")
public Object getById(@RequestBody OrgReq.InfoOrgReq org)throws Exception{
DicOrg info = dicOrgService.info(org.getOrgId());
return Result.success(info);
}
@PostMapping("add")
@Token
@ApiOperation("添加机构")
public Object addUser(@ApiIgnore @CurrentUser Long userId, @RequestBody OrgReq.AddOrgReq org)throws Exception{
DicOrg sysRole = dicOrgService.getByName(org.getOrgName());
if(sysRole!=null){
return Result.error("该机构已存在！");
}
boolean result = dicOrgService.addOrg(userId,org);
if(result)
return Result.success(null);
else
return Result.error();
}
@PostMapping("delete")
@Token
@ApiOperation("删除机构")
public Object addUser(@RequestBody OrgReq.DeleteOrgReq org)throws Exception{
boolean result = dicOrgService.deleteOrg(org);
if(result)
return Result.success(null);
else
return Result.error();
}
@PostMapping("update")
@Token
@ApiOperation("修改机构")
public Object addUser(@RequestBody OrgReq.UpdateOrgReq org)throws Exception{
DicOrg reqDic = dicOrgService.info(org.getOrgId());
DicOrg nameRole = dicOrgService.getByName(org.getOrgName());
if(reqDic!=null){
if(nameRole!=null&&!nameRole.getOrgName().equals(reqDic.getOrgName())){
return Result.error("该机构已存在");
}
}
boolean result = dicOrgService.updateOrg(org);
if(result)
return Result.success(null);
else
return Result.error();
}
@PostMapping("userorg")
@Token
@ApiOperation("查询用户机构")
public Object getUserOrg(@RequestBody OrgReq.GetUserOrgReq org)throws Exception{
SysUserOrgRs info = dicOrgService.getUserOrg(org.getUserId());
return Result.success(info);
}
@PostMapping("saveuserorg")
@Token
@ApiOperation("保存用户机构")
public Object saveUserOrg(@ApiIgnore @CurrentUser Long userId,@RequestBody OrgReq.SaveUserOrgReq org)throws Exception{
boolean result = dicOrgService.saveUserOrg(userId,org);
if(result)
return Result.success(null);
else
return Result.error();
}
}
bsoft-admin/src/main/java/com/bsoft/admin/mapper/DicOrgMapper.java
......@@ -17,4 +17,6 @@ public interface DicOrgMapper {
int updateByPrimaryKey(DicOrg record);
List<DicOrg> selectByUser(@Param("userId") Long userId);
DicOrg selectByName(@Param("orgName") String orgName);
}
\ No newline at end of file
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysRoleMenuRsMapper.java
package com.bsoft.admin.mapper;
import com.bsoft.admin.model.SysRoleMenuRs;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface SysRoleMenuRsMapper {
......@@ -13,4 +15,8 @@ public interface SysRoleMenuRsMapper {
List<SysRoleMenuRs> selectAll();
int updateByPrimaryKey(SysRoleMenuRs record);
List<SysRoleMenuRs> selectByRole(@Param("roleId") Long roleId);
int deleteAllByRole(@Param("roleId") Long roleId);
}
\ No newline at end of file
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysUserMenuRsMapper.java
package com.bsoft.admin.mapper;
import com.bsoft.admin.model.SysUserMenuRs;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface SysUserMenuRsMapper {
......@@ -13,4 +15,8 @@ public interface SysUserMenuRsMapper {
List<SysUserMenuRs> selectAll();
int updateByPrimaryKey(SysUserMenuRs record);
List<SysUserMenuRs> selectByUser(@Param("userId") Long userId);
int deleteAllByUser(@Param("userId") Long userId);
}
\ No newline at end of file
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysUserOrgRsMapper.java
package com.bsoft.admin.mapper;
import com.bsoft.admin.model.SysUserOrgRs;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface SysUserOrgRsMapper {
......@@ -13,4 +15,6 @@ public interface SysUserOrgRsMapper {
List<SysUserOrgRs> selectAll();
int updateByPrimaryKey(SysUserOrgRs record);
SysUserOrgRs selectByUser(@Param("userId") Long userId);
}
\ No newline at end of file
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysUserRoleRsMapper.java
......@@ -2,6 +2,7 @@ package com.bsoft.admin.mapper;
import com.bsoft.admin.model.SysUserRoleRs;
import com.bsoft.admin.model.SysRole;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/MenuReq.java
......@@ -3,6 +3,7 @@ package com.bsoft.admin.model.reqmodel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
import java.util.List;
public class MenuReq {
public static class GetMenuReq{
......@@ -220,5 +221,110 @@ public class MenuReq {
}
}
/**
* 保存用户菜单入参
*/
public static class SaveUserMenuReq{
@ApiModelProperty(value="用户ID",required = true)
@NotNull(message = "用户ID 参数必传")
private Long userId;
@ApiModelProperty(value="菜单ID集合",required = true)
@NotNull(message = "菜单ID集合 参数必传")
private List<Long> menus;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public List<Long> getMenus() {
return menus;
}
public void setMenus(List<Long> menus) {
this.menus = menus;
}
@Override
public String toString() {
return "SelectUserMenuReq{" +
"userId=" + userId +
", menus=" + menus +
'}';
}
}
/**
* 查询用户菜单入参
*/
public static class GetUserMenuReq{
@ApiModelProperty(value="用户ID",required = true)
@NotNull(message = "用户ID 参数必传")
private Long userId;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
@Override
public String toString() {
return "GetUserMenuReq{" +
"userId=" + userId +
'}';
}
}
/**
* 保存角色菜单入参
*/
public static class SaveRoleMenuReq{
@ApiModelProperty(value="角色ID",required = true)
@NotNull(message = "角色ID 参数必传")
private Long roleId;
@ApiModelProperty(value="菜单ID集合",required = true)
@NotNull(message = "菜单ID集合 参数必传")
private List<Long> menus;
public Long getRoleId() {
return roleId;
}
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
public List<Long> getMenus() {
return menus;
}
public void setMenus(List<Long> menus) {
this.menus = menus;
}
}
/**
* 查询角色菜单入参
*/
public static class GetRoleMenuReq{
@ApiModelProperty(value="角色ID",required = true)
@NotNull(message = "角色ID 参数必传")
private Long roleId;
public Long getRoleId() {
return roleId;
}
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
}
}
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/OrgReq.java 0 → 100644
package com.bsoft.admin.model.reqmodel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
public class OrgReq {
public static class GetOrgReq{
@ApiModelProperty(value="机构名称",required = true)
private String orgName;
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
@Override
public String toString() {
return "GetOrgReq{" +
"orgName='" + orgName + '\'' +
'}';
}
}
public static class InfoOrgReq{
@ApiModelProperty(value="机构ID",required = true)
@NotNull(message = "机构ID 参数必传")
private Long orgId;
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
@Override
public String toString() {
return "InfoOrgReq{" +
"orgId=" + orgId +
'}';
}
}
public static class AddOrgReq{
@ApiModelProperty(value="组织机构代码",required = true)
@NotNull(message = "组织机构代码 参数必传")
private String orgCode;
@ApiModelProperty(value="机构名称",required = true)
@NotNull(message = "机构名称 参数必传")
private String orgName;
@ApiModelProperty(value="登记号",required = true)
private String orgNo;
@ApiModelProperty(value="机构简称",required = true)
@NotNull(message = "机构简称 参数必传")
private String orgShortName;
@ApiModelProperty(value="机构分类",required = true)
private String orgGroup;
@ApiModelProperty(value="机构类型",required = true)
private String orgType;
@ApiModelProperty(value="地址",required = true)
private String orgAddress;
@ApiModelProperty(value="父级关系",required = true)
@NotNull(message = "父级关系 参数必传")
private Long parentId;
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOrgNo() {
return orgNo;
}
public void setOrgNo(String orgNo) {
this.orgNo = orgNo;
}
public String getOrgShortName() {
return orgShortName;
}
public void setOrgShortName(String orgShortName) {
this.orgShortName = orgShortName;
}
public String getOrgGroup() {
return orgGroup;
}
public void setOrgGroup(String orgGroup) {
this.orgGroup = orgGroup;
}
public String getOrgType() {
return orgType;
}
public void setOrgType(String orgType) {
this.orgType = orgType;
}
public String getOrgAddress() {
return orgAddress;
}
public void setOrgAddress(String orgAddress) {
this.orgAddress = orgAddress;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
@Override
public String toString() {
return "AddOrgReq{" +
"orgCode='" + orgCode + '\'' +
", orgName='" + orgName + '\'' +
", orgNo='" + orgNo + '\'' +
", orgShortName='" + orgShortName + '\'' +
", orgGroup='" + orgGroup + '\'' +
", orgType='" + orgType + '\'' +
", orgAddress='" + orgAddress + '\'' +
", parentId=" + parentId +
'}';
}
}
public static class DeleteOrgReq{
@ApiModelProperty(value="机构ID",required = true)
@NotNull(message = "机构ID 参数必传")
private Long orgId;
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
@Override
public String toString() {
return "InfoOrgReq{" +
"orgId=" + orgId +
'}';
}
}
public static class UpdateOrgReq{
@ApiModelProperty(value="机构ID",required = true)
@NotNull(message = "机构ID 参数必传")
private Long orgId;
@ApiModelProperty(value="组织机构代码",required = true)
@NotNull(message = "组织机构代码 参数必传")
private String orgCode;
@ApiModelProperty(value="机构名称",required = true)
@NotNull(message = "机构名称 参数必传")
private String orgName;
@ApiModelProperty(value="登记号",required = true)
private String orgNo;
@ApiModelProperty(value="机构简称",required = true)
@NotNull(message = "机构简称 参数必传")
private String orgShortName;
@ApiModelProperty(value="机构分类",required = true)
private String orgGroup;
@ApiModelProperty(value="机构类型",required = true)
private String orgType;
@ApiModelProperty(value="地址",required = true)
private String orgAddress;
@ApiModelProperty(value="父级关系",required = true)
@NotNull(message = "父级关系 参数必传")
private Long parentId;
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOrgNo() {
return orgNo;
}
public void setOrgNo(String orgNo) {
this.orgNo = orgNo;
}
public String getOrgShortName() {
return orgShortName;
}
public void setOrgShortName(String orgShortName) {
this.orgShortName = orgShortName;
}
public String getOrgGroup() {
return orgGroup;
}
public void setOrgGroup(String orgGroup) {
this.orgGroup = orgGroup;
}
public String getOrgType() {
return orgType;
}
public void setOrgType(String orgType) {
this.orgType = orgType;
}
public String getOrgAddress() {
return orgAddress;
}
public void setOrgAddress(String orgAddress) {
this.orgAddress = orgAddress;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
@Override
public String toString() {
return "Update{" +
"orgId=" + orgId +
", orgCode='" + orgCode + '\'' +
", orgName='" + orgName + '\'' +
", orgNo='" + orgNo + '\'' +
", orgShortName='" + orgShortName + '\'' +
", orgGroup='" + orgGroup + '\'' +
", orgType='" + orgType + '\'' +
", orgAddress='" + orgAddress + '\'' +
", parentId=" + parentId +
'}';
}
}
/**
* 查询用户机构入参
*/
public static class GetUserOrgReq{
@ApiModelProperty(value="用户ID",required = true)
@NotNull(message = "用户ID 参数必传")
private Long userId;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
@Override
public String toString() {
return "GetUserOrgReq{" +
"userId=" + userId +
'}';
}
}
/**
* 配置用户机构入参
*/
public static class SaveUserOrgReq{
@ApiModelProperty(value="用户ID",required = true)
@NotNull(message = "用户ID 参数必传")
private Long userId;
@ApiModelProperty(value="机构ID",required = true)
@NotNull(message = "机构ID 参数必传")
private Long orgId;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
@Override
public String toString() {
return "SelectUserOrgReq{" +
"userId=" + userId +
", orgId=" + orgId +
'}';
}
}
}
bsoft-admin/src/main/java/com/bsoft/admin/service/DicOrgService.java 0 → 100644
package com.bsoft.admin.service;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.SysUserOrgRs;
import com.bsoft.admin.model.reqmodel.OrgReq;
import java.util.List;
public interface DicOrgService {
List<DicOrg> getAll(OrgReq.GetOrgReq org);
DicOrg info(Long orgId);
boolean addOrg(Long userId,OrgReq.AddOrgReq org);
boolean deleteOrg(OrgReq.DeleteOrgReq org);
boolean updateOrg(OrgReq.UpdateOrgReq org);
DicOrg getByName(String orgName);
SysUserOrgRs getUserOrg(Long userId);
boolean saveUserOrg(Long userId,OrgReq.SaveUserOrgReq org);
}
bsoft-admin/src/main/java/com/bsoft/admin/service/SysMenuService.java
package com.bsoft.admin.service;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.SysRoleMenuRs;
import com.bsoft.admin.model.SysUserMenuRs;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
......@@ -17,4 +19,8 @@ public interface SysMenuService {
boolean addMenu(Long userId,MenuReq.AddMenuReq menu);
boolean deleteMenu(MenuReq.DeleteMenuReq menu);
boolean updateMenu(MenuReq.UpdateMenuReq menu);
List<SysUserMenuRs> getUserMenu(Long userId);
boolean saveUserMenu(Long userId,MenuReq.SaveUserMenuReq menu);
List<SysRoleMenuRs> getRoleMenu(Long roleId);
boolean saveRoleMenu(Long userId,MenuReq.SaveRoleMenuReq menu);
}
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/DicOrgServiceImpl.java 0 → 100644
package com.bsoft.admin.service.impl;
import com.bsoft.admin.common.enums.StateType;
import com.bsoft.admin.mapper.DicOrgMapper;
import com.bsoft.admin.mapper.SysUserOrgRsMapper;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.SysUserOrgRs;
import com.bsoft.admin.model.reqmodel.OrgReq;
import com.bsoft.admin.service.DicOrgService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class DicOrgServiceImpl implements DicOrgService {
@Resource
private DicOrgMapper dicOrgMapper;
@Resource
private SysUserOrgRsMapper sysUserOrgRsMapper;
public List<DicOrg> getAll(OrgReq.GetOrgReq org){
List<DicOrg> list = dicOrgMapper.selectAll();
if(org.getOrgName()!=null){
list = list.stream().filter(
o->(o.getOrgName()!=null && o.getOrgName().toLowerCase().contains(org.getOrgName().toLowerCase())))
.collect(Collectors.toList());
}
return list;
}
public DicOrg info(Long orgId){
DicOrg dicOrg = dicOrgMapper.selectByPrimaryKey(orgId);
return dicOrg;
}
public boolean addOrg(Long userId,OrgReq.AddOrgReq org){
if(org!=null){
DicOrg dicOrg = new DicOrg();
dicOrg.setCreateDate(new Date());
dicOrg.setCreateUserid(userId);
dicOrg.setState((short) StateType.ON.getValue());
dicOrg.setOrgCode(org.getOrgCode());
dicOrg.setOrgName(org.getOrgName());
dicOrg.setOrgShortName(org.getOrgShortName());
dicOrg.setOrgGroup(org.getOrgGroup());
dicOrg.setOrgType(org.getOrgType());
dicOrg.setOrgAddress(org.getOrgAddress());
dicOrg.setParentId(org.getParentId());
dicOrgMapper.insert(dicOrg);
return true;
}
return false;
}
public boolean deleteOrg(OrgReq.DeleteOrgReq org){
if(org!=null){
DicOrg dicOrg = dicOrgMapper.selectByPrimaryKey(org.getOrgId());
if(dicOrg!=null){
dicOrg.setState((short) StateType.OFF.getValue());
dicOrgMapper.updateByPrimaryKey(dicOrg);
return true;
}
}
return false;
}
public boolean updateOrg(OrgReq.UpdateOrgReq org){
if(org!=null) {
DicOrg dicOrg = dicOrgMapper.selectByPrimaryKey(org.getOrgId());
if(dicOrg!=null){
dicOrg.setOrgCode(org.getOrgCode());
dicOrg.setOrgName(org.getOrgName());
dicOrg.setOrgShortName(org.getOrgShortName());
dicOrg.setOrgGroup(org.getOrgGroup());
dicOrg.setOrgType(org.getOrgType());
dicOrg.setOrgAddress(org.getOrgAddress());
dicOrg.setParentId(org.getParentId());
dicOrgMapper.updateByPrimaryKey(dicOrg);
return true;
}
}
return false;
}
public DicOrg getByName(String orgName){
return dicOrgMapper.selectByName(orgName);
}
/**
* 查询用户机构
* @param userId 操作人ID
* @return
*/
@Override
public SysUserOrgRs getUserOrg(Long userId){
SysUserOrgRs sysUserOrgRs = sysUserOrgRsMapper.selectByUser(userId);
return sysUserOrgRs;
}
@Override
public boolean saveUserOrg(Long userId,OrgReq.SaveUserOrgReq org){
if(org!=null&&org.getOrgId()!=null&&org.getUserId()!=null){
int result = 0;
//判断是否存在关系数据
SysUserOrgRs sysUserOrgRs = sysUserOrgRsMapper.selectByUser(org.getUserId());
if(sysUserOrgRs!=null){
//修改
sysUserOrgRs.setOrgId(org.getOrgId());
result = sysUserOrgRsMapper.updateByPrimaryKey(sysUserOrgRs);
}else{
//添加
sysUserOrgRs = new SysUserOrgRs();
sysUserOrgRs.setOrgId(org.getOrgId());
sysUserOrgRs.setUserId(org.getUserId());
sysUserOrgRs.setCreateDate(new Date());
sysUserOrgRs.setCreateUserid(userId);
sysUserOrgRs.setState((short) StateType.ON.getValue());
result = sysUserOrgRsMapper.insert(sysUserOrgRs);
}
return result>0;
}
return false;
}
}
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/SysMenuServiceImpl.java
......@@ -2,14 +2,20 @@ package com.bsoft.admin.service.impl;
import com.bsoft.admin.common.enums.StateType;
import com.bsoft.admin.mapper.SysMenuMapper;
import com.bsoft.admin.mapper.SysRoleMenuRsMapper;
import com.bsoft.admin.mapper.SysUserMenuRsMapper;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.SysRoleMenuRs;
import com.bsoft.admin.model.SysUserMenuRs;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
import com.bsoft.admin.service.SysMenuService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.beans.Transient;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
......@@ -21,6 +27,10 @@ public class SysMenuServiceImpl implements SysMenuService {
@Resource
private SysMenuMapper sysMenuMapper;
@Resource
private SysUserMenuRsMapper sysUserMenuRsMapper;
@Resource
private SysRoleMenuRsMapper sysRoleMenuRsMapper;
@Override
public List<SysMenuList> getMenu(Long userId) throws Exception {
......@@ -80,7 +90,7 @@ public class SysMenuServiceImpl implements SysMenuService {
return false;
}
@Override
public boolean deleteMenu(MenuReq.DeleteMenuReq menu){
if(menu!=null){
SysMenu sysMenu = sysMenuMapper.selectByPrimaryKey(menu.getMenuId());
......@@ -93,6 +103,7 @@ public class SysMenuServiceImpl implements SysMenuService {
return false;
}
@Override
public boolean updateMenu(MenuReq.UpdateMenuReq menu) {
if(menu!=null) {
SysMenu sysMenu = sysMenuMapper.selectByPrimaryKey(menu.getMenuId());
......@@ -109,6 +120,75 @@ public class SysMenuServiceImpl implements SysMenuService {
return false;
}
/**
* 查询用户菜单关系
* @param userId 用户ID
* @return
*/
@Override
public List<SysUserMenuRs> getUserMenu(Long userId){
List<SysUserMenuRs> list = sysUserMenuRsMapper.selectByUser(userId);
return list;
}
/**
* 用户配置菜单
* @param userId 操作人ID
* @param menu 用户菜单关系数据
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveUserMenu(Long userId,MenuReq.SaveUserMenuReq menu){
if(menu!=null&&menu.getMenus()!=null&&menu.getMenus().size()>0&&menu.getUserId()!=null){
sysUserMenuRsMapper.deleteAllByUser(menu.getUserId());
int result = 0;
for (Long menuId:menu.getMenus()) {
SysUserMenuRs um = new SysUserMenuRs();
um.setCreateDate(new Date());
um.setState((short)StateType.ON.getValue());
um.setCreateUserid(userId);
um.setUserId(menu.getUserId());
um.setMenuId(menuId);
sysUserMenuRsMapper.insert(um);
result++;
}
return result>0;
}
return false;
}
/**
* 查询角色菜单关系
* @param roleId 角色ID
* @return
*/
@Override
public List<SysRoleMenuRs> getRoleMenu(Long roleId){
List<SysRoleMenuRs> list = sysRoleMenuRsMapper.selectByRole(roleId);
return list;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveRoleMenu(Long userId,MenuReq.SaveRoleMenuReq menu){
if(menu!=null&&menu.getMenus()!=null&&menu.getMenus().size()>0&&menu.getRoleId()!=null){
sysRoleMenuRsMapper.deleteAllByRole(menu.getRoleId());
int result = 0;
for (Long menuId:menu.getMenus()) {
SysRoleMenuRs rm= new SysRoleMenuRs();
rm.setCreateDate(new Date());
rm.setState((short)StateType.ON.getValue());
rm.setCreateUserid(userId);
rm.setRoleId(menu.getRoleId());
rm.setMenuId(menuId);
sysRoleMenuRsMapper.insert(rm);
result++;
}
return result>0;
}
return false;
}
}
bsoft-admin/src/main/resources/mapper/DicOrgMapper.xml
......@@ -23,11 +23,11 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_DIC_ORG_ID.nextval from dual
</selectKey>
insert into DIC_ORG (CREATE_DATE, CREATE_USERID, "STATE",
insert into DIC_ORG (ID,CREATE_DATE, CREATE_USERID, "STATE",
ORG_CODE, ORG_NAME, ORG_NO,
ORG_SHORT_NAME, ORG_GROUP, ORG_TYPE,
ORG_ADDRESS, PARENT_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{orgCode,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, #{orgNo,jdbcType=VARCHAR},
#{orgShortName,jdbcType=VARCHAR}, #{orgGroup,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR},
#{orgAddress,jdbcType=VARCHAR}, #{parentId,jdbcType=DECIMAL})
......@@ -63,4 +63,7 @@
FROM SYS_USER_ORG_RS uor,DIC_ORG o
where uor.ORG_ID=o.ID and uor.USER_ID= #{userId,jdbcType=DECIMAL}
</select>
<select id="selectByName" resultMap="BaseResultMap">
select * from DIC_ORG where ORG_NAME=#{orgName,jdbcType=VARCHAR}
</select>
</mapper>
\ No newline at end of file
bsoft-admin/src/main/resources/mapper/SysMenuMapper.xml
......@@ -22,11 +22,11 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_MENU_ID.nextval from dual
</selectKey>
insert into SYS_MENU (CREATE_DATA, CREATE_USERID, "STATE",
insert into SYS_MENU (ID,CREATE_DATA, CREATE_USERID, "STATE",
MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID, PAGE_CODE, SORT
)
values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
values (#{id,jdbcType=DECIMAL},#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{menuName,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, #{menuImage,jdbcType=VARCHAR},
#{parentId,jdbcType=DECIMAL}, #{pageCode,jdbcType=VARCHAR}, #{sort,jdbcType=DECIMAL}
)
......
bsoft-admin/src/main/resources/mapper/SysRoleMapper.xml
......@@ -14,7 +14,7 @@
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysRole">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_ROLE_ID.nextval from dual
</selectKey>
insert into SYS_ROLE (ID,CREATE_DATE, CREATE_USERID, "STATE",
......
bsoft-admin/src/main/resources/mapper/SysRoleMenuRsMapper.xml
......@@ -17,9 +17,9 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_ROLE_MENU_RS_ID.nextval from dual
</selectKey>
insert into SYS_ROLE_MENU_RS (CREATE_DATE, CREATE_USERID, "STATE",
insert into SYS_ROLE_MENU_RS (ID,CREATE_DATE, CREATE_USERID, "STATE",
MENU_ID, ROLE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{menuId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysRoleMenuRs">
......@@ -34,10 +34,19 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", MENU_ID, ROLE_ID
from SYS_ROLE_MENU_RS
where ID = #{id,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL} and "STATE"=1
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", MENU_ID, ROLE_ID
from SYS_ROLE_MENU_RS
where "STATE"=1
</select>
<select id="selectByRole" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", MENU_ID, ROLE_ID
from SYS_ROLE_MENU_RS
where "STATE"=1 and ROLE_ID = #{roleId,jdbcType=DECIMAL}
</select>
<update id="deleteAllByRole">
update SYS_ROLE_MENU_RS set "STATE"=0 where ROLE_ID = #{userId,jdbcType=DECIMAL}
</update>
</mapper>
\ No newline at end of file
bsoft-admin/src/main/resources/mapper/SysUserMapper.xml
......@@ -23,7 +23,7 @@
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysUser">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ID.nextval from dual
</selectKey>
insert into SYS_USER (ID,CREATE_DATE, CREATE_USERID, "STATE",
......
bsoft-admin/src/main/resources/mapper/SysUserMenuRsMapper.xml
......@@ -17,9 +17,9 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_MENU_RS _ID.nextval from dual
</selectKey>
insert into SYS_USER_MENU_RS (CREATE_DATE, CREATE_USERID, "STATE",
insert into SYS_USER_MENU_RS (ID,CREATE_DATE, CREATE_USERID, "STATE",
USER_ID, MENU_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{menuId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysUserMenuRs">
......@@ -40,4 +40,12 @@
select ID, CREATE_DATE, CREATE_USERID, "STATE", USER_ID, MENU_ID
from SYS_USER_MENU_RS
</select>
<select id="selectByUser" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", USER_ID, MENU_ID
from SYS_USER_MENU_RS
where "STATE"=1 and USER_ID = #{userId,jdbcType=DECIMAL}
</select>
<update id="deleteAllByUser">
update SYS_USER_MENU_RS set "STATE"=0 where USER_ID = #{userId,jdbcType=DECIMAL}
</update>
</mapper>
\ No newline at end of file
bsoft-admin/src/main/resources/mapper/SysUserOrgRsMapper.xml
......@@ -17,9 +17,9 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ORG_RS_ID.nextval from dual
</selectKey>
insert into SYS_USER_ORG_RS (CREATE_DATE, CREATE_USERID, "STATE",
insert into SYS_USER_ORG_RS (ID,CREATE_DATE, CREATE_USERID, "STATE",
USER_ID, ORG_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{orgId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysUserOrgRs">
......@@ -39,5 +39,11 @@
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", USER_ID, ORG_ID
from SYS_USER_ORG_RS
where "STATE" = 1
</select>
<select id="selectByUser" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", USER_ID, ORG_ID
from SYS_USER_ORG_RS
where "STATE" = 1 and USER_ID = #{userId,jdbcType=DECIMAL}
</select>
</mapper>
\ No newline at end of file
bsoft-admin/src/main/resources/mapper/SysUserRoleRsMapper.xml
......@@ -17,9 +17,9 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ROLE_RS_ID.nextval from dual
</selectKey>
insert into SYS_USER_ROLE_RS (CREATE_DATE, CREATE_USERID, "STATE",
insert into SYS_USER_ROLE_RS (ID,CREATE_DATE, CREATE_USERID, "STATE",
USER_ID, ROLE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysUserRoleRs">
......@@ -39,5 +39,6 @@
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", USER_ID, ROLE_ID
from SYS_USER_ROLE_RS
where "STATE"=1
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment