From c28f8089ced42648d919dcd88e12bc2edf3939a5 Mon Sep 17 00:00:00 2001 From: tamguo Date: Fri, 27 Jul 2018 14:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/web/SysRoleController.java | 53 +++++++++++++++---- .../modules/sys/web/SysUserController.java | 30 ++++++++--- 2 files changed, 66 insertions(+), 17 deletions(-) diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java index 994825d..6497a90 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java @@ -15,6 +15,7 @@ import com.tamguo.modules.sys.model.SysRoleEntity; import com.tamguo.modules.sys.model.condition.SysRoleCondition; import com.tamguo.modules.sys.service.ISysRoleDataScopeService; import com.tamguo.modules.sys.service.ISysRoleService; +import com.tamguo.modules.sys.utils.ExceptionSupport; import com.tamguo.modules.sys.utils.Result; @Controller @@ -49,49 +50,79 @@ public class SysRoleController { return model; } - /** 列表数据*/ + /** 角色列表数据*/ @RequestMapping(path="listData",method=RequestMethod.POST) @ResponseBody public Map listData(SysRoleCondition condition) { - Page page = iSysRoleService.listData(condition); - return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages()); + try { + Page page = iSysRoleService.listData(condition); + return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages()); + } catch (Exception e) { + ExceptionSupport.resolverResult("角色列表", this.getClass(), e); + return null; + } } + /** 菜单树*/ @RequestMapping(path="menuTreeData") @ResponseBody public Map menuTreeData(String roleCode) { - return iSysRoleService.menuTreeData(roleCode); + try { + return iSysRoleService.menuTreeData(roleCode); + } catch (Exception e) { + ExceptionSupport.resolverResult("菜单树", this.getClass(), e); + return null; + } + } /** 角色授权功能菜单 */ @RequestMapping(path="allowMenuPermission",method=RequestMethod.POST) @ResponseBody public Result allowMenuPermission(SysRoleEntity role) { - iSysRoleService.allowMenuPermission(role); - return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！"); + try { + iSysRoleService.allowMenuPermission(role); + return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("授权功能菜单", this.getClass(), e); + } } /** 数据权限 */ @RequestMapping(path="allowDataScope",method=RequestMethod.POST) @ResponseBody public Result allowDataScope(SysRoleEntity role) { - iSysRoleService.allowDataScope(role); - return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！"); + try { + iSysRoleService.allowDataScope(role); + return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("授权数据权限", this.getClass(), e); + } } /** 授权用户 */ @RequestMapping(path="allowUser",method=RequestMethod.POST) @ResponseBody public Result allowUser(SysRoleEntity role) { - iSysRoleService.allowDataScope(role); - return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！"); + try { + iSysRoleService.allowDataScope(role); + return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("授权用户", this.getClass(), e); + } } /** 角色树结构*/ @RequestMapping(path="treeData",method=RequestMethod.POST) @ResponseBody public List treeData(String userType){ - return iSysRoleService.treeDate(userType); + try { + return iSysRoleService.treeDate(userType); + } catch (Exception e) { + ExceptionSupport.resolverResult("角色树", this.getClass(), e); + return null; + } + } } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java index 7786ff8..20b943c 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java @@ -14,6 +14,7 @@ import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.model.condition.SysUserCondition; import com.tamguo.modules.sys.service.ISysPostService; import com.tamguo.modules.sys.service.ISysUserService; +import com.tamguo.modules.sys.utils.ExceptionSupport; import com.tamguo.modules.sys.utils.Result; @Controller @@ -55,30 +56,47 @@ public class SysUserController { return model; } + /** 列表*/ @RequestMapping(path="listData",method=RequestMethod.POST) @ResponseBody public Map listData(SysUserCondition condition) { - Page page = iSysUserService.listData(condition); - return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages()); + try { + Page page = iSysUserService.listData(condition); + return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages()); + } catch (Exception e) { + ExceptionSupport.resolverResult("查询用户列表", this.getClass(), e); + return null; + } } + /** 校验登录账号*/ @RequestMapping(path="checkLoginCode",method=RequestMethod.GET) @ResponseBody public Boolean checkLoginCode(String oldLoginCode , String loginCode) { return iSysUserService.checkLoginCode(oldLoginCode , loginCode); } + /** 更新用户*/ @RequestMapping(path="update",method=RequestMethod.POST) @ResponseBody public Result update(SysUserEntity user) { - iSysUserService.update(user); - return Result.result(0, null, "保存用户【"+user.getUserCode()+"】成功！"); + try { + iSysUserService.update(user); + return Result.result(0, null, "保存用户【"+user.getUserCode()+"】成功！"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("更新用户", this.getClass(), e); + } } + /** 保存用户*/ @RequestMapping(path="save",method=RequestMethod.POST) @ResponseBody public Result save(SysUserEntity user) { - iSysUserService.save(user); - return Result.result(0, null, "保存用户【"+user.getUserCode()+"】成功！"); + try { + iSysUserService.save(user); + return Result.result(0, null, "保存用户【"+user.getUserCode()+"】成功！"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("保存用户", this.getClass(), e); + } } }