diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java index e46147a..07666c1 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java @@ -12,4 +12,11 @@ import cn.estsh.i3plus.pojo.platform.bean.Department; public interface ICoreTreeService { Department getDepartmentTreeByParentId(long depParentId); + + /** + * 生成子集树递归方法 + * @param parent 父类对象 + * @param step 层级 + */ + void findDepartmentChildrenTreePack(Department parent,int step); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java index ae1c541..e0cf07f 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java @@ -1,8 +1,8 @@ package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -26,18 +26,17 @@ public interface ISysMenuService { * 修改权限状态 * @param id 修改权限状态 * @param status 状态 - * @param modifyUser 当前用户名称 + * @param user 当前会话用户 * @return */ - void updateSysMenuStatus(long id,int status,String modifyUser); + void updateSysMenuStatus(long id, int status, SessionUser user); /** * 根据Key 删除数据 * @param id - * @param modifyUser 当前用户名称 * @return */ - void deleteSysMenuById(long id,String modifyUser); + void deleteSysMenuById(long id); /** * 新增数据 @@ -45,7 +44,7 @@ public interface ISysMenuService { * @param sysMenu * @return */ - void insertSysMenu(SysMenu sysMenu); + SysMenu insertSysMenu(SysMenu sysMenu); /** * 查询所有数据 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java index 83491e6..1857945 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import org.springframework.transaction.annotation.Transactional; @@ -25,17 +26,16 @@ public interface ISysRoleService { * 修改权限状态 * @param id 修改权限状态 * @param status 状态 - * @param modifyUser 当前用户名称 + * @param user 当前用户会话 * @return */ - void updateSysRoleStatus(long id, int status, String modifyUser); + void updateSysRoleStatus(long id, int status, SessionUser user); /** * 根据Key 删除数据 - * * @param id */ - void deleteSysRoleById(long id,String modifyUser); + void deleteSysRoleById(long id); /** * 新增数据 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 4dfbc41..1248e09 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -85,8 +85,10 @@ i3plus.pojo i3plus-pojo-mes - 1.0-SNAPSHOT - compile + + + org.slf4j + slf4j-api diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java index e5c14dd..80a3f2c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.platform.common.enumutil.ImppEnumUtil; + import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.Arrays; /** @@ -24,23 +24,23 @@ import java.util.Arrays; @Api(description = "系统枚举服务") public class EnumController { - @GetMapping("/find/method-level") + @GetMapping("/method-level") @ApiOperation(value = "功能类型", notes = "查询全部功能类型功能") - public ResultBean getByEnumMethodLevel(){ + public ResultBean getEnumMethodLevel(){ return new ResultBean(true, "操作成功", Arrays.asList(CommonEnumUtil.METHOD_LEVEL.values())); } - @GetMapping("/find/status") - @ApiOperation(value = "功能状态", notes = "查询全部功能状态功能") - public ResultBean getByStatus(){ + @GetMapping("/data-status") + @ApiOperation(value = "数据功能状态", notes = "查询全部数据状态功能") + public ResultBean getEnumDataStatus(){ return new ResultBean(true, "操作成功", - Arrays.asList(CommonEnumUtil.STATUS.values())); + Arrays.asList(CommonEnumUtil.DATA_STATUS.values())); } - @GetMapping("/find/organize-type") + @GetMapping("/organize-type") @ApiOperation(value = "组织类型", notes = "查询全部组织类型功能") - public ResultBean getByOrganizeType(){ + public ResultBean getEnumOrganizeType(){ return new ResultBean(true, "操作成功", Arrays.asList(ImppEnumUtil.ORGANIZE_YTPE.values())); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index a3c7be9..f91d072 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -1,18 +1,21 @@ -package cn.estsh.i3plus.core.apiservice.controller.busi; + package cn.estsh.i3plus.core.apiservice.controller.busi; -import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; + import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; + import cn.estsh.i3plus.pojo.platform.bean.SessionUser; + import cn.estsh.i3plus.pojo.platform.bean.SysMenu; + import cn.estsh.i3plus.pojo.platform.bean.SysUser; + import cn.estsh.impp.framework.boot.auth.AuthUtil; + import cn.estsh.impp.framework.boot.exception.ImppBusiException; + import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; + import cn.estsh.impp.framework.boot.util.ResultBean; + import io.swagger.annotations.Api; + import io.swagger.annotations.ApiOperation; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.web.bind.annotation.*; -import java.util.List; + import java.util.List; /** * @Description : 系统功能对外接口 @@ -23,7 +26,7 @@ import java.util.List; **/ @RestController @RequestMapping("/sys-menu") -@Api(description = "系统功能") +@Api(description = "系统功能服务") public class SysMenuController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class); @@ -34,8 +37,16 @@ public class SysMenuController { @PostMapping(value = "/insert") @ApiOperation(value = "新增系统功能", notes = "系统功能") public ResultBean insertSysMenu(SysMenu sysMenu) { - sysMenuService.insertSysMenu(sysMenu); - return null; + try { + SysMenu menu = sysMenuService.insertSysMenu(sysMenu); + return new ResultBean(true,menu); + } 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()); + } } @PutMapping(value = "/update") @@ -51,9 +62,16 @@ public class SysMenuController { @DeleteMapping(value = "/delete") @ApiOperation(value = "删除系统功能", notes = "删除系统功能") public ResultBean deleteSysMenu(long id) { - sysMenuService.deleteSysMenuById(id, ""); -// return new ResultBean(true, "操作成功"); - return null; + try { + sysMenuService.deleteSysMenuById(id); + return new ResultBean(true); + } 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()); + } } @GetMapping(value = "/findSysMenuAll") @@ -73,9 +91,16 @@ public class SysMenuController { @PutMapping(value = "/updateStatus") @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态") public ResultBean updateStatus(long id,int status) { - sysMenuService.updateSysMenuStatus(id,status,""); - - return null; + try { + sysMenuService.updateSysMenuStatus(id,status,AuthUtil.getSessionUser()); + return new ResultBean(true); + } 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()); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index e6e23e1..6c96749 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; +import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,27 +18,36 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Description : 系统角色对外接口 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 16:58:43.790 - * @Modify : + * @Description : 系统角色对外接口 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:43.790 + * @Modify : **/ @RestController -@RequestMapping("/sys-role") -@Api(description = "系统角色") +@RequestMapping("/sys-role") +@Api(description = "系统角色服务") public class SysRoleController { public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class); + @Autowired private ISysRoleService sysRoleService; @PostMapping(value = "/insert") @ApiOperation(value = "新增系统角色", notes = "系统角色") public ResultBean insertSysRole(SysRole sysRole) { - sysRoleService.insertSysRole(sysRole); - return new ResultBean(true, "操作成功", sysRole); + try { + SysRole role = sysRoleService.insertSysRole(sysRole); + return new ResultBean(true, role); + } 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()); + } } @PutMapping(value = "/update") @@ -47,7 +60,7 @@ public class SysRoleController { @DeleteMapping(value = "/delete") @ApiOperation(value = "删除系统角色", notes = "删除系统角色") public ResultBean deleteSysRole(long id) { - sysRoleService.deleteSysRoleById(id,""); + sysRoleService.deleteSysRoleById(id); return new ResultBean(true, "操作成功"); } @@ -67,8 +80,17 @@ public class SysRoleController { @PutMapping(value = "/updateStatus") @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态") - public ResultBean updateStatus(long id,int status) { - //return sysRoleService.updateSysRoleStatus(id,status,USER.getEmployeeNameRdd()); - return null; + public ResultBean updateStatus(long id, int status) { + try { + + sysRoleService.updateSysRoleStatus(id, status, AuthUtil.getSessionUser()); + return new ResultBean(true); + } 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()); + } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java index ff6fa32..bb3b4fd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java @@ -3,9 +3,13 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description : 通用树实现类 * @Reference : @@ -16,12 +20,36 @@ import org.springframework.stereotype.Service; @Service public class CoreTreeServiceImpl implements ICoreTreeService { + public static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeServiceImpl.class); + @Autowired - private DepartmentRepository departmentDao; + private DepartmentRepository departmentRDao; @Override public Department getDepartmentTreeByParentId(long depParentId) { - Department dep = new Department(); - return dep; + Department depParent = departmentRDao.getById(depParentId); + //封装子集 + findDepartmentChildrenTreePack(depParent,0); + return depParent; + } + + /** + * 封装部门子集 + * @param parent + */ + @Override + public void findDepartmentChildrenTreePack(Department parent,int step){ + ++step; + List childDepList = departmentRDao.findByProperty("parentId",parent.getId()); + + if(childDepList.size() > 0){ + //说明有子集 + for(Department depChild : childDepList){ + findDepartmentChildrenTreePack(depChild,step); + } + } + + LOGGER.info("【{}】包含子集：{},步长：{}",parent.getName(),childDepList.size(),step); + parent.setChildList(childDepList); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java index b396884..d7f7a4f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java @@ -1,8 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; - +import cn.estsh.i3plus.platform.common.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository; import org.slf4j.Logger; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java index 619296b..6f2ab06 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java @@ -2,18 +2,19 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.core.apiservice.dao.ISysMenuDao; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; +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 org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Optional; /** * @Description : 系统功能业务接口实现 @@ -38,60 +39,64 @@ public class SysMenuServiceImpl implements ISysMenuService { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); if(sysMenu != null){ sysMenuRepository.update(sysMenu); - // return new ResultBean(true,"操作成功",sysMenu); } - //return new ResultBean(false,"操作失败"); + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("数据不存在") + .setErrorSolution("请重新操作") + .build(); } @Override - public void updateSysMenuStatus(long id, int status, String modifyUser) { - LOGGER.info("系统功能 SYS_MENU id:{} status:{} modifyUser:{}", id,status,modifyUser); + public void updateSysMenuStatus(long id, int status, SessionUser user) { + LOGGER.info("系统功能 SYS_MENU id:{} status:{} user:{}", id,status,user); SysMenu menu = sysMenuRepository.getById(id); if(null != menu){ menu.setMenuStatus(status); - menu.setModifyUser(modifyUser); + menu.setModifyUser(user.getUserName()); sysMenuRepository.update(menu); - //TODO 统一修改 -// String modifyDatetime = ""; -// sysMenuRepository.updateByProperties( -// new String[]{"id"}, -// new Object[]{id}, -// new String[]{"menuStatus","modifyUser","modifyDatetime"}, -// new Object[]{status,modifyUser,modifyDatetime} -// ); -// return new ResultBean(true,"操作成功"); - //return new ResultBean(true,"操作成功"); + }else{ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("数据不存在") + .setErrorSolution("请重新操作") + .build(); } - // return new ResultBean(); } @Override - public void deleteSysMenuById(long id,String modifyUser) { + public void deleteSysMenuById(long id) { LOGGER.info("系统功能 SYS_MENU Key:{}", id); //TODO 记录平台用户操作日志 long count = iSysMenuDao.queryCountByParentId(id); if(count >= 1){ - //return new ResultBean(false,"操作失败","该数据有引用关系，请先删除引用关系"); + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) + .setErrorDetail("数据存在子集") + .setErrorSolution("请删除子集在操作") + .build(); + } sysMenuRepository.deleteById(id); - //return new ResultBean(true,"操作成功"); } @Override - public void insertSysMenu(SysMenu sysMenu) { + public SysMenu insertSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); if(null != sysMenu.getMenuTypeId()){ sysMenu.setRedMenuTypeName(CommonEnumUtil.METHOD_LEVEL.valueOf(sysMenu.getMenuTypeId())); } - /*if(0 != sysMenu.getParentId()){ + if(0 != sysMenu.getParentId()){ SysMenu parent = sysMenuRepository.getById(sysMenu.getParentId()); if(null != parent){ sysMenu.setRedParentName(parent.getName()); } - }*/ - SysMenu insert = sysMenuRepository.insert(sysMenu); - //return new ResultBean(true,"操作成功",insert); + } + return sysMenuRepository.insert(sysMenu); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java index b538e85..1587c4c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository; -import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +15,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Description : 系统角色业务接口实现 + * @Description : 系统角色业务接口实现 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:43.779 @@ -34,27 +36,25 @@ public class SysRoleServiceImpl implements ISysRoleService { } @Override - public void updateSysRoleStatus(long id, int status, String modifyUser) { - LOGGER.info("系统角色 SYS_MENU id:{} status:{} modifyUser:{}", id,status,modifyUser); + public void updateSysRoleStatus(long id, int status, SessionUser user) { + LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); SysRole role = sysRoleRepository.getById(id); if(null != role){ - //role.setRoleStatus(status); - role.setModifyUser(modifyUser); + role.setRoleStatus(status); + role.setModifyUser(user.getUserName()); sysRoleRepository.update(role); - //TODO 统一修改 -// String modifyDatetime = ""; -// sysMenuRepository.updateByProperties( -// new String[]{"id"}, -// new Object[]{id}, -// new String[]{"menuStatus","modifyUser","modifyDatetime"}, -// new Object[]{status,modifyUser,modifyDatetime} -// ); -// return new ResultBean(true,"操作成功"); + }else { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("数据不存在") + .setErrorSolution("请重新操作") + .build(); } } @Override - public void deleteSysRoleById(long id,String modifyUser) { + public void deleteSysRoleById(long id) { LOGGER.info("系统角色 SYS_ROLE Key:{}", id); sysRoleRepository.deleteById(id); } diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 70b4d92..15285c9 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -1,7 +1,7 @@ #Ŀ spring.application.name=${project.name} #Ŀ˿ -server.port=8081 +server.port=8080 #ʹ spring.profiles.active=dev diff --git a/pom.xml b/pom.xml index 1bcc134..40e688d 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-mes + ${project.version} + + mysql