系统权限管理

系统角色管理
yun-zuoyi
wei.peng 7 years ago
parent e3fa15c69e
commit e82f083239

@ -35,6 +35,14 @@ public interface ISysRoleService {
void updateSysRoleStatus(String id, int status, SessionUser user);
/**
*
* @param ids
* @param status
* @param user
*/
void updateSysRoleStatusByIds(String[] ids, int status, SessionUser user);
/**
* Key
* @param id
*/

@ -42,7 +42,6 @@ public class OrganizeController {
@PostMapping(value = "/insert")
@ApiOperation(value = "新增组织", notes = "组织")
public ResultBean insertOrganize(Organize organize) {
;
try {
//条件验证
ValidatorBean.beginValid(organize)
@ -187,7 +186,6 @@ public class OrganizeController {
public ResultBean deleteOrganizeByIds(String[] ids){
try{
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())

@ -4,6 +4,7 @@
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
@ -49,6 +50,9 @@ public class SysMenuController {
//新增初始化
ConvertBean.modelInitialize(menu, AuthUtil.getSessionUser());
if(menu.getParentId() == null || menu.getParentId().intValue() == 0){
menu.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
menu = sysMenuService.insertSysMenu(menu);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(menu);
@ -122,6 +126,7 @@ public class SysMenuController {
public ResultBean queryPosition(SysMenu menu, Pager pager){
try{
ListPager<SysMenu> listPager = sysMenuService.querySysMenu(menu, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
@ -133,7 +138,6 @@ public class SysMenuController {
}
}
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询系统功能", notes = "查询根据ID查询系统功能")
public ResultBean getById(@PathVariable("id") String id) {
@ -184,7 +188,8 @@ public class SysMenuController {
ValidatorBean.checkNotZero(status, "功能状态不能为空");
sysMenuService.updateSysMenuStatusByIds(ids,status,AuthUtil.getSessionUser());
return new ResultBean(true);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());

@ -2,8 +2,11 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -115,6 +118,23 @@ public class SysRoleController {
}
}
@GetMapping(value="/query")
@ApiOperation(value="查询所有角色",notes="查询所有角色")
public ResultBean querySysRole(SysRole role, Pager pager){
try{
ListPager<SysRole> listPager = sysRoleService.querySysRole(role, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "查询系统角色", notes = "查询根据ID查询系统角色")
public ResultBean getById(@PathVariable("id") String id) {
@ -137,7 +157,7 @@ public class SysRoleController {
}
@PutMapping(value = "/status")
@ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态")
@ApiOperation(value = "修改角色状态", notes = "根据ID修改角色状态")
public ResultBean updateStatus(String id, int status) {
try {
// 数据校验
@ -154,4 +174,24 @@ public class SysRoleController {
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
@PutMapping(value = "/batch-status")
@ApiOperation(value = "批量修改系统角色状态", notes = "根据ID修改系统角色状态")
public ResultBean updateBatchStatus(String[] ids,int status) {
try {
// 数据校验
ValidatorBean.checkNotNull(ids, "角色id 不能为空");
ValidatorBean.checkNotZero(status, "角色状态不能为空");
sysRoleService.updateSysRoleStatusByIds(ids,status,AuthUtil.getSessionUser());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
}

@ -178,9 +178,9 @@ public class ToolController {
}
}
@PutMapping(value = "/update/status/enable")
@PutMapping(value = "/status")
@ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用")
public ResultBean updateStatusEnable(String id){
public ResultBean updateStatusEnable(String id,Integer status){
try {
toolService.updateStatusEnable(id);
return ResultBean.success("操作成功")

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
@ -120,7 +121,7 @@ public class TreeController {
try {
Department obj = coreTreeService.getDepartmentTreeByParentId(id);
return ResultBean.success("查询部门树成功")
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(obj);
}catch(ImppBusiException busExcep){
@ -132,7 +133,6 @@ public class TreeController {
}
}
@GetMapping(value="/department/list/{parentId}")
@ApiOperation(value="查询组织树",notes="通过部门主键获取组织树,-1为根节点")
public ResultBean listDepartmentListTree(@PathVariable("parentId") long parentId) {
@ -150,4 +150,42 @@ public class TreeController {
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value="/sys-menu/get/{id}")
@ApiOperation(value="部门树",notes="通过部门主键获取部门树,-1为根节点")
public ResultBean listSysMenuTree(@PathVariable("id") long id) {
try {
SysMenu obj = coreTreeService.getSysMenuTreeByParentId(id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(obj);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@GetMapping(value="/sys-menu/list/{parentId}")
@ApiOperation(value="查询组织树",notes="通过部门主键获取组织树,-1为根节点")
public ResultBean listSysMenuListTree(@PathVariable("parentId") long parentId) {
try {
List<SysMenu> resultList = coreTreeService.findSysMenuTreeByParentId(parentId);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(resultList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -39,7 +39,6 @@ public class DepartmentServiceImpl implements IDepartmentService {
@Override
public Department insertDepartment(Department department) {
// 查询父级部门名称
if (department.getParentId() != null && department.getParentId().intValue() > 0) {
LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId());
Department parentPosition = departmentRDao.getById(department.getParentId());
@ -48,14 +47,12 @@ public class DepartmentServiceImpl implements IDepartmentService {
department.setRedParentName(parentPosition.getName());
}
// 查询所属组织名称
LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId());
Organize organize = organizeRDao.getById(department.getOrganizeId());
ValidatorBean.checkNotNull(organize);
department.setRedOrganizeName(organize.getName());
// 新增部门
LOGGER.info("部门信息 DEPARTMENT {}",department);
return departmentRDao.insert(department);
}
@ -66,7 +63,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
LOGGER.info("部门信息 DEPARTMENT :{}", id);
if (departmentRDao.findByPropertyCount("parentId",Long.parseLong(id)) > 0) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setSystemID(CommonEnumUtil.SOFT_TYPE.WMS.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("存在子节点无法删除!")
.setErrorSolution("请重新操作")
@ -93,7 +90,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
departmentRDao.deleteByIdIn(array);
departmentRDao.deleteByIds(array);
}
}
@ -128,7 +125,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
@Override
public ListPager<Department> queryDepartment(Department department, Pager pager) {
LOGGER.info("部门 Department find menu :{} department :{}", department, pager);
LOGGER.info("部门 Department find department :{} page:{}", department, pager);
if (department == null) {
//不传入实体对象,查询所有

@ -87,7 +87,7 @@ public class OrganizeServiceImpl implements IOrganizeService {
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
organizeRDao.deleteByIdIn(array);
organizeRDao.deleteByIds(array);
}
}

@ -5,25 +5,17 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.repository.PositionRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -106,7 +98,7 @@ public class PositionServiceImpl implements IPositionService {
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
positionRDao.deleteByIdIn(array);
positionRDao.deleteByIds(array);
}
}

@ -27,9 +27,9 @@ import java.util.List;
* @Modify :
**/
@Service
public class SysMenuServiceImpl implements ISysMenuService {
public class SysMenuService implements ISysMenuService {
public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuServiceImpl.class);
public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuService.class);
@Autowired
private SysMenuRepository sysMenuRDao;
@ -55,7 +55,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
StringBuffer where = new StringBuffer();
HqlPack.getInPack(String.join(",", ids), "id", where);
sysMenuRDao.updateByHqlWhere(where.toString(), "status", status);
sysMenuRDao.updateByHqlWhere(where.toString(), "menuStatus", status);
}
@Override
@ -77,7 +77,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
@Override
public SysMenu insertSysMenu(SysMenu sysMenu) {
LOGGER.info("系统功能 SYS_MENU :{}", sysMenu);
if(0 != sysMenu.getParentId()){
if (sysMenu.getParentId() != null && sysMenu.getParentId().intValue() > 0) {
SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId());
if(null != parent){
sysMenu.setRedParentName(parent.getName());

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository;
@ -46,7 +47,15 @@ public class SysRoleServiceImpl implements ISysRoleService {
role.setRoleStatusId(status);
role.setModifyUser(user.getUserName());
sysRoleRDao.update(role);
}
@Override
public void updateSysRoleStatusByIds(String[] ids, int status, SessionUser user) {
LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user);
StringBuffer where = new StringBuffer();
HqlPack.getInPack(String.join(",", ids), "id", where);
sysRoleRDao.updateByHqlWhere(where.toString(), "roleStatusId", status);
}
@Override

@ -1,19 +1,16 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import cn.estsh.i3plus.pojo.platform.repository.ToolRepository;
import cn.estsh.i3plus.pojo.platform.repository.ToolTypeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -107,7 +104,7 @@ public class ToolTypeServiceImpl implements IToolTypeService {
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
toolTypeRDao.deleteByIdIn(array);
toolTypeRDao.deleteByIds(array);
}
}
}

@ -20,7 +20,7 @@ import java.util.List;
* @Date : 2018-10-29 19:02
* @Modify :
**/
public class TestDepartmentServiceImpl extends TestBase {
public class TestDepartmentService extends TestBase {
@Autowired
private IDepartmentService departmentService;

@ -20,7 +20,7 @@ import java.util.List;
* @Date : 2018-10-29 19:02
* @Modify :
**/
public class TestOrganizeServiceImpl extends TestBase {
public class TestOrganizeService extends TestBase {
@Autowired
private IOrganizeService organizeService;

@ -20,7 +20,7 @@ import java.util.List;
* @Date : 2018-10-29 19:02
* @Modify :
**/
public class TestPositionServiceImpl extends TestBase {
public class TestPositionService extends TestBase {
@Autowired
private IPositionService positionService;

@ -0,0 +1,102 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import com.alibaba.fastjson.JSON;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import javax.transaction.Transactional;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-11-01 11:58
* @Modify :
**/
public class TestSysMenuService extends TestBase {
@Autowired
private ISysMenuService sysMenuService;
/**
*
*/
@Test
public void testUpdateSysMenu() {
}
/**
*
*/
@Test
public void testUpdateSysMenuStatus() {
}
/**
*
*/
@Test
public void testUpdateSysMenuStatusByIds() {
}
/**
* Key
*/
@Test
public void testDeleteSysMenuById() {
}
/**
*
*/
@Test
@Transactional
@Rollback(false)
public void testInsertSysMenu() {
for(int i = 0 ; i < 50 ; i++ ){
SysMenu obj = new SysMenu();
obj.setName("Junit Test " + i);
obj.setMenuCode("TEST_JUNIT " + i);
obj.setParentId(-1L);
obj = sysMenuService.insertSysMenu(obj);
System.out.println(JSON.toJSONString(obj));
}
}
/**
*
*/
@Test
public void testFindSysMenuAll() {
List<SysMenu> list = sysMenuService.findSysMenuAll();
System.out.println(JSON.toJSONString(list));
}
/**
* id
*/
@Test
public void testGetSysMenuById() {
SysMenu menu = sysMenuService.getSysMenuById("1057844135052054528");
System.out.println(JSON.toJSONString(menu));
}
/**
*
*/
@Test
public void testQuerySysMenu() {
}
}
Loading…
Cancel
Save