From ae1844dcda224ff0498e46aa72aeca0b3d462f54 Mon Sep 17 00:00:00 2001 From: zengwh Date: Tue, 22 Sep 2020 11:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A8=E5=B1=80=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=B9=B6=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/DeptController.java | 129 +++--- .../controller/ExportExcelController.java | 2 + .../com/manage/controller/FontController.java | 408 ++++++++---------- .../controller/GlobalExceptionHandler.java | 51 +++ .../manage/controller/LoginController.java | 23 +- .../com/manage/controller/PageController.java | 86 ++-- .../controller/Power_LogController.java | 49 +-- .../controller/Power_MenuController.java | 24 +- .../Power_MenuManageController.java | 259 +++++------ .../controller/Power_NoticeController.java | 172 +++----- .../controller/Power_Sys_DictController.java | 283 ++++++------ .../RoleAndUserPowerController.java | 47 +- .../com/manage/controller/RoleController.java | 80 ++-- .../manage/controller/T_MenuController.java | 16 +- .../com/manage/controller/UserController.java | 123 ++---- .../manage/controller/VideoController.java | 2 +- .../src/main/resources/log4j.properties | 18 + power-admin/src/main/webapp/WEB-INF/web.xml | 15 +- .../com/manage/util/ExceptionPrintUtil.java | 36 ++ .../service/ImportExcel/ImportExcelUtil.java | 18 +- .../manage/service/cache/CacheManager.java | 4 +- .../manage/service/ipml/PageServiceImpl.java | 48 +-- .../manage/service/ipml/PowerServiceImpl.java | 182 ++++---- .../service/ipml/Power_DeptServiceImpl.java | 36 +- .../service/ipml/Power_RoleServiceImpl.java | 28 +- .../ipml/Power_Sys_DictServiceImpl.java | 20 +- .../service/ipml/Power_UserServiceImpl.java | 63 ++- 27 files changed, 1032 insertions(+), 1190 deletions(-) create mode 100644 power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java create mode 100644 power-admin/src/main/resources/log4j.properties create mode 100644 power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java diff --git a/power-admin/src/main/java/com/manage/controller/DeptController.java b/power-admin/src/main/java/com/manage/controller/DeptController.java index 7d7ff0d..c6270b6 100644 --- a/power-admin/src/main/java/com/manage/controller/DeptController.java +++ b/power-admin/src/main/java/com/manage/controller/DeptController.java @@ -8,6 +8,7 @@ import com.manage.entity.Power_User; import com.manage.service.cache.CacheManager; import com.manage.service.ImportExcel.ImportExcelUtil; import com.manage.service.Power_DeptService; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.util.PageHelper; import com.manage.vo.ImportExcelEntity; @@ -68,6 +69,7 @@ public class DeptController { CacheManager.addExcCount("noExc"); }catch (Exception e){ e.printStackTrace(); + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); } return pageHelper; @@ -109,16 +111,10 @@ public class DeptController { * */ @RequestMapping("/selectList") @ResponseBody - public Msg selectList(HttpServletRequest request) { - try { - List deptList = powerDeptService.selectDeptByUserId(request); - CacheManager.addExcCount("noExc"); - return Msg.success().add("list",deptList); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg selectList(HttpServletRequest request) throws Exception{ + List deptList = powerDeptService.selectDeptByUserId(request); + CacheManager.addExcCount("noExc"); + return Msg.success().add("list",deptList); } /** * @Date 2019-4-30 @@ -135,6 +131,7 @@ public class DeptController { }catch (Exception e){ CacheManager.addExcCount("exc"); e.printStackTrace(); + ExceptionPrintUtil.printException(e); return null; } } @@ -146,19 +143,13 @@ public class DeptController { * */ @RequestMapping("/checkDeptName") @ResponseBody - public Msg checkDeptName(String deptName,Integer dictId) { - try { - List power_dept = powerDeptService.checkDeptName(deptName,dictId); - if(power_dept != null && !power_dept.isEmpty()){ - return Msg.fail("科室名已存在"); - }else{ - CacheManager.addExcCount("noExc"); - return Msg.success(); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("验证失败，请联系系统管理员!"); + public Msg checkDeptName(String deptName,Integer dictId) throws Exception{ + List power_dept = powerDeptService.checkDeptName(deptName,dictId); + if(power_dept != null && !power_dept.isEmpty()){ + return Msg.fail("科室名已存在"); + }else{ + CacheManager.addExcCount("noExc"); + return Msg.success(); } } @@ -177,8 +168,8 @@ public class DeptController { Integer id = 1; Integer parentId = null; if(null != list && !list.isEmpty()){ - for (int i = 0;i < list.size();i++){ - hospitalMap.put(list.get(i).getDictId(),list.get(i).getHospitalName()); + for (Power_DeptVo power_deptVo : list) { + hospitalMap.put(power_deptVo.getDictId(), power_deptVo.getHospitalName()); } for (Map.Entry entry : hospitalMap.entrySet()) { //医院层 @@ -191,12 +182,12 @@ public class DeptController { parentId = id; id++; //科室层 - for (int i = 0;i < list.size();i++){ - if(entry.getKey().equals(list.get(i).getDictId())){ + for (Power_DeptVo power_deptVo : list) { + if (entry.getKey().equals(power_deptVo.getDictId())) { PowerTree tree2 = new PowerTree(); tree2.setId(id); - tree2.setSelfId(list.get(i).getDeptId()); - tree2.setName(list.get(i).getDeptName()); + tree2.setSelfId(power_deptVo.getDeptId()); + tree2.setName(power_deptVo.getDeptName()); tree2.setParentId(parentId); treeList.add(tree2); id++; @@ -209,6 +200,7 @@ public class DeptController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -223,22 +215,15 @@ public class DeptController { @RequiresPermissions(value="/dept/add") @RequestMapping("/add") @ResponseBody - public Msg add(Power_Dept powerDept){ - try { - List power_dept = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId()); - if(null == power_dept || power_dept.isEmpty()){ - powerDeptService.insertSelective(powerDept); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }else{ - return Msg.fail("科室名已存在!"); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("添加出错了,请联系系统管理员!"); + public Msg add(Power_Dept powerDept) throws Exception{ + List power_dept = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId()); + if(null == power_dept || power_dept.isEmpty()){ + powerDeptService.insertSelective(powerDept); + CacheManager.addExcCount("noExc"); + return Msg.success(); + }else{ + return Msg.fail("科室名已存在!"); } - } /** * @Date 2019-4-25 @@ -249,23 +234,15 @@ public class DeptController { @RequiresPermissions(value="/dept/update") @RequestMapping("/update") @ResponseBody - public Msg update(Power_Dept powerDept,HttpServletRequest request){ - try { - List power_dept = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId()); - if(null != power_dept && !power_dept.isEmpty() && !power_dept.get(0).getDeptId().equals(powerDept.getDeptId())){ - return Msg.fail("科室名已存在!"); - }else{ - powerDeptService.updateByPrimaryKeySelective(powerDept,request); - CacheManager.addExcCount("noExc"); - return Msg.success(); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("修改出错了,请联系系统管理员!"); + public Msg update(Power_Dept powerDept,HttpServletRequest request) throws Exception{ + List power_dept = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId()); + if(null != power_dept && !power_dept.isEmpty() && !power_dept.get(0).getDeptId().equals(powerDept.getDeptId())){ + return Msg.fail("科室名已存在!"); + }else{ + powerDeptService.updateByPrimaryKeySelective(powerDept,request); + CacheManager.addExcCount("noExc"); + return Msg.success(); } - - } /** * @Date 2019-4-25 @@ -276,16 +253,10 @@ public class DeptController { @RequiresPermissions(value="/dept/delete") @RequestMapping("/delete") @ResponseBody - public Msg delete(Integer deptId){ - try { - CacheManager.addExcCount("noExc"); - powerDeptService.deleteByPrimaryKey(deptId); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg delete(Integer deptId) throws Exception{ + CacheManager.addExcCount("noExc"); + powerDeptService.deleteByPrimaryKey(deptId); + return Msg.success(); } /** * @Date 2019-4-29 @@ -300,6 +271,7 @@ public class DeptController { powerDeptService.export(powerDept,request,response); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -317,6 +289,7 @@ public class DeptController { powerDeptService.exportBlood(powerDept,request,response); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -334,6 +307,7 @@ public class DeptController { CacheManager.addExcCount("noExc"); return deptList; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -348,16 +322,10 @@ public class DeptController { * */ @RequestMapping("/selectDeptByDictId") @ResponseBody - public Msg selectDeptByDictId(Integer dictId){ - try { - List depts = powerDeptService.selectDeptByDictId(dictId,null); - CacheManager.addExcCount("noExc"); - return Msg.success().add("depts",depts); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("查询失败,请联系系统管理员!"); - } + public Msg selectDeptByDictId(Integer dictId) throws Exception{ + List depts = powerDeptService.selectDeptByDictId(dictId,null); + CacheManager.addExcCount("noExc"); + return Msg.success().add("depts",depts); } /** @@ -409,6 +377,7 @@ public class DeptController { } }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); //抛异常 return new ResponseEntity(e.getMessage(), responseHeaders, HttpStatus.OK); diff --git a/power-admin/src/main/java/com/manage/controller/ExportExcelController.java b/power-admin/src/main/java/com/manage/controller/ExportExcelController.java index 115b09b..743dff7 100644 --- a/power-admin/src/main/java/com/manage/controller/ExportExcelController.java +++ b/power-admin/src/main/java/com/manage/controller/ExportExcelController.java @@ -2,6 +2,7 @@ package com.manage.controller; import com.manage.service.cache.CacheManager; import com.manage.service.ImportExcel.ImportExcelUtil; +import com.manage.util.ExceptionPrintUtil; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.stereotype.Controller; @@ -42,6 +43,7 @@ public class ExportExcelController { workbook.write(os); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); }finally { diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index 2f52a79..a2e100a 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -12,6 +12,7 @@ import com.manage.service.cache.CacheManager; import com.manage.service.ipml.Power_NoticeServiceImpl; import com.manage.service.webSocket.WsPool; import com.manage.util.DateUtils; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.vo.*; import org.apache.commons.lang3.StringUtils; @@ -77,37 +78,31 @@ public class FontController { @RequestMapping(value = "getMenusByUserIdAndSysFlag",method = RequestMethod.GET) @ResponseBody public Msg getMenusByUserIdAndSysFlag(String userName,String sysFlag,Integer userId,Integer roleId, - Integer sysId,Integer hospitalId){ - try { - if(StringUtils.isNotBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null - && sysId == null && hospitalId == null){ - return Msg.fail("查询复杂,数据大,暂不支持只带sysFlag参数查询"); - } - if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null - && sysId != null && hospitalId == null){ - return Msg.fail("查询复杂,数据大,暂不支持只带sysId参数查询"); - } - if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null - && sysId == null && hospitalId != null){ - return Msg.fail("查询复杂,数据大,暂不支持只带hospitalId参数查询"); - } - if(StringUtils.isNotBlank(userName)){ - List power_users = userMapper.checkUserName(userName); - if(null != power_users && !power_users.isEmpty()){ - if(power_users.get(0).getRoleId().equals(0) || power_users.get(0).getRoleId().equals(-100)){ - roleId = power_users.get(0).getRoleId(); - } + Integer sysId,Integer hospitalId) throws Exception{ + if(StringUtils.isNotBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null + && sysId == null && hospitalId == null){ + return Msg.fail("查询复杂,数据大,暂不支持只带sysFlag参数查询"); + } + if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null + && sysId != null && hospitalId == null){ + return Msg.fail("查询复杂,数据大,暂不支持只带sysId参数查询"); + } + if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null + && sysId == null && hospitalId != null){ + return Msg.fail("查询复杂,数据大,暂不支持只带hospitalId参数查询"); + } + if(StringUtils.isNotBlank(userName)){ + List power_users = userMapper.checkUserName(userName); + if(null != power_users && !power_users.isEmpty()){ + if(power_users.get(0).getRoleId().equals(0) || power_users.get(0).getRoleId().equals(-100)){ + roleId = power_users.get(0).getRoleId(); } } - - List list = userDeptMenuService.selectAll(userName, sysFlag, userId, roleId, sysId, hospitalId); - CacheManager.addExcCount("noExc"); - return Msg.success().add("list",list); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); } + + List list = userDeptMenuService.selectAll(userName, sysFlag, userId, roleId, sysId, hospitalId); + CacheManager.addExcCount("noExc"); + return Msg.success().add("list",list); } /** @@ -125,16 +120,10 @@ public class FontController { */ @RequestMapping(value = "selectAllByUserIdOrRoleIdAndSysIdOrSysFlag") @ResponseBody - public Msg selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(Integer userId,Integer roleId,Integer sysId,String sysFlag,String sysName,Integer effective,String noticeTitle,String noticeSend,String noticeDate,String noticeTypeFlag,String noticeTypeName){ - try { - List list = powerNoticeMapper.selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(userId, roleId, sysId,sysFlag,sysName,effective,noticeTitle,noticeSend,noticeDate,noticeTypeFlag,noticeTypeName); - CacheManager.addExcCount("noExc"); - return Msg.success().add("list",list); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(Integer userId,Integer roleId,Integer sysId,String sysFlag,String sysName,Integer effective,String noticeTitle,String noticeSend,String noticeDate,String noticeTypeFlag,String noticeTypeName) throws Exception{ + List list = powerNoticeMapper.selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(userId, roleId, sysId,sysFlag,sysName,effective,noticeTitle,noticeSend,noticeDate,noticeTypeFlag,noticeTypeName); + CacheManager.addExcCount("noExc"); + return Msg.success().add("list",list); } /** @@ -168,6 +157,7 @@ public class FontController { }catch(Exception e){ CacheManager.addExcCount("exc"); e.printStackTrace(); + ExceptionPrintUtil.printException(e); return null; } } @@ -202,6 +192,7 @@ public class FontController { }catch(Exception e){ CacheManager.addExcCount("exc"); e.printStackTrace(); + ExceptionPrintUtil.printException(e); return null; } } @@ -221,29 +212,23 @@ public class FontController { */ @RequestMapping(value = "getUserList") @ResponseBody - public Msg getUserList(String userName){ - try { - List list = new ArrayList<>(); - if(StringUtils.isNoneBlank(userName)){ - List users = userMapper.checkUserName(userName); - if(null != users && !users.isEmpty()){ - Integer roleId = users.get(0).getRoleId(); - if(roleId == 0){ - list = userMapper.selectUserIdAndUserNameList(null); - }else{ - list = userMapper.selectUserIdAndUserNameList(users.get(0).getUserId()); - } + public Msg getUserList(String userName) throws Exception{ + List list = new ArrayList<>(); + if(StringUtils.isNoneBlank(userName)){ + List users = userMapper.checkUserName(userName); + if(null != users && !users.isEmpty()){ + Integer roleId = users.get(0).getRoleId(); + if(roleId == 0){ + list = userMapper.selectUserIdAndUserNameList(null); + }else{ + list = userMapper.selectUserIdAndUserNameList(users.get(0).getUserId()); } - }else{ - return Msg.fail("用户名不能为空"); } - CacheManager.addExcCount("noExc"); - return Msg.success().add("userList",list); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return null; + }else{ + return Msg.fail("用户名不能为空"); } + CacheManager.addExcCount("noExc"); + return Msg.success().add("userList",list); } /** @@ -261,22 +246,17 @@ public class FontController { */ @RequestMapping(value = "checkToken",method = RequestMethod.POST) @ResponseBody - public Msg checkToken(String token){ - try { - if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ) { - token = MD5.JM(Base64.decode(token)); - Cache cache = CacheManager.getCacheInfo(token); - if (cache == null) { - return Msg.fail("token已过期或不存在"); - } - }else{ - return Msg.fail("token不能为空"); + public Msg checkToken(String token) throws Exception{ + if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ) { + token = MD5.JM(Base64.decode(token)); + Cache cache = CacheManager.getCacheInfo(token); + if (cache == null) { + return Msg.fail("token已过期或不存在"); } - return Msg.success(); - }catch(Exception e){ - e.printStackTrace(); - return Msg.fail(e.getMessage()); + }else{ + return Msg.fail("token不能为空"); } + return Msg.success(); } /** @@ -294,55 +274,49 @@ public class FontController { */ @RequestMapping(value = "getUserByToken",method = RequestMethod.POST) @ResponseBody - public Msg getMenuListByToken(String token,String sysFlag){ - try { - if(StringUtils.isBlank(token)){ - return Msg.fail("token不能为空!"); - } - if(StringUtils.isBlank(sysFlag)){ - return Msg.fail("sysFlag不能为空!"); - } - token = MD5.JM(Base64.decode(token)); - Cache cacheInfo = CacheManager.getCacheInfo(token); - Power_UserVo user = (Power_UserVo) cacheInfo.getValue(); - if(null != user){ - List menuList = user.getMenuList(); - List list = new ArrayList<>(); - Set menus = new TreeSet<>(); - if(null != menuList && !menuList.isEmpty()){ - for (int i = 0; i < menuList.size(); i++) { - String menuSysFlag = menuList.get(i).getSysFlag(); - if(StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)){ - list.add(menuList.get(i)); - if(StringUtils.isNotBlank(menuList.get(i).getMethod())){ - menus.add(menuList.get(i).getMenuUrl()); - } + public Msg getMenuListByToken(String token,String sysFlag) throws Exception{ + if(StringUtils.isBlank(token)){ + return Msg.fail("token不能为空!"); + } + if(StringUtils.isBlank(sysFlag)){ + return Msg.fail("sysFlag不能为空!"); + } + token = MD5.JM(Base64.decode(token)); + Cache cacheInfo = CacheManager.getCacheInfo(token); + Power_UserVo user = (Power_UserVo) cacheInfo.getValue(); + if(null != user){ + List menuList = user.getMenuList(); + List list = new ArrayList<>(); + Set menus = new TreeSet<>(); + if(null != menuList && !menuList.isEmpty()){ + for (User_Dept_Menu user_dept_menu : menuList) { + String menuSysFlag = user_dept_menu.getSysFlag(); + if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) { + list.add(user_dept_menu); + if (StringUtils.isNotBlank(user_dept_menu.getMethod())) { + menus.add(user_dept_menu.getMenuUrl()); } } } - user.setMenuList(list); - user.setMenus(menus); - UserVo userVo = new UserVo(); - BeanUtils.copyProperties(user,userVo); - //查询用户集合 - List userList = new ArrayList<>(); - Integer roleId = userVo.getRoleId(); - if(roleId == 0){ - userList = userMapper.selectUserIdAndUserNameList(null); - }else{ - userList = userMapper.selectUserIdAndUserNameList(userVo.getUserId()); - } - //设置用户集合 - userVo.setUserList(userList); - CacheManager.addExcCount("noExc"); - return Msg.success().add("user",userVo); + } + user.setMenuList(list); + user.setMenus(menus); + UserVo userVo = new UserVo(); + BeanUtils.copyProperties(user,userVo); + //查询用户集合 + List userList = new ArrayList<>(); + Integer roleId = userVo.getRoleId(); + if(roleId == 0){ + userList = userMapper.selectUserIdAndUserNameList(null); }else{ - return Msg.fail("token已失效"); + userList = userMapper.selectUserIdAndUserNameList(userVo.getUserId()); } - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); + //设置用户集合 + userVo.setUserList(userList); + CacheManager.addExcCount("noExc"); + return Msg.success().add("user",userVo); + }else{ + return Msg.fail("token已失效"); } } @@ -361,34 +335,28 @@ public class FontController { */ @RequestMapping(value = "getMenuByToken",method = RequestMethod.POST) @ResponseBody - public Msg getMenuByToken(String token,String sysFlag){ - try { - if(StringUtils.isBlank(token)){ - return Msg.fail("token不能为空!"); - } - if(StringUtils.isBlank(sysFlag)){ - return Msg.fail("sysFlag不能为空!"); - } - token = MD5.JM(Base64.decode(token)); - Cache cacheInfo = CacheManager.getCacheInfo(token); - Power_UserVo user = (Power_UserVo) cacheInfo.getValue(); - List menuList = user.getMenuList(); - List list = new ArrayList<>(); - if(null != menuList && !menuList.isEmpty()){ - for (int i = 0; i < menuList.size(); i++) { - String menuSysFlag = menuList.get(i).getSysFlag(); - if(StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)){ - list.add(menuList.get(i)); - } + public Msg getMenuByToken(String token,String sysFlag) throws Exception{ + if(StringUtils.isBlank(token)){ + return Msg.fail("token不能为空!"); + } + if(StringUtils.isBlank(sysFlag)){ + return Msg.fail("sysFlag不能为空!"); + } + token = MD5.JM(Base64.decode(token)); + Cache cacheInfo = CacheManager.getCacheInfo(token); + Power_UserVo user = (Power_UserVo) cacheInfo.getValue(); + List menuList = user.getMenuList(); + List list = new ArrayList<>(); + if(null != menuList && !menuList.isEmpty()){ + for (User_Dept_Menu user_dept_menu : menuList) { + String menuSysFlag = user_dept_menu.getSysFlag(); + if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) { + list.add(user_dept_menu); } } - CacheManager.addExcCount("noExc"); - return Msg.success().add("list",list); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); } + CacheManager.addExcCount("noExc"); + return Msg.success().add("list",list); } /** @@ -406,68 +374,63 @@ public class FontController { */ @RequestMapping(value = "getToken",method = RequestMethod.POST) @ResponseBody - public Msg getToken(String userName,String password){ - try { - if(StringUtils.isBlank(userName)){ - return Msg.fail("用户名不能为空"); - } - if(StringUtils.isBlank(password)){ - return Msg.fail("密码不能为空"); - } - Power_User user = new Power_User(); - user.setUserName(userName); - user.setRemark(password); - Power_UserVo userVo = userService.findPowerUserByUserNameAndRemark(user); - if(null == userVo){ - return Msg.fail("用户名或密码不正确"); - } - String date = String.valueOf(DateUtils.getDate()); - String token = Base64.encode(MD5.KL(date)); + public Msg getToken(String userName,String password) throws Exception{ + if(StringUtils.isBlank(userName)){ + return Msg.fail("用户名不能为空"); + } + if(StringUtils.isBlank(password)){ + return Msg.fail("密码不能为空"); + } + Power_User user = new Power_User(); + user.setUserName(userName); + user.setRemark(password); + Power_UserVo userVo = userService.findPowerUserByUserNameAndRemark(user); + if(null == userVo){ + return Msg.fail("用户名或密码不正确"); + } + String date = String.valueOf(DateUtils.getDate()); + String token = Base64.encode(MD5.KL(date)); - List list = null; - List menuList = new ArrayList<>(); - Set menus = new TreeSet<>(); - if (userVo.getRoleId().equals(0) || userVo.getRoleId().equals(-100)) { - list = powerMenuService.queryAllPowerMenu(null,userVo.getRoleId()); - } else { - list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(),null); - } - if(null != list && !list.isEmpty()){ - for (int i = 0; i < list.size(); i++) { - User_Dept_Menu deptMenu = new User_Dept_Menu(); - String menuUrl = list.get(i).getMenuUrl(); - if(StringUtils.isNotBlank(menuUrl)){ - BeanUtils.copyProperties(list.get(i),deptMenu); - deptMenu.setMethodParent(list.get(i).getParentId()); - menuList.add(deptMenu); - } - if(StringUtils.isNotBlank(list.get(i).getMethod())){ - menus.add(list.get(i).getMenuUrl()); - } + List list = null; + List menuList = new ArrayList<>(); + Set menus = new TreeSet<>(); + if (userVo.getRoleId().equals(0) || userVo.getRoleId().equals(-100)) { + list = powerMenuService.queryAllPowerMenu(null,userVo.getRoleId()); + } else { + list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(),null); + } + if(null != list && !list.isEmpty()){ + for (Power_Menu power_menu : list) { + User_Dept_Menu deptMenu = new User_Dept_Menu(); + String menuUrl = power_menu.getMenuUrl(); + if (StringUtils.isNotBlank(menuUrl)) { + BeanUtils.copyProperties(power_menu, deptMenu); + deptMenu.setMethodParent(power_menu.getParentId()); + menuList.add(deptMenu); + } + if (StringUtils.isNotBlank(power_menu.getMethod())) { + menus.add(power_menu.getMenuUrl()); } } - userVo.setMenuList(menuList); - userVo.setMenus(menus); + } + userVo.setMenuList(menuList); + userVo.setMenus(menus); - //设置科室 - String power_depts = ""; - List power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); - for(int j=0;j power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); + for(int j=0;j user = userMapper.checkUserName(userName); - if(null == user || user.isEmpty()){ - return Msg.fail("该工号不存在!"); - } - return Msg.success().add("user",user); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(e.getMessage()); + public Msg checkUserName(String userName) throws Exception{ + if(StringUtils.isBlank(userName)){ + return Msg.fail("工号不能为空!"); + } + //查询用户 + List user = userMapper.checkUserName(userName); + if(null == user || user.isEmpty()){ + return Msg.fail("该工号不存在!"); } + return Msg.success().add("user",user); } /** @@ -564,6 +515,7 @@ public class FontController { } } }catch (Exception e){ + ExceptionPrintUtil.printException(e); e.printStackTrace(); } } diff --git a/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java b/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java new file mode 100644 index 0000000..08852f3 --- /dev/null +++ b/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java @@ -0,0 +1,51 @@ +package com.manage.controller; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/5/15 16:14 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/5/15 16:14 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ + +import com.alibaba.fastjson.support.spring.FastJsonJsonView; +import com.manage.util.ExceptionPrintUtil; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.servlet.ModelAndView; + +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(value = Exception.class)//指定拦截的异常 + public ModelAndView errorHandler(Exception e) { + return returnMv(e, "服务器出错了,请联系系统管理员"); + } + + @ExceptionHandler(value = RuntimeException.class)//指定拦截的异常 + public ModelAndView runtimeHandler(Exception e) { + return returnMv(e, "服务器出错了,请联系系统管理员"); + } + + private ModelAndView returnMv(Exception e, String msg) { + ModelAndView mv = new ModelAndView(); + /* 使用FastJson提供的FastJsonJsonView视图返回，不需要捕获异常 */ + FastJsonJsonView view = new FastJsonJsonView(); + Map attributes = new HashMap<>(1); + attributes.put("code", "500"); + attributes.put("msg", msg); + view.setAttributesMap(attributes); + mv.setView(view); + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return mv; + } +} diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java index 0ec5652..681589d 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -87,16 +87,16 @@ public class LoginController { list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),null); } if(null != list && !list.isEmpty()){ - for (int i = 0; i < list.size(); i++) { + for (Power_Menu power_menu : list) { User_Dept_Menu deptMenu = new User_Dept_Menu(); - String menuUrl = list.get(i).getMenuUrl(); - if(StringUtils.isNotBlank(menuUrl)){ - BeanUtils.copyProperties(list.get(i),deptMenu); - deptMenu.setMethodParent(list.get(i).getParentId()); + String menuUrl = power_menu.getMenuUrl(); + if (StringUtils.isNotBlank(menuUrl)) { + BeanUtils.copyProperties(power_menu, deptMenu); + deptMenu.setMethodParent(power_menu.getParentId()); menuList.add(deptMenu); } - if(StringUtils.isNotBlank(list.get(i).getMethod())){ - menus.add(list.get(i).getMenuUrl()); + if (StringUtils.isNotBlank(power_menu.getMethod())) { + menus.add(power_menu.getMenuUrl()); } } } @@ -104,16 +104,16 @@ public class LoginController { user.setMenus(menus); //设置科室 - String power_depts = ""; + StringBuilder power_depts = new StringBuilder(); List power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId()); for(int j=0;j list = new ArrayList<>(); - try { - //无异常 - Integer noExc = CacheManager.getExcCount("noExc"); - String valueArr1[] = {noExc.toString()}; - Echarts echarts1 = new Echarts("无异常",null,valueArr1); - - //异常 - Integer exc = CacheManager.getExcCount("exc"); - if(null == exc){ - exc = 0; - } - String valueArr2[] = {exc.toString()}; - Echarts echarts2 = new Echarts("异常",null,valueArr2); + //无异常 + Integer noExc = CacheManager.getExcCount("noExc"); + String valueArr1[] = {noExc.toString()}; + Echarts echarts1 = new Echarts("无异常",null,valueArr1); - //锁定 - Integer effectiveCount = pageService.selectEffectiveCount(); - if(null == effectiveCount){ - effectiveCount = 0; - } - String valueArr3[] = {effectiveCount.toString()}; - Echarts echarts3 = new Echarts("锁定",null,valueArr3); + //异常 + Integer exc = CacheManager.getExcCount("exc"); + if(null == exc){ + exc = 0; + } + String valueArr2[] = {exc.toString()}; + Echarts echarts2 = new Echarts("异常",null,valueArr2); - list.add(echarts1); - list.add(echarts2); - list.add(echarts3); - }catch (Exception e){ - e.printStackTrace(); - return Msg.fail(e.getMessage()); + //锁定 + Integer effectiveCount = pageService.selectEffectiveCount(); + if(null == effectiveCount){ + effectiveCount = 0; } + String valueArr3[] = {effectiveCount.toString()}; + Echarts echarts3 = new Echarts("锁定",null,valueArr3); + + list.add(echarts1); + list.add(echarts2); + list.add(echarts3); return Msg.success().add("list",list); } @@ -295,14 +292,9 @@ public class PageController { @RequestMapping("getEcharts3") @ResponseBody - public Msg getEcharts3(){ - try { - Map map = pageService.getEcharts3(); - return Msg.success().add("list",map); - }catch (Exception e){ - e.printStackTrace(); - return Msg.fail(e.getMessage()); - } + public Msg getEcharts3() throws Exception{ + Map map = pageService.getEcharts3(); + return Msg.success().add("list",map); } @RequestMapping("getEcharts4") @@ -320,27 +312,17 @@ public class PageController { //返回40 @RequestMapping("getEcharts5") @ResponseBody - public Msg getEcharts5(){ + public Msg getEcharts5() throws Exception{ long temperature = 0; - try { - temperature = pageService.getEcharts5(); - return Msg.success().add("temperature",temperature); - }catch (Exception e){ - e.printStackTrace(); - return Msg.success().add("temperature",temperature); - } + temperature = pageService.getEcharts5(); + return Msg.success().add("temperature",temperature); } //返回[8,7.8,5.3] @RequestMapping("getEcharts6") @ResponseBody - public Msg getEcharts6(){ - try { - List list = pageService.getEcharts6(); - return Msg.success().add("list",list); - }catch (Exception e){ - e.printStackTrace(); - return Msg.fail(e.getMessage()); - } + public Msg getEcharts6()throws Exception{ + List list = pageService.getEcharts6(); + return Msg.success().add("list",list); } } diff --git a/power-admin/src/main/java/com/manage/controller/Power_LogController.java b/power-admin/src/main/java/com/manage/controller/Power_LogController.java index 9074585..65be263 100644 --- a/power-admin/src/main/java/com/manage/controller/Power_LogController.java +++ b/power-admin/src/main/java/com/manage/controller/Power_LogController.java @@ -5,6 +5,7 @@ import com.manage.annotation.RequiresPermissions; import com.manage.dao.Power_LogMapper; import com.manage.service.cache.CacheManager; import com.manage.service.LogService; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.ExportExcelUtil; import com.manage.util.Msg; import com.manage.util.PageHelper; @@ -91,7 +92,7 @@ public class Power_LogController { if(null != logs && !logs.isEmpty()){ Set menus = user.getMenus(); if(null != menus && !menus.isEmpty()){ - Integer deleteOper = 0; + int deleteOper = 0; for(String menu : menus){ if(StringUtils.isNotBlank(menu)){ if("/otherManage/deleteLogById".equals(menu)){ @@ -107,6 +108,7 @@ public class Power_LogController { pageHelper.setRows(logs); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -130,16 +132,10 @@ public class Power_LogController { @RequiresPermissions("/otherManage/deleteLogById") @RequestMapping("deleteLogById/{logId}") @ResponseBody - public Msg deleteLogById(@PathVariable("logId")Integer logId){ - try{ - logService.deleteLogById(logId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("删除失败，请联系超管!"); - } + public Msg deleteLogById(@PathVariable("logId")Integer logId) throws Exception{ + logService.deleteLogById(logId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } /** @@ -158,27 +154,21 @@ public class Power_LogController { @RequestMapping("deleteLogByIds/{ids}") @RequiresPermissions("/otherManage/deleteLogByIds") @ResponseBody - public Msg deleteLogByIds(@PathVariable("ids")String ids){ - try{ - String[] idList = ids.split(","); - String str = ""; - for (int i = 0; i < idList.length; i++) { - if(StringUtils.isNoneBlank(idList[i])){ - if(i != idList.length - 1){ - str += idList[i] + ","; - }else{ - str += idList[i]; - } + public Msg deleteLogByIds(@PathVariable("ids")String ids) throws Exception{ + String[] idList = ids.split(","); + StringBuilder str = new StringBuilder(); + for (int i = 0; i < idList.length; i++) { + if(StringUtils.isNoneBlank(idList[i])){ + if(i != idList.length - 1){ + str.append(idList[i]).append(","); + }else{ + str.append(idList[i]); } } - logService.deleteLogByIds(str); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("删除失败，请联系超管!"); } + logService.deleteLogByIds(str.toString()); + CacheManager.addExcCount("noExc"); + return Msg.success(); } /** @@ -216,6 +206,7 @@ public class Power_LogController { exportExcelUtil.expordExcel(tableThNames,fieldCns,logs,fileName,response); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } diff --git a/power-admin/src/main/java/com/manage/controller/Power_MenuController.java b/power-admin/src/main/java/com/manage/controller/Power_MenuController.java index 1050fba..358bb2e 100644 --- a/power-admin/src/main/java/com/manage/controller/Power_MenuController.java +++ b/power-admin/src/main/java/com/manage/controller/Power_MenuController.java @@ -46,22 +46,16 @@ public class Power_MenuController { @RequestMapping("indexMenu") @ResponseBody - public Msg indexMenu() { - try { - Power_UserVo user = (Power_UserVo) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER); - List list = null; - if(user.getRoleId().equals(0) || user.getRoleId().equals(-100)){ - list = powerMenuService.queryAllPowerMenu("power",user.getRoleId()); - } else{ - list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),"power"); - } - CacheManager.addExcCount("noExc"); - return Msg.success().add("listPower", list); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); + public Msg indexMenu() throws Exception{ + Power_UserVo user = (Power_UserVo) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER); + List list = null; + if(user.getRoleId().equals(0) || user.getRoleId().equals(-100)){ + list = powerMenuService.queryAllPowerMenu("power",user.getRoleId()); + } else{ + list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),"power"); } + CacheManager.addExcCount("noExc"); + return Msg.success().add("listPower", list); /* Power_User user = (Power_User) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER); diff --git a/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java b/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java index b8b9790..0cce435 100644 --- a/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java +++ b/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java @@ -8,6 +8,7 @@ import com.manage.entity.Power_Menu; import com.manage.service.cache.CacheManager; import com.manage.service.PowerService; import com.manage.service.Power_MenuService; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.vo.Power_Sys_DictVo; import org.apache.commons.lang3.StringUtils; @@ -45,6 +46,7 @@ public class Power_MenuManageController { CacheManager.addExcCount("noExc"); return JSON.toJSONString(dicts); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -68,6 +70,7 @@ public class Power_MenuManageController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -76,42 +79,30 @@ public class Power_MenuManageController { @RequestMapping(value = "checkMenuName") @ResponseBody - public Msg checkMenuName(String sysFlag,String menuName){ - try { - List menus = menuService.checkMenuNameBySysId(sysFlag,menuName); - CacheManager.addExcCount("noExc"); - if(null != menus && !menus.isEmpty()){ - return Msg.fail(); - }else{ - return Msg.success(); - } - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return null; + public Msg checkMenuName(String sysFlag,String menuName) throws Exception{ + List menus = menuService.checkMenuNameBySysId(sysFlag,menuName); + CacheManager.addExcCount("noExc"); + if(null != menus && !menus.isEmpty()){ + return Msg.fail(); + }else{ + return Msg.success(); } } @RequestMapping(value = "checkMethodName") @ResponseBody - public Msg checkMethodName(Integer parentId,String methodName,String method){ - try { - List menus = new ArrayList<>(); - if(StringUtils.isNotBlank(method)){ - menus = menuService.checkMethodByParentId(parentId, null,method); - }else{ - menus = menuService.checkMethodByParentId(parentId, methodName,null); - } - CacheManager.addExcCount("noExc"); - if(null != menus && !menus.isEmpty()){ - return Msg.fail(); - }else{ - return Msg.success(); - } - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return null; + public Msg checkMethodName(Integer parentId,String methodName,String method) throws Exception{ + List menus = new ArrayList<>(); + if(StringUtils.isNotBlank(method)){ + menus = menuService.checkMethodByParentId(parentId, null,method); + }else{ + menus = menuService.checkMethodByParentId(parentId, methodName,null); + } + CacheManager.addExcCount("noExc"); + if(null != menus && !menus.isEmpty()){ + return Msg.fail(); + }else{ + return Msg.success(); } } @@ -119,141 +110,129 @@ public class Power_MenuManageController { @RequiresPermissions(value="/menu/update") @RequestMapping(value="update",method = RequestMethod.POST) @ResponseBody - public Msg addMenu(Power_Menu menu,String sysName){ + public Msg addMenu(Power_Menu menu,String sysName) throws Exception{ if(StringUtils.isNotBlank(menu.getMenuUrl())){ if(!menu.getMenuUrl().contains("/") && !"#".equals(menu.getMenuUrl())){ return Msg.fail("菜单地址必须包含斜杠/,建目录必须为单个字符#"); } } - try { - List menus = new ArrayList<>(); - if(StringUtils.isNotBlank(menu.getSysFlag())){ - menus = menuService.checkMenuNameBySysId(menu.getSysFlag(), menu.getMenuName()); - } - if(menu.getMenuId() == null){ - if(StringUtils.isNoneBlank(menu.getMethod())) { - Integer parentId = menu.getParentId(); - Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); - String menuUrl = parentMenu.getMenuUrl(); - if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { - String methodUrl = ""; - // /user /user/pageUI user/pageUI ../user/pageUI - String str1 = ""; - String str = menuUrl.substring(0, 1); - if(menuUrl.length() >= 3){ - str1 = menuUrl.substring(0, 3); - } - if("/".equals(str)){ - menuUrl = menuUrl.substring(1,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "/" + menu.getMethod(); - } - }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ - menuUrl = menuUrl.substring(3,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "../" + menu.getMethod(); - } + List menus = new ArrayList<>(); + if(StringUtils.isNotBlank(menu.getSysFlag())){ + menus = menuService.checkMenuNameBySysId(menu.getSysFlag(), menu.getMenuName()); + } + if(menu.getMenuId() == null){ + if(StringUtils.isNoneBlank(menu.getMethod())) { + Integer parentId = menu.getParentId(); + Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); + String menuUrl = parentMenu.getMenuUrl(); + if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { + String methodUrl = ""; + // /user /user/pageUI user/pageUI ../user/pageUI + String str1 = ""; + String str = menuUrl.substring(0, 1); + if(menuUrl.length() >= 3){ + str1 = menuUrl.substring(0, 3); + } + if("/".equals(str)){ + menuUrl = menuUrl.substring(1,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ + String[] menuss = menuUrl.split("/"); + methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); }else{ + methodUrl = "/" + menu.getMethod(); + } + }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ + menuUrl = menuUrl.substring(3,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ String[] menuss = menuUrl.split("/"); - methodUrl = menuss[0] + "/" + menu.getMethod(); + methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); + }else{ + methodUrl = "../" + menu.getMethod(); } - menu.setMenuUrl(methodUrl); }else{ - return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); - } - List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); - List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); - if(null != checkMethodNames && !checkMethodNames.isEmpty()){ - return Msg.fail("功能名称不能重复!"); - } - if(null != checkMethods && !checkMethods.isEmpty()){ - return Msg.fail("功能方法已存在!"); + String[] menuss = menuUrl.split("/"); + methodUrl = menuss[0] + "/" + menu.getMethod(); } + menu.setMenuUrl(methodUrl); }else{ - if(null != menus && !menus.isEmpty()){ - return Msg.fail("菜单名不能重复!"); - } + return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); + } + List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); + List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); + if(null != checkMethodNames && !checkMethodNames.isEmpty()){ + return Msg.fail("功能名称不能重复!"); + } + if(null != checkMethods && !checkMethods.isEmpty()){ + return Msg.fail("功能方法已存在!"); } - menuService.addMenu(menu,sysName); }else{ - if(StringUtils.isNoneBlank(menu.getMethod())) { - Integer parentId = menu.getParentId(); - Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); - String menuUrl = parentMenu.getMenuUrl(); - if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { - String methodUrl = ""; - // /user /user/pageUI user/pageUI ../user/pageUI - String str1 = ""; - String str = menuUrl.substring(0, 1); - if(menuUrl.length() >= 3){ - str1 = menuUrl.substring(0, 3); - } - if("/".equals(str)){ - menuUrl = menuUrl.substring(1,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "/" + menu.getMethod(); - } - }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ - menuUrl = menuUrl.substring(3,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "../" + menu.getMethod(); - } + if(null != menus && !menus.isEmpty()){ + return Msg.fail("菜单名不能重复!"); + } + } + menuService.addMenu(menu,sysName); + }else{ + if(StringUtils.isNoneBlank(menu.getMethod())) { + Integer parentId = menu.getParentId(); + Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); + String menuUrl = parentMenu.getMenuUrl(); + if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { + String methodUrl = ""; + // /user /user/pageUI user/pageUI ../user/pageUI + String str1 = ""; + String str = menuUrl.substring(0, 1); + if(menuUrl.length() >= 3){ + str1 = menuUrl.substring(0, 3); + } + if("/".equals(str)){ + menuUrl = menuUrl.substring(1,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ + String[] menuss = menuUrl.split("/"); + methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); }else{ + methodUrl = "/" + menu.getMethod(); + } + }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ + menuUrl = menuUrl.substring(3,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ String[] menuss = menuUrl.split("/"); - methodUrl = menuss[0] + "/" + menu.getMethod(); + methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); + }else{ + methodUrl = "../" + menu.getMethod(); } - menu.setMenuUrl(methodUrl); }else{ - return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); - } - List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); - List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); - if(null != checkMethodNames && !checkMethodNames.isEmpty() && !checkMethodNames.get(0).getMenuId().equals(menu.getMenuId())){ - return Msg.fail("方法名不能重复!"); - } - if(null != checkMethods && !checkMethods.isEmpty() && !checkMethods.get(0).getMenuId().equals(menu.getMenuId())){ - return Msg.fail("功能方法已存在!"); + String[] menuss = menuUrl.split("/"); + methodUrl = menuss[0] + "/" + menu.getMethod(); } + menu.setMenuUrl(methodUrl); }else{ - if(null != menus && !menus.isEmpty() && !menus.get(0).getMenuId().equals(menu.getMenuId())){ - return Msg.fail("菜单名不能重复!"); - } + return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); + } + List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); + List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); + if(null != checkMethodNames && !checkMethodNames.isEmpty() && !checkMethodNames.get(0).getMenuId().equals(menu.getMenuId())){ + return Msg.fail("方法名不能重复!"); + } + if(null != checkMethods && !checkMethods.isEmpty() && !checkMethods.get(0).getMenuId().equals(menu.getMenuId())){ + return Msg.fail("功能方法已存在!"); + } + }else{ + if(null != menus && !menus.isEmpty() && !menus.get(0).getMenuId().equals(menu.getMenuId())){ + return Msg.fail("菜单名不能重复!"); } - menuService.updateMenu(menu,sysName); } - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("保存失败,请联系系统管理员!"); + menuService.updateMenu(menu,sysName); } + CacheManager.addExcCount("noExc"); + return Msg.success(); } @RequiresPermissions(value="/menu/delete") @RequestMapping("delete/{menuId}") @ResponseBody - public Msg delMenu(@PathVariable("menuId")Integer menuId){ - try { - menuService.deleteMenuByMenuId(menuId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg delMenu(@PathVariable("menuId")Integer menuId) throws Exception{ + menuService.deleteMenuByMenuId(menuId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } } diff --git a/power-admin/src/main/java/com/manage/controller/Power_NoticeController.java b/power-admin/src/main/java/com/manage/controller/Power_NoticeController.java index fcd2375..ae638b9 100644 --- a/power-admin/src/main/java/com/manage/controller/Power_NoticeController.java +++ b/power-admin/src/main/java/com/manage/controller/Power_NoticeController.java @@ -7,6 +7,7 @@ import com.manage.entity.Power_Notice; import com.manage.entity.Power_User; import com.manage.service.cache.CacheManager; import com.manage.service.ipml.Power_NoticeServiceImpl; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.util.PageHelper; import com.manage.vo.*; @@ -63,6 +64,7 @@ public class Power_NoticeController { CacheManager.addExcCount("noExc"); return pageHelper; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -71,7 +73,7 @@ public class Power_NoticeController { - public List putChildren(List moduleList, Power_NoticeVo notice,Power_User user) { + private List putChildren(List moduleList, Power_NoticeVo notice,Power_User user) { if (moduleList.size() > 0) { for (Power_Notice mod2 : moduleList) { HashMap param = new HashMap(); @@ -99,6 +101,7 @@ public class Power_NoticeController { CacheManager.addExcCount("noExc"); return JSON.toJSONString(treeList); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -107,110 +110,80 @@ public class Power_NoticeController { @RequestMapping(value = "checkTypeSysFlagOrTypeSysName") @ResponseBody - public Msg checkTypeSysFlag(String noticeTypeFlag,String noticeTypeName){ - try { - if(StringUtils.isNoneBlank(noticeTypeFlag) || StringUtils.isNotBlank(noticeTypeName)) { - Power_Notice powerNotice = noticeService.checkTypeSysFlagOrTypeSysName(noticeTypeFlag, noticeTypeName); - CacheManager.addExcCount("noExc"); - if (null != powerNotice) { - return Msg.fail(); - } else { - return Msg.success(); - } - }else{ - return Msg.fail("查询出错,请联系系统管理员!"); + public Msg checkTypeSysFlag(String noticeTypeFlag,String noticeTypeName) throws Exception{ + if(StringUtils.isNoneBlank(noticeTypeFlag) || StringUtils.isNotBlank(noticeTypeName)) { + Power_Notice powerNotice = noticeService.checkTypeSysFlagOrTypeSysName(noticeTypeFlag, noticeTypeName); + CacheManager.addExcCount("noExc"); + if (null != powerNotice) { + return Msg.fail(); + } else { + return Msg.success(); } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); + }else{ return Msg.fail("查询出错,请联系系统管理员!"); } } @RequestMapping(value = "update") @ResponseBody - public Msg udpate(Power_Notice powerNotice,HttpServletRequest request){ - try { - //保存类别 - if(StringUtils.isNotBlank(powerNotice.getNoticeTypeFlag())){ - //验证用户名 - Power_Notice typeNotice = noticeService.checkTypeSysFlagOrTypeSysName(powerNotice.getNoticeTypeFlag(), null); - Power_Notice nameNotice = noticeService.checkTypeSysFlagOrTypeSysName(null,powerNotice.getNoticeTypeName()); - //添加类别 - if (null == powerNotice.getNoticeId()) { - if(null != typeNotice){ - return Msg.fail("类别标志已存在!"); - } - if(null != nameNotice){ - return Msg.fail("类别名称已存在!"); - } - noticeService.update(powerNotice,request); - } else { - //修改类别 - if(null != typeNotice && !typeNotice.getNoticeId().equals(powerNotice.getNoticeId())){ - return Msg.fail("类别标志已存在!"); - } - if(null != nameNotice && !nameNotice.getNoticeId().equals(powerNotice.getNoticeId())){ - return Msg.fail("类别名称已存在!"); - } - noticeService.update(powerNotice,request); + public Msg udpate(Power_Notice powerNotice,HttpServletRequest request) throws Exception{ + //保存类别 + if(StringUtils.isNotBlank(powerNotice.getNoticeTypeFlag())){ + //验证用户名 + Power_Notice typeNotice = noticeService.checkTypeSysFlagOrTypeSysName(powerNotice.getNoticeTypeFlag(), null); + Power_Notice nameNotice = noticeService.checkTypeSysFlagOrTypeSysName(null,powerNotice.getNoticeTypeName()); + //添加类别 + if (null == powerNotice.getNoticeId()) { + if(null != typeNotice){ + return Msg.fail("类别标志已存在!"); + } + if(null != nameNotice){ + return Msg.fail("类别名称已存在!"); + } + noticeService.update(powerNotice,request); + } else { + //修改类别 + if(null != typeNotice && !typeNotice.getNoticeId().equals(powerNotice.getNoticeId())){ + return Msg.fail("类别标志已存在!"); + } + if(null != nameNotice && !nameNotice.getNoticeId().equals(powerNotice.getNoticeId())){ + return Msg.fail("类别名称已存在!"); } - }else{ - //保存通知 noticeService.update(powerNotice,request); } - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - e.printStackTrace(); - CacheManager.addExcCount("exc"); - return Msg.fail("查询出错,请联系系统管理员!"); + }else{ + //保存通知 + noticeService.update(powerNotice,request); } + CacheManager.addExcCount("noExc"); + return Msg.success(); } @OptionalLog(module = "删除",methods = "通知管理",fieldName = "noticeContent",fieldName1="noticeTypeName",tableName = "power_notice") @RequestMapping(value = "delete") @ResponseBody - public Msg delete(Integer noticeId){ - try { - noticeService.delete(noticeId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg delete(Integer noticeId) throws Exception{ + noticeService.delete(noticeId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } /************************************************通知操作***************************************************/ @RequestMapping(value = "getUserNameListByNoticeTypeId") @ResponseBody - public Msg getUserNameListByNoticeTypeId(Integer noticeTypeId, HttpServletRequest request){ - try { - List userList = noticeService.getUserNameListByNoticeTypeId(noticeTypeId, request); - CacheManager.addExcCount("noExc"); - return Msg.success().add("userList",userList); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("查询出错,请联系系统管理员!"); - } + public Msg getUserNameListByNoticeTypeId(Integer noticeTypeId, HttpServletRequest request) throws Exception{ + List userList = noticeService.getUserNameListByNoticeTypeId(noticeTypeId, request); + CacheManager.addExcCount("noExc"); + return Msg.success().add("userList",userList); } @RequestMapping(value = "selectNoticeByNoticeId") @ResponseBody - public Msg selectNoticeByNoticeId(Integer noticeId){ - try { - Power_Notice powerNotice = noticeMapper.selectByPrimaryKey(noticeId); - CacheManager.addExcCount("noExc"); - return Msg.success().add("powerNotice",powerNotice); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("查询出错,请联系系统管理员!"); - } + public Msg selectNoticeByNoticeId(Integer noticeId) throws Exception{ + Power_Notice powerNotice = noticeMapper.selectByPrimaryKey(noticeId); + CacheManager.addExcCount("noExc"); + return Msg.success().add("powerNotice",powerNotice); } @OptionalLog(module = "导出excel",methods = "通知管理") @@ -221,6 +194,7 @@ public class Power_NoticeController { noticeService.export(powerNoticeVo,noticeIds,response,request); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); @@ -229,16 +203,10 @@ public class Power_NoticeController { @RequestMapping(value = "updateNoticeReadFlag") @ResponseBody - public Msg updateNoticeReadFlag(Integer noticeId){ - try { - noticeService.updateNoticeReadFlag(noticeId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("修改出错了,请联系系统管理员!"); - } + public Msg updateNoticeReadFlag(Integer noticeId) throws Exception{ + noticeService.updateNoticeReadFlag(noticeId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } /** @@ -255,22 +223,16 @@ public class Power_NoticeController { */ @RequestMapping("getUnReadCount") @ResponseBody - public Msg getUnReadCount(HttpServletRequest request){ - try { - //获取登录者信息 - Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); - Integer userId = null; - //系统管理员userId为null,非系统管理员传入userId - if(user.getRoleId() != 0){ - userId = user.getRoleId(); - } - int unReadCount = noticeService.getUnReadCount(userId); - CacheManager.addExcCount("noExc"); - return Msg.success().add("unReadCount",unReadCount); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(e.getMessage()); + public Msg getUnReadCount(HttpServletRequest request) throws Exception{ + //获取登录者信息 + Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); + Integer userId = null; + //系统管理员userId为null,非系统管理员传入userId + if(user.getRoleId() != 0){ + userId = user.getRoleId(); } + int unReadCount = noticeService.getUnReadCount(userId); + CacheManager.addExcCount("noExc"); + return Msg.success().add("unReadCount",unReadCount); } } diff --git a/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java b/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java index 4f4b4c6..ac9d902 100644 --- a/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java +++ b/power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java @@ -7,6 +7,7 @@ import com.manage.entity.Power_User; import com.manage.service.cache.CacheManager; import com.manage.service.Power_DeptService; import com.manage.service.Power_Sys_DictService; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.util.PageHelper; import com.manage.vo.Power_DeptVo; @@ -66,6 +67,7 @@ public class Power_Sys_DictController { CacheManager.addExcCount("noExc"); return power_sys_dicts; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -80,6 +82,7 @@ public class Power_Sys_DictController { CacheManager.addExcCount("noExc"); return power_sys_dicts; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -94,6 +97,7 @@ public class Power_Sys_DictController { CacheManager.addExcCount("noExc"); return power_sys_dict; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -101,162 +105,138 @@ public class Power_Sys_DictController { } @RequestMapping("/checkHospitalName") @ResponseBody - public Msg checkHospitalName(String hospitalName){ - try { - Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(hospitalName); - CacheManager.addExcCount("noExc"); - if(dictVo != null){ - return Msg.fail("医院名称已存在"); - }else{ - return Msg.success(); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("验证失败,请联系系统管理员"); + public Msg checkHospitalName(String hospitalName) throws Exception{ + Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(hospitalName); + CacheManager.addExcCount("noExc"); + if(dictVo != null){ + return Msg.fail("医院名称已存在"); + }else{ + return Msg.success(); } } @RequiresPermissions(value="/dict/add") @RequestMapping("/add") @ResponseBody - public Msg add(Power_Sys_DictVo powerSysDict, HttpServletRequest request){ - try { - if(powerSysDict.getDictId() == null){ - //添加医院 - if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){ - Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName()); - if(dictVo != null){ - return Msg.fail("医院名称不能重复!"); - } - powerSysDictService.insertSelective(powerSysDict,request); - Integer dictId = powerSysDict.getDictId(); - CacheManager.addExcCount("noExc"); - return Msg.success().add("dictId",dictId); - }else{ - //添加系统 - String deptIds = powerSysDict.getDeptIds(); - if(StringUtils.isBlank(deptIds)){ - deptIds = "-999"; + public Msg add(Power_Sys_DictVo powerSysDict, HttpServletRequest request) throws Exception{ + if(powerSysDict.getDictId() == null){ + //添加医院 + if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){ + Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName()); + if(dictVo != null){ + return Msg.fail("医院名称不能重复!"); + } + powerSysDictService.insertSelective(powerSysDict,request); + Integer dictId = powerSysDict.getDictId(); + CacheManager.addExcCount("noExc"); + return Msg.success().add("dictId",dictId); + }else{ + //添加系统 + String deptIds = powerSysDict.getDeptIds(); + if(StringUtils.isBlank(deptIds)){ + deptIds = "-999"; + } + if(!deptIds.contains(",")){ + List deptBySysFlagList = sysDictMapper.selectDeptIdByParentIdAndSysFlag(powerSysDict.getParentId(), powerSysDict.getSysFlag(),deptIds); + if(null != deptBySysFlagList && !deptBySysFlagList.isEmpty()){ + return Msg.fail("系统标识已存在!"); } - if(!deptIds.contains(",")){ - List deptBySysFlagList = sysDictMapper.selectDeptIdByParentIdAndSysFlag(powerSysDict.getParentId(), powerSysDict.getSysFlag(),deptIds); - if(null != deptBySysFlagList && !deptBySysFlagList.isEmpty()){ - return Msg.fail("系统标识已存在!"); - } + } + /*List dicts = powerSysDictService.checkSysFlagOrSysNameByDeptIds(powerSysDict.getSysFlag(), powerSysDict.getSysName(), deptIds); + if(null != dicts && !dicts.isEmpty()) { + if (StringUtils.isNoneBlank(powerSysDict.getSysFlag())) { + return Msg.fail("系统标识已存在!"); + } else { + return Msg.fail("系统名称已存在!"); } - /*List dicts = powerSysDictService.checkSysFlagOrSysNameByDeptIds(powerSysDict.getSysFlag(), powerSysDict.getSysName(), deptIds); - if(null != dicts && !dicts.isEmpty()) { - if (StringUtils.isNoneBlank(powerSysDict.getSysFlag())) { - return Msg.fail("系统标识已存在!"); - } else { - return Msg.fail("系统名称已存在!"); - } - }*/ - if(StringUtils.isNoneBlank(deptIds) && deptIds.contains(",")){ - int count = powerSysDictService.simpleInsertDict(powerSysDict, deptIds, request); - if(count == 0){ - return Msg.fail("系统已存在!"); - }else{ - int dictLastId = sysDictMapper.selectLastDict(); - powerSysDict.setDictId(dictLastId); - } + }*/ + if(StringUtils.isNoneBlank(deptIds) && deptIds.contains(",")){ + int count = powerSysDictService.simpleInsertDict(powerSysDict, deptIds, request); + if(count == 0){ + return Msg.fail("系统已存在!"); }else{ - powerSysDict.setDeptId(Integer.valueOf(deptIds)); - powerSysDictService.insertSelective(powerSysDict,request); + int dictLastId = sysDictMapper.selectLastDict(); + powerSysDict.setDictId(dictLastId); } + }else{ + powerSysDict.setDeptId(Integer.valueOf(deptIds)); + powerSysDictService.insertSelective(powerSysDict,request); + } + CacheManager.addExcCount("noExc"); + return Msg.success().add("dictId",powerSysDict.getDictId()); + } + }else{ + //修改 + if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){ + //修改医院信息 + Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName()); + if(dictVo != null && !dictVo.getDictId().equals(powerSysDict.getDictId())){ + return Msg.fail("医院名称已存在!"); + }else{ + powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request); CacheManager.addExcCount("noExc"); return Msg.success().add("dictId",powerSysDict.getDictId()); } }else{ - //修改 - if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){ - //修改医院信息 - Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName()); - if(dictVo != null && !dictVo.getDictId().equals(powerSysDict.getDictId())){ - return Msg.fail("医院名称已存在!"); - }else{ - powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request); - CacheManager.addExcCount("noExc"); - return Msg.success().add("dictId",powerSysDict.getDictId()); + //修改系统信息 + Integer deptId = powerSysDict.getDeptId(); + if(null == deptId){ + deptId = -999; + } + List flagExists = powerSysDictService.checkSysFlagOrSysNameByDeptId(powerSysDict.getSysFlag(), null, deptId.toString()); + if(null != flagExists && !flagExists.isEmpty()) { + //判断是否包含在这个集合里 + boolean flagExist = false; + for (Power_Sys_Dict flagExist1 : flagExists) { + if (!flagExist1.getDictId().equals(powerSysDict.getDictId())) { + flagExist = true; + } } - }else{ - //修改系统信息 - Integer deptId = powerSysDict.getDeptId(); - if(null == deptId){ - deptId = -999; + if(flagExist){ + return Msg.fail("系统标识已存在!"); } - List flagExists = powerSysDictService.checkSysFlagOrSysNameByDeptId(powerSysDict.getSysFlag(), null, deptId.toString()); - if(null != flagExists && !flagExists.isEmpty()) { - //判断是否包含在这个集合里 - Boolean flagExist = false; - for (int i = 0; i < flagExists.size(); i++) { - if(!flagExists.get(i).getDictId().equals(powerSysDict.getDictId())){ - flagExist = true; - } - } - if(flagExist){ - return Msg.fail("系统标识已存在!"); + } + //修改系统信息 + List sysNameExists = powerSysDictService.checkSysFlagOrSysNameByDeptId(null, powerSysDict.getSysName(), deptId.toString()); + if(null != sysNameExists && !sysNameExists.isEmpty()) { + //判断是否包含在这个集合里 + boolean sysNameExist = false; + for (Power_Sys_Dict sysNameExist1 : sysNameExists) { + if (!sysNameExist1.getDictId().equals(powerSysDict.getDictId())) { + sysNameExist = true; } } - //修改系统信息 - List sysNameExists = powerSysDictService.checkSysFlagOrSysNameByDeptId(null, powerSysDict.getSysName(), deptId.toString()); - if(null != sysNameExists && !sysNameExists.isEmpty()) { - //判断是否包含在这个集合里 - Boolean sysNameExist = false; - for (int i = 0; i < sysNameExists.size(); i++) { - if(!sysNameExists.get(i).getDictId().equals(powerSysDict.getDictId())){ - sysNameExist = true; - } - } - if(sysNameExist){ - return Msg.fail("系统名称已存在!"); - } + if(sysNameExist){ + return Msg.fail("系统名称已存在!"); } - if(StringUtils.isNoneBlank(powerSysDict.getSysType()) && "权限系统".equals(powerSysDict.getSysType())){ - powerSysDict.setDeptId(null); + } + if(StringUtils.isNoneBlank(powerSysDict.getSysType()) && "权限系统".equals(powerSysDict.getSysType())){ + powerSysDict.setDeptId(null); - }else{ - //计算出科室减少部分批量删除，增加部分批量增加，重叠部分批量修改 - } - powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request); + }else{ + //计算出科室减少部分批量删除，增加部分批量增加，重叠部分批量修改 } - CacheManager.addExcCount("noExc"); - return Msg.success().add("dictId",powerSysDict.getDictId()); + powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request); } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("添加失败,请联系系统管理员!"); + CacheManager.addExcCount("noExc"); + return Msg.success().add("dictId",powerSysDict.getDictId()); } } @RequiresPermissions(value="/dict/update") @RequestMapping("/update") @ResponseBody - public Msg update(@RequestBody Power_Sys_Dict powerSysDict, HttpServletRequest request){ - try { - powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("更新失败,请联系系统管理员!"); - } + public Msg update(@RequestBody Power_Sys_Dict powerSysDict, HttpServletRequest request) throws Exception{ + powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request); + CacheManager.addExcCount("noExc"); + return Msg.success(); } @RequiresPermissions(value="/dict/delete") @RequestMapping("/delete") @ResponseBody - public Msg delete(Integer dictId){ - try { - powerSysDictService.deleteByPrimaryKey(dictId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("更新失败,请联系系统管理员!"); - } + public Msg delete(Integer dictId) throws Exception{ + powerSysDictService.deleteByPrimaryKey(dictId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } @RequestMapping("/selectType") @ResponseBody @@ -266,6 +246,7 @@ public class Power_Sys_DictController { CacheManager.addExcCount("noExc"); return power_sys_dictVos; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -277,6 +258,7 @@ public class Power_Sys_DictController { powerSysDictService.export(response); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -284,19 +266,13 @@ public class Power_Sys_DictController { @RequestMapping("/getHospitalByParentId") @ResponseBody - public Msg getHospitalByParentId(Integer dictId){ - try { - Power_Sys_DictVo powerSysExsit = powerSysDictService.getHospitalByParentId(dictId, "权限系统"); - CacheManager.addExcCount("noExc"); - if(null != powerSysExsit){ - return Msg.fail(); - }else{ - return Msg.success(); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("查询失败,请联系系统管理员!"); + public Msg getHospitalByParentId(Integer dictId) throws Exception{ + Power_Sys_DictVo powerSysExsit = powerSysDictService.getHospitalByParentId(dictId, "权限系统"); + CacheManager.addExcCount("noExc"); + if(null != powerSysExsit){ + return Msg.fail(); + }else{ + return Msg.success(); } } @@ -359,6 +335,7 @@ public class Power_Sys_DictController { model.addAttribute("deptId",deptId); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -367,26 +344,20 @@ public class Power_Sys_DictController { @RequestMapping("/checkSysFlagOrSysNameByDeptId") @ResponseBody - public Msg checkSysFlagOrSysNameByDeptId(String sysFlag,String sysName,String deptIds){ - try { - if(StringUtils.isBlank(deptIds)){ - deptIds = "-999"; - } - List dicts = powerSysDictService.checkSysFlagOrSysNameByDeptId(sysFlag, sysName, deptIds); - CacheManager.addExcCount("noExc"); - if(null != dicts && !dicts.isEmpty()){ - if(StringUtils.isNoneBlank(sysFlag)){ - return Msg.fail("系统标识已存在!"); - }else{ - return Msg.fail("系统名称已存在!"); - } + public Msg checkSysFlagOrSysNameByDeptId(String sysFlag,String sysName,String deptIds) throws Exception{ + if(StringUtils.isBlank(deptIds)){ + deptIds = "-999"; + } + List dicts = powerSysDictService.checkSysFlagOrSysNameByDeptId(sysFlag, sysName, deptIds); + CacheManager.addExcCount("noExc"); + if(null != dicts && !dicts.isEmpty()){ + if(StringUtils.isNoneBlank(sysFlag)){ + return Msg.fail("系统标识已存在!"); }else{ - return Msg.success(); + return Msg.fail("系统名称已存在!"); } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("验证失败，请联系系统管理员!"); + }else{ + return Msg.success(); } } } diff --git a/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java b/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java index b8658b3..af479c2 100644 --- a/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java +++ b/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java @@ -8,6 +8,7 @@ import com.manage.entity.Power_User; import com.manage.service.cache.CacheManager; import com.manage.service.PowerService; import com.manage.service.Power_UserService; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.vo.PowerTree; import com.manage.vo.Power_UserAndRoleTree; @@ -75,6 +76,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -106,6 +108,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -134,6 +137,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -183,6 +187,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -205,19 +210,13 @@ public class RoleAndUserPowerController { @RequiresPermissions(value="/menuPower/addRoleMenu") @RequestMapping("/addRoleMenu") @ResponseBody - public Msg addRoleMenu(Integer roleId,String sysFlag,String menus){ - try { - //医院管理员不需要保存 - if(roleId != -100){ - powerService.addRoleMenu(roleId,sysFlag,menus); - } - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("保存失败,请联系系统管理员!"); + public Msg addRoleMenu(Integer roleId,String sysFlag,String menus) throws Exception{ + //医院管理员不需要保存 + if(roleId != -100){ + powerService.addRoleMenu(roleId,sysFlag,menus); } + CacheManager.addExcCount("noExc"); + return Msg.success(); } /**************************************用户菜单权限操作************************************************/ /** @@ -263,6 +262,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -291,6 +291,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -319,6 +320,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -341,20 +343,14 @@ public class RoleAndUserPowerController { @RequiresPermissions(value="/menuPower/addUserMenu") @RequestMapping("addUserMenu") @ResponseBody - public Msg addUserMenu(Integer userId, String sysFlag, String menus){ - try { - Power_UserVo user = userService.selectByPrimaryKey(userId); - //医院管理员不需要保存 - if(user.getRoleId() != -100){ - powerService.addUserMenu(userId,sysFlag,menus); - } - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("保存失败,请联系系统管理员!"); + public Msg addUserMenu(Integer userId, String sysFlag, String menus) throws Exception{ + Power_UserVo user = userService.selectByPrimaryKey(userId); + //医院管理员不需要保存 + if(user.getRoleId() != -100){ + powerService.addUserMenu(userId,sysFlag,menus); } + CacheManager.addExcCount("noExc"); + return Msg.success(); } /******************************************归属管理操作*********************************************************/ /** @@ -379,6 +375,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; diff --git a/power-admin/src/main/java/com/manage/controller/RoleController.java b/power-admin/src/main/java/com/manage/controller/RoleController.java index a1ea901..b1e22d6 100644 --- a/power-admin/src/main/java/com/manage/controller/RoleController.java +++ b/power-admin/src/main/java/com/manage/controller/RoleController.java @@ -7,6 +7,7 @@ import com.manage.entity.Power_User; import com.manage.service.cache.CacheManager; import com.manage.service.Power_RoleService; import com.manage.service.ImportExcel.ImportExcelUtil; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.util.PageHelper; import com.manage.vo.ImportExcelEntity; @@ -66,6 +67,7 @@ public class RoleController { pageHelper.setRows(list); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -91,19 +93,13 @@ public class RoleController { * */ @RequestMapping("/checkRoleName") @ResponseBody - public Msg checkRoleName(String roleName){ - try { - Power_Role role = powerRoleService.checkRoleName(roleName); - CacheManager.addExcCount("noExc"); - if(null != role){ - return Msg.fail("角色名已存在!"); - }else{ - return Msg.success(); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("验证角色名出错了，请联系系统管理员!"); + public Msg checkRoleName(String roleName) throws Exception{ + Power_Role role = powerRoleService.checkRoleName(roleName); + CacheManager.addExcCount("noExc"); + if(null != role){ + return Msg.fail("角色名已存在!"); + }else{ + return Msg.success(); } } @@ -117,20 +113,14 @@ public class RoleController { @RequiresPermissions(value="/role/add") @RequestMapping("/add") @ResponseBody - public Msg add(Power_Role powerRole){ - try { - Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName()); - if(null != role){ - return Msg.fail("角色名不能重复!"); - }else{ - powerRoleService.insertSelective(powerRole); - } - CacheManager.addExcCount("noExc"); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace();; - return Msg.fail("新增失败，请联系系统管理员!"); + public Msg add(Power_Role powerRole) throws Exception{ + Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName()); + if(null != role){ + return Msg.fail("角色名不能重复!"); + }else{ + powerRoleService.insertSelective(powerRole); } + CacheManager.addExcCount("noExc"); return Msg.success(); } @@ -143,20 +133,14 @@ public class RoleController { @RequiresPermissions(value="/role/update") @RequestMapping("/update") @ResponseBody - public Msg update(Power_Role powerRole,HttpServletRequest request){ - try { - Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName()); - if(null != role && !role.getRoleId().equals(powerRole.getRoleId())){ - return Msg.fail("角色名不能重复!"); - }else{ - powerRoleService.updateByPrimaryKeySelective(powerRole,request); - } - CacheManager.addExcCount("noExc"); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("更新失败，请联系系统管理员!"); + public Msg update(Power_Role powerRole,HttpServletRequest request) throws Exception{ + Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName()); + if(null != role && !role.getRoleId().equals(powerRole.getRoleId())){ + return Msg.fail("角色名不能重复!"); + }else{ + powerRoleService.updateByPrimaryKeySelective(powerRole,request); } + CacheManager.addExcCount("noExc"); return Msg.success(); } /** @@ -168,16 +152,10 @@ public class RoleController { @RequiresPermissions(value="/role/delete") @RequestMapping("/delete") @ResponseBody - public Msg delete(Integer roleId){ - try { - powerRoleService.deleteByPrimaryKey(roleId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg delete(Integer roleId) throws Exception{ + powerRoleService.deleteByPrimaryKey(roleId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } /** * @Date 2019-4-25 @@ -192,6 +170,7 @@ public class RoleController { CacheManager.addExcCount("noExc"); return powerRole; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -210,6 +189,7 @@ public class RoleController { powerRoleService.export(powerRole,response,request); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -227,6 +207,7 @@ public class RoleController { CacheManager.addExcCount("noExc"); return power_roles; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -281,6 +262,7 @@ public class RoleController { return new ResponseEntity(msgStr, responseHeaders, HttpStatus.OK); } }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); //抛异常 return new ResponseEntity(e.getMessage(), responseHeaders, HttpStatus.OK); diff --git a/power-admin/src/main/java/com/manage/controller/T_MenuController.java b/power-admin/src/main/java/com/manage/controller/T_MenuController.java index b82f38e..9011809 100644 --- a/power-admin/src/main/java/com/manage/controller/T_MenuController.java +++ b/power-admin/src/main/java/com/manage/controller/T_MenuController.java @@ -29,16 +29,10 @@ public class T_MenuController { */ @RequestMapping(value="/infoById/{id}",method=RequestMethod.GET) @ResponseBody - public Msg getinfoById(@PathVariable("id")Integer id){ - try { - T_Menu obj=new T_Menu(); - obj=t_menuService.getRole(); - CacheManager.addExcCount("noExc"); - return Msg.success().add("obj", obj); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return null; - } + public Msg getinfoById(@PathVariable("id")Integer id) throws Exception{ + T_Menu obj=new T_Menu(); + obj=t_menuService.getRole(); + CacheManager.addExcCount("noExc"); + return Msg.success().add("obj", obj); } } diff --git a/power-admin/src/main/java/com/manage/controller/UserController.java b/power-admin/src/main/java/com/manage/controller/UserController.java index b050041..76f5480 100644 --- a/power-admin/src/main/java/com/manage/controller/UserController.java +++ b/power-admin/src/main/java/com/manage/controller/UserController.java @@ -62,6 +62,7 @@ public class UserController { pageHelper.setRows(list); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -109,6 +110,7 @@ public class UserController { powerUserService.export(powerUser,request,response); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -121,6 +123,7 @@ public class UserController { powerUserService.export1(powerUser,request,response); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -128,19 +131,13 @@ public class UserController { @RequestMapping("/checkUserName") @ResponseBody - public Msg checkUserName(String userName){ - try { - List list = powerUserService.checkUserName(userName); - CacheManager.addExcCount("noExc"); - if(null != list && !list.isEmpty()){ - return Msg.fail("用户名已存在!"); - }else{ - return Msg.success(); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); + public Msg checkUserName(String userName) throws Exception{ + List list = powerUserService.checkUserName(userName); + CacheManager.addExcCount("noExc"); + if(null != list && !list.isEmpty()){ + return Msg.fail("用户名已存在!"); + }else{ + return Msg.success(); } } @@ -148,39 +145,25 @@ public class UserController { @RequiresPermissions(value="/user/add") @RequestMapping("/add") @ResponseBody - public Msg add(Power_User powerUser){ - try { - List user = powerUserService.checkUserName(powerUser.getUserName()); - CacheManager.addExcCount("noExc"); - if(null != user && !user.isEmpty()){ - return Msg.fail("用户已存在!"); - }else{ - powerUserService.insertSelective(powerUser); - return Msg.success(); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); + public Msg add(Power_User powerUser) throws Exception{ + List user = powerUserService.checkUserName(powerUser.getUserName()); + CacheManager.addExcCount("noExc"); + if(null != user && !user.isEmpty()){ + return Msg.fail("用户已存在!"); + }else{ + powerUserService.insertSelective(powerUser); + return Msg.success(); } - - } @OptionalLog(module = "删除",methods = "用户管理",fieldName = "userName",tableName = "power_user") @RequiresPermissions(value="/user/delete") @RequestMapping("/delete") @ResponseBody - public Msg delete(Integer userId){ - try { - powerUserService.deleteByPrimaryKey(userId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("删除失败,请联系系统管理员!"); - } + public Msg delete(Integer userId) throws Exception{ + powerUserService.deleteByPrimaryKey(userId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } @@ -188,21 +171,14 @@ public class UserController { @RequiresPermissions(value="/user/update") @RequestMapping("/update") @ResponseBody - public Msg update(Power_User powerUser,HttpServletRequest request){ - try { - List user = powerUserService.checkUserName(powerUser.getUserName()); - if(null != user && !user.isEmpty() && !user.get(0).getUserId().equals(powerUser.getUserId())){ - return Msg.fail("用户名已存在!"); - }else{ - powerUserService.updateByPrimaryKeySelective(powerUser,request); - CacheManager.addExcCount("noExc"); - return Msg.success(); - } - - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("更新失败，请联系系统管理员!"); + public Msg update(Power_User powerUser,HttpServletRequest request) throws Exception{ + List user = powerUserService.checkUserName(powerUser.getUserName()); + if(null != user && !user.isEmpty() && !user.get(0).getUserId().equals(powerUser.getUserId())){ + return Msg.fail("用户名已存在!"); + }else{ + powerUserService.updateByPrimaryKeySelective(powerUser,request); + CacheManager.addExcCount("noExc"); + return Msg.success(); } } @@ -210,20 +186,14 @@ public class UserController { @RequiresPermissions(value="/user/resetPassword") @RequestMapping("/resetPassword") @ResponseBody - public Msg update(Integer userId){ - try { - ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request =attr.getRequest(); - Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId); - powerUser.setUserPwd(Base64.encode(MD5.KL("000000"))); - powerUserService.updateByPrimaryKeySelective(powerUser,request); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg update(Integer userId) throws Exception{ + ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request =attr.getRequest(); + Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId); + powerUser.setUserPwd(Base64.encode(MD5.KL("000000"))); + powerUserService.updateByPrimaryKeySelective(powerUser,request); + CacheManager.addExcCount("noExc"); + return Msg.success(); } @RequestMapping("/selectUser") @ResponseBody @@ -233,6 +203,7 @@ public class UserController { CacheManager.addExcCount("noExc"); return powerUser; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -246,6 +217,7 @@ public class UserController { model.addAttribute("user",userVo); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -255,16 +227,10 @@ public class UserController { @OptionalLog(module = "修改密码",methods = "用户管理") @RequestMapping(value = "/updatePassword") @ResponseBody - public Msg updatePassword(String userPwd){ - try { - boolean result = powerUserService.updatePassword(userPwd); - CacheManager.addExcCount("noExc"); - return Msg.success().add("result",result); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg updatePassword(String userPwd) throws Exception{ + boolean result = powerUserService.updatePassword(userPwd); + CacheManager.addExcCount("noExc"); + return Msg.success().add("result",result); } /** @@ -314,6 +280,7 @@ public class UserController { return new ResponseEntity(msgStr, responseHeaders, HttpStatus.OK); } }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); //抛异常 return new ResponseEntity(e.getMessage(), responseHeaders, HttpStatus.OK); diff --git a/power-admin/src/main/java/com/manage/controller/VideoController.java b/power-admin/src/main/java/com/manage/controller/VideoController.java index f4c01bd..e21b7ab 100644 --- a/power-admin/src/main/java/com/manage/controller/VideoController.java +++ b/power-admin/src/main/java/com/manage/controller/VideoController.java @@ -17,7 +17,7 @@ public class VideoController { @RequestMapping("/video") public String getVideoPage(HttpServletRequest request, Model model){ Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - model.addAttribute("user",(Power_User)request.getSession().getAttribute("CURRENT_USER")); + model.addAttribute("user",user); return "/videoDir/video"; } diff --git a/power-admin/src/main/resources/log4j.properties b/power-admin/src/main/resources/log4j.properties new file mode 100644 index 0000000..7a0bdab --- /dev/null +++ b/power-admin/src/main/resources/log4j.properties @@ -0,0 +1,18 @@ +log4j.logger.myLog=debug,myLog +log4j.appender.myLog=org.apache.log4j.DailyRollingFileAppender +log4j.appender.myLog.File=D:\\logs\\power\\info\\info_log +log4j.appender.myLog.DatePattern=-yyyy-MM-dd'.log' +log4j.appender.myLog.Append = true +log4j.appender.myLog.Threshold = INFO +log4j.appender.myLog.layout=org.apache.log4j.PatternLayout +log4j.appender.myLog.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n + +log4j.logger.errorMsg=error,errorMsg +log4j.appender.errorMsg=org.apache.log4j.DailyRollingFileAppender +log4j.appender.errorMsg.File=D:\\logs\\power\\error\\error_log +log4j.appender.errorMsg.DatePattern=-yyyy-MM-dd'.log' +log4j.appender.errorMsg.Append = true +log4j.appender.errorMsg.Threshold = error +log4j.appender.errorMsg.layout=org.apache.log4j.PatternLayout +log4j.appender.errorMsg.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n + diff --git a/power-admin/src/main/webapp/WEB-INF/web.xml b/power-admin/src/main/webapp/WEB-INF/web.xml index a712bef..c9f5487 100644 --- a/power-admin/src/main/webapp/WEB-INF/web.xml +++ b/power-admin/src/main/webapp/WEB-INF/web.xml @@ -46,14 +46,13 @@ org.springframework.web.context.ContextLoaderListener - + + webAppRootKey + power.root + + + org.springframework.web.util.WebAppRootListener + dispatcherServlet diff --git a/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java b/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java new file mode 100644 index 0000000..cffbf13 --- /dev/null +++ b/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java @@ -0,0 +1,36 @@ +package com.manage.util; + +import org.apache.log4j.Logger; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/8/4 14:18 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/8/4 14:18 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +public class ExceptionPrintUtil { + private static Logger log = Logger.getLogger("errorMsg"); + public static void printException(Exception e){ + //方法名 + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + e.printStackTrace(new PrintStream(baos)); + String exception = baos.toString(); + log.error(exception); + try { + baos.flush(); + baos.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } +} diff --git a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java index 917ac24..74ff887 100644 --- a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java +++ b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java @@ -76,13 +76,13 @@ public class ImportExcelUtil { boolean flag = isRowEmpty(row); if(!flag){ if(row.getPhysicalNumberOfCells() !=0){ - String wrongStr = ""; + StringBuilder wrongStr = new StringBuilder(); for (int k = 0; k < fieldNames.length; k++) { //对象赋值后返回错误对象 - wrongStr += getValueByField(object, fieldNames[k], getCellValue(row.getCell(k)), getCellValue(head.getCell(k)),judgeMethods[k]); + wrongStr.append(getValueByField(object, fieldNames[k], getCellValue(row.getCell(k)), getCellValue(head.getCell(k)), judgeMethods[k])); } //有错误信息在行尾创建cell，并标红提示文字 - if(StringUtils.isNotBlank(wrongStr)){ + if(StringUtils.isNotBlank(wrongStr.toString())){ //设置错误信息字体为红色加粗 Font font = workbook.createFont(); font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); @@ -92,8 +92,8 @@ public class ImportExcelUtil { Cell cell = row.createCell( fieldNames.length); cell.setCellStyle(cellStyle); cell.setCellType(HSSFCell.CELL_TYPE_STRING); - wrongStr = wrongStr.substring(0,wrongStr.length()-1); - cell.setCellValue(wrongStr); + wrongStr = new StringBuilder(wrongStr.substring(0, wrongStr.length() - 1)); + cell.setCellValue(wrongStr.toString()); wrongCount++; }else{ successCount++; @@ -181,7 +181,7 @@ public class ImportExcelUtil { * object:赋值对象，fieldName:属性名，value:excel表格值,head:表格头名称(中文名)，judgeMethod:判断方法 * */ private static String getValueByField(Object object,String fieldName,String value,String head,String judgeMethod){ - String wrongStr = ""; + StringBuilder wrongStr = new StringBuilder(); try { Class clazz = object.getClass(); for (; clazz != Object.class; clazz = clazz.getSuperclass()) { @@ -199,7 +199,7 @@ public class ImportExcelUtil { //执行方法 String returnWrongStr = (String)method.invoke(importExcelJudgeMethod, fieldName, value, f, object, head); if(StringUtils.isNotBlank(returnWrongStr)){ - wrongStr+=returnWrongStr; + wrongStr.append(returnWrongStr); } }else{ if(StringUtils.isNotBlank(value)){ @@ -218,9 +218,9 @@ public class ImportExcelUtil { } }catch (Exception e){ e.printStackTrace(); - wrongStr+="\""+head+"\"格式不正确,"; + wrongStr.append("\"").append(head).append("\"格式不正确,"); } - return wrongStr; + return wrongStr.toString(); } /** diff --git a/power-service/src/main/java/com/manage/service/cache/CacheManager.java b/power-service/src/main/java/com/manage/service/cache/CacheManager.java index 883ea40..51d0e80 100644 --- a/power-service/src/main/java/com/manage/service/cache/CacheManager.java +++ b/power-service/src/main/java/com/manage/service/cache/CacheManager.java @@ -48,14 +48,14 @@ public class CacheManager { //添加异常数量 public synchronized static void addExcCount(String type){ - if("noExc".equals(type)){ + /*if("noExc".equals(type)){ noExcCount++; cacheExceptionMap.put(type,noExcCount); } if("exc".equals(type)){ excCount++; cacheExceptionMap.put(type,excCount); - } + }*/ } //取异常数量 diff --git a/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java index ee88811..cb14b41 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java @@ -58,11 +58,11 @@ public class PageServiceImpl { //最大登录数集合 List maxCountList = new ArrayList<>(); //记录有数据开始标识 - Boolean startFlag = false; + boolean startFlag = false; //定义前一天的登录数量 - Integer beforeLoginCount = 0; + int beforeLoginCount = 0; //定义最大登录数量 - Integer maxCount = 0; + int maxCount = 0; for (int i = 0; i < dateList.size(); i++) { //获取当天登录次数缓存 HashMap map = CacheManager.getCurrentDayCount(dateList.get(i)); @@ -134,7 +134,7 @@ public class PageServiceImpl { //最大登录数集合 List maxCountList = new ArrayList<>(); //记录有数据开始标识 - Boolean startFlag = false; + boolean startFlag = false; //定义统计登录数量 Integer maxCount = 0; for (int i = 0; i < dateList.size(); i++) { @@ -193,31 +193,27 @@ public class PageServiceImpl { public long getEcharts5(){ long temperature = 0; + File file = new File(TEMPERATURECVSFILEDIR); + InputStream input = null; try { - File file = new File(TEMPERATURECVSFILEDIR); - InputStream input = null; - try { - input = new FileInputStream(file); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - StringBuffer buffer = new StringBuffer(); - byte[] bytes = new byte[1024]; - try { - for(int n ; (n = input.read(bytes))!=-1 ; ){ - buffer.append(new String(bytes,0,n,"GBK")); - } - } catch (IOException e) { - e.printStackTrace(); + input = new FileInputStream(file); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + StringBuffer buffer = new StringBuffer(); + byte[] bytes = new byte[1024]; + try { + for(int n ; (n = input.read(bytes))!=-1 ; ){ + buffer.append(new String(bytes,0,n,"GBK")); } - int i = buffer.toString().lastIndexOf(""); - String substring = buffer.substring(0, i); - String substring1 = substring.substring(substring.length() - 4, substring.length()); - Float f = Float.valueOf(substring1); - temperature = Math.round(f); - }catch (Exception e){ + } catch (IOException e) { e.printStackTrace(); } + int i = buffer.toString().lastIndexOf(""); + String substring = buffer.substring(0, i); + String substring1 = substring.substring(substring.length() - 4, substring.length()); + float f = Float.valueOf(substring1); + temperature = Math.round(f); return temperature; } @@ -253,7 +249,7 @@ public class PageServiceImpl { int month = aCalendar.get(Calendar.MONTH) + 1;//月份 int day = aCalendar.getActualMaximum(Calendar.DATE); for (int i = 1; i <= day; i++) { - String aDate = String.valueOf(year)+"-"+month+"-"+i; + String aDate = year+"-"+month+"-"+i; list.add(aDate); } return list; diff --git a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java index 1e5ca92..4bc3fb6 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java @@ -183,7 +183,7 @@ public class PowerServiceImpl implements PowerService { //给角色设置系统权限 if (null != roleList && !roleList.isEmpty()) { for (Power_UserAndRoleTree role : roleList) { - String sysFlagStr = ""; + StringBuilder sysFlagStr = new StringBuilder(); String deptId = role.getDeptId(); if(StringUtils.isNotBlank(deptId)){ //单一科室 @@ -191,13 +191,13 @@ public class PowerServiceImpl implements PowerService { if (deptId.equals(dept.getDeptId())) { if(null != sysFlagSet && !sysFlagSet.isEmpty()){ for(String sysFlag:sysFlagSet){ - sysFlagStr += sysFlag + ","; + sysFlagStr.append(sysFlag).append(","); } } - if(StringUtils.isNotBlank(sysFlagStr)){ + if(StringUtils.isNotBlank(sysFlagStr.toString())){ Power_UserAndRoleTree tempRole = new Power_UserAndRoleTree(); BeanUtils.copyProperties(role,tempRole); - tempRole.setSysFlag(sysFlagStr); + tempRole.setSysFlag(sysFlagStr.toString()); tempRoleList.add(tempRole); } } @@ -208,13 +208,13 @@ public class PowerServiceImpl implements PowerService { if (StringUtils.isNotBlank(deptStr) && deptStr.equals(dept.getDeptId())) { if(null != sysFlagSet && !sysFlagSet.isEmpty()){ for(String sysFlag:sysFlagSet){ - sysFlagStr += sysFlag + ","; + sysFlagStr.append(sysFlag).append(","); } } - if(StringUtils.isNotBlank(sysFlagStr)){ + if(StringUtils.isNotBlank(sysFlagStr.toString())){ Power_UserAndRoleTree tempRole = new Power_UserAndRoleTree(); BeanUtils.copyProperties(role,tempRole); - tempRole.setSysFlag(sysFlagStr); + tempRole.setSysFlag(sysFlagStr.toString()); tempRoleList.add(tempRole); } } @@ -291,18 +291,18 @@ public class PowerServiceImpl implements PowerService { //roleId为-100医院管理员，菜单功能全选中 if(null != roleId && roleId == -100){ if(null != menus && !menus.isEmpty()){ - for (int i = 0; i < menus.size(); i++) { - menus.get(i).setChecked("true"); + for (Power_Menu menu : menus) { + menu.setChecked("true"); } } }else{ //否则按角色菜单表该角色的权限选中 List roleMenus = roleMenuMapper.selectRoleMenuByRoleId(roleId); if(null != menus && !menus.isEmpty() && null != roleMenus && !roleMenus.isEmpty()){ - for (int i = 0; i < menus.size(); i++) { - for (int j = 0; j < roleMenus.size(); j++) { - if(menus.get(i).getMenuId().equals(roleMenus.get(j).getMenuId())){ - menus.get(i).setChecked("true"); + for (Power_Menu menu : menus) { + for (Power_Role_Menu roleMenu : roleMenus) { + if (menu.getMenuId().equals(roleMenu.getMenuId())) { + menu.setChecked("true"); break; } } @@ -485,7 +485,7 @@ public class PowerServiceImpl implements PowerService { tree5.setSysFlag(sys.getSysFlag()); threeLevelId = id; id++; - Boolean isParent = false; + boolean isParent = false; //第四级用户 if(null != userList && !userList.isEmpty()) { for (Power_UserAndRoleTree users : userList) { @@ -617,8 +617,8 @@ public class PowerServiceImpl implements PowerService { //roleId为-100医院管理员，菜单功能全选中 if(null != user.getRoleId() && user.getRoleId() == -100){ if(null != menus && !menus.isEmpty()){ - for (int i = 0; i < menus.size(); i++) { - menus.get(i).setChecked("true"); + for (Power_Menu menu : menus) { + menu.setChecked("true"); } } }else{ @@ -626,10 +626,10 @@ public class PowerServiceImpl implements PowerService { List userMenus = userMenuMapper.selectUserAndRoleMenuPower(sysFlag, userId); if(null != menus && !menus.isEmpty() && null != userMenus && !userMenus.isEmpty()){ //有符合权限则checked设为true - for (int i = 0; i < menus.size(); i++) { - for (int j = 0; j < userMenus.size(); j++) { - if(menus.get(i).getMenuId().equals(userMenus.get(j).getMenuId())){ - menus.get(i).setChecked("true"); + for (Power_Menu menu : menus) { + for (Power_User_Menu userMenu : userMenus) { + if (menu.getMenuId().equals(userMenu.getMenuId())) { + menu.setChecked("true"); break; } } @@ -671,16 +671,16 @@ public class PowerServiceImpl implements PowerService { if(StringUtils.isBlank(menus)){ //全取消 List list = new ArrayList<>(); - for (int i = 0; i < rolePowers.size(); i++) { - list.add(addUserFunction(userName, userId, rolePowers.get(i).getMenuId().toString(), 0)); + for (Power_Role_Menu rolePower : rolePowers) { + list.add(addUserFunction(userName, userId, rolePower.getMenuId().toString(), 0)); } userMenuMapper.simpleInsertUserMenu(list); }else{ //计算新增和删除 List roles = new ArrayList<>(); List users = new ArrayList<>(); - for (int i = 0; i < rolePowers.size(); i++) { - roles.add(rolePowers.get(i).getMenuId().toString()); + for (Power_Role_Menu rolePower : rolePowers) { + roles.add(rolePower.getMenuId().toString()); } String[] menu = menus.split(","); users = Arrays.asList(menu); @@ -772,13 +772,13 @@ public class PowerServiceImpl implements PowerService { int twoLevel = 0; Map hospitalNameSet = new HashMap<>(); if(null != dicts && !dicts.isEmpty()){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){ - hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getHospitalName())) { + hospitalNameSet.put(dict.getDictId(), dict.getHospitalName()); } //用户集合 - if(null == dicts.get(i).getDictId()){ - userList.add(dicts.get(i)); + if (null == dict.getDictId()) { + userList.add(dict); } } } @@ -794,17 +794,17 @@ public class PowerServiceImpl implements PowerService { tree1.setId(id); tree1.setName(hospitalNameSet.get(hosKey)); treeList.add(tree1); - for (int i = 0; i < dicts.size(); i++) { + for (Power_Sys_DictVo dict : dicts) { //查询病案系统的科室 - if(StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getSysFlag().equals(sysFlag) && dicts.get(i).getParentId().equals(hosKey) && null != dicts.get(i).getDictDeptId()){ - deptIds.add(dicts.get(i).getDictDeptId()); + if (StringUtils.isNotBlank(dict.getSysFlag()) && dict.getSysFlag().equals(sysFlag) && dict.getParentId().equals(hosKey) && null != dict.getDictDeptId()) { + deptIds.add(dict.getDictDeptId()); } } if(null != deptIds && !deptIds.isEmpty()){ for(Integer deptId : deptIds){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getDeptIds()) && dicts.get(i).getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dicts.get(i).getDeptName())){ - deptNameSet.put(dicts.get(i).getDeptIds(),dicts.get(i).getDeptName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getDeptIds()) && dict.getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dict.getDeptName())) { + deptNameSet.put(dict.getDeptIds(), dict.getDeptName()); } } } @@ -821,19 +821,19 @@ public class PowerServiceImpl implements PowerService { treeList.add(tree2); Map roleMap = new HashMap<>(); if (null != userList && !userList.isEmpty()) { - for (int j = 0; j < userList.size(); j++) { - if(StringUtils.isNoneBlank(userList.get(j).getSysType())){ - String deptIdss = userList.get(j).getDeptIds(); - if(StringUtils.isNotBlank(deptIdss)){ - if(!deptIdss.contains(",")){ - if(deptIdss.equals(key)){ - roleMap.put(userList.get(j).getParentId(),userList.get(j).getSysType()); + for (Power_Sys_DictVo power_sys_dictVo : userList) { + if (StringUtils.isNoneBlank(power_sys_dictVo.getSysType())) { + String deptIdss = power_sys_dictVo.getDeptIds(); + if (StringUtils.isNotBlank(deptIdss)) { + if (!deptIdss.contains(",")) { + if (deptIdss.equals(key)) { + roleMap.put(power_sys_dictVo.getParentId(), power_sys_dictVo.getSysType()); } - }else{ + } else { String[] deptIdsss = deptIdss.split(","); - for(String deptId:deptIdsss){ - if(StringUtils.isNotBlank(deptId) && deptId.equals(key)){ - roleMap.put(userList.get(j).getParentId(),userList.get(j).getSysType()); + for (String deptId : deptIdsss) { + if (StringUtils.isNotBlank(deptId) && deptId.equals(key)) { + roleMap.put(power_sys_dictVo.getParentId(), power_sys_dictVo.getSysType()); } } } @@ -890,13 +890,13 @@ public class PowerServiceImpl implements PowerService { int twoLevel = 0; Map hospitalNameSet = new HashMap<>(); if(null != dicts && !dicts.isEmpty()){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){ - hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getHospitalName())) { + hospitalNameSet.put(dict.getDictId(), dict.getHospitalName()); } //用户集合 - if(null == dicts.get(i).getDictId()){ - userList.add(dicts.get(i)); + if (null == dict.getDictId()) { + userList.add(dict); } } } @@ -912,17 +912,17 @@ public class PowerServiceImpl implements PowerService { tree1.setId(id); tree1.setName(hospitalNameSet.get(hosKey)); treeList.add(tree1); - for (int i = 0; i < dicts.size(); i++) { + for (Power_Sys_DictVo dict : dicts) { //查询病案系统的科室 - if(StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getSysFlag().equals(sysFlag) && dicts.get(i).getParentId().equals(hosKey)){ - deptIds.add(dicts.get(i).getDictDeptId()); + if (StringUtils.isNotBlank(dict.getSysFlag()) && dict.getSysFlag().equals(sysFlag) && dict.getParentId().equals(hosKey)) { + deptIds.add(dict.getDictDeptId()); } } if(null != deptIds && !deptIds.isEmpty()){ for(Integer deptId : deptIds){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getDeptIds()) && dicts.get(i).getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dicts.get(i).getDeptName())){ - deptNameSet.put(dicts.get(i).getDeptIds(),dicts.get(i).getDeptName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getDeptIds()) && dict.getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dict.getDeptName())) { + deptNameSet.put(dict.getDeptIds(), dict.getDeptName()); } } } @@ -939,19 +939,19 @@ public class PowerServiceImpl implements PowerService { Map roleMap = new HashMap<>(); //sysName 用户id，hospitalTel 手机号,dictArea用户名，parentId角色id，sysType角色名 if (null != userList && !userList.isEmpty()) { - for (int j = 0; j < userList.size(); j++) { - if(StringUtils.isNoneBlank(userList.get(j).getDictArea())){ - String deptIdss = userList.get(j).getDeptIds(); - if(StringUtils.isNotBlank(deptIdss)){ - if(!deptIdss.contains(",")){ - if(deptIdss.equals(key)){ - roleMap.put(Integer.valueOf(userList.get(j).getSysName()),userList.get(j)); + for (Power_Sys_DictVo power_sys_dictVo : userList) { + if (StringUtils.isNoneBlank(power_sys_dictVo.getDictArea())) { + String deptIdss = power_sys_dictVo.getDeptIds(); + if (StringUtils.isNotBlank(deptIdss)) { + if (!deptIdss.contains(",")) { + if (deptIdss.equals(key)) { + roleMap.put(Integer.valueOf(power_sys_dictVo.getSysName()), power_sys_dictVo); } - }else{ + } else { String[] deptIdsss = deptIdss.split(","); - for(String deptId:deptIdsss){ - if(StringUtils.isNotBlank(deptId) && deptId.equals(key)){ - roleMap.put(Integer.valueOf(userList.get(j).getSysName()),userList.get(j)); + for (String deptId : deptIdsss) { + if (StringUtils.isNotBlank(deptId) && deptId.equals(key)) { + roleMap.put(Integer.valueOf(power_sys_dictVo.getSysName()), power_sys_dictVo); } } } @@ -1016,9 +1016,9 @@ public class PowerServiceImpl implements PowerService { int twoLevel = 0; Map hospitalNameSet = new HashMap<>(); if(null != dicts && !dicts.isEmpty()){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){ - hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getHospitalName())) { + hospitalNameSet.put(dict.getDictId(), dict.getHospitalName()); } } } @@ -1035,26 +1035,26 @@ public class PowerServiceImpl implements PowerService { tree1.setSelfId(hosKey); tree1.setName(hospitalNameSet.get(hosKey)); treeList.add(tree1); - for (int i = 0; i < dicts.size(); i++) { - if(user.getRoleId() == 0){ - if(dicts.get(i).getDictId().equals(hosKey)){ - String deptName = dicts.get(i).getDeptName(); - if(StringUtils.isNoneBlank(deptName)){ - deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName()); + for (Power_Sys_DictVo dict : dicts) { + if (user.getRoleId() == 0) { + if (dict.getDictId().equals(hosKey)) { + String deptName = dict.getDeptName(); + if (StringUtils.isNoneBlank(deptName)) { + deptNameSet.put(dict.getDeptId(), dict.getDeptName()); } } - }else{ - if(dicts.get(i).getParentId().equals(hosKey)){ - String deptName = dicts.get(i).getDeptName(); - if(StringUtils.isNoneBlank(deptName)){ - deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName()); + } else { + if (dict.getParentId().equals(hosKey)) { + String deptName = dict.getDeptName(); + if (StringUtils.isNoneBlank(deptName)) { + deptNameSet.put(dict.getDeptId(), dict.getDeptName()); } } } //添加权限系统 - if(dicts.get(i).getParentId() != null && StringUtils.isNotBlank(dicts.get(i).getSysFlag()) - && dicts.get(i).getParentId().equals(hosKey) && "权限系统".equals(dicts.get(i).getSysType())){ - poweSysNameSet.put(dicts.get(i).getDictId(),dicts.get(i)); + if (dict.getParentId() != null && StringUtils.isNotBlank(dict.getSysFlag()) + && dict.getParentId().equals(hosKey) && "权限系统".equals(dict.getSysType())) { + poweSysNameSet.put(dict.getDictId(), dict); } } //添加权限系统 @@ -1084,12 +1084,12 @@ public class PowerServiceImpl implements PowerService { tree2.setName(deptNameSet.get(key)); tree2.setSelfId(0-key); treeList.add(tree2); - for (int i = 0; i < dicts.size(); i++) { - if(dicts.get(i).getDictDeptId() != null && dicts.get(i).getDictDeptId().equals(key) - && dicts.get(i).getParentId() != null && dicts.get(i).getParentId().equals(hosKey)){ - String sysName = dicts.get(i).getSysName(); - if(StringUtils.isNoneBlank(sysName)){ - sysNameSet.put(dicts.get(i).getDictId(),sysName); + for (Power_Sys_DictVo dict : dicts) { + if (dict.getDictDeptId() != null && dict.getDictDeptId().equals(key) + && dict.getParentId() != null && dict.getParentId().equals(hosKey)) { + String sysName = dict.getSysName(); + if (StringUtils.isNoneBlank(sysName)) { + sysNameSet.put(dict.getDictId(), sysName); } } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java index 9445fd1..332ac5a 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java @@ -94,19 +94,19 @@ public class Power_DeptServiceImpl implements Power_DeptService { List power_depts = powerDeptDao.findSomeByMore(powerDept); Set perms = powerUser1.getMenus(); if(null != power_depts && !power_depts.isEmpty()){ - for (int i = 0; i < power_depts.size(); i++) { - Integer isUpdate = 0; - Integer isDelete = 0; - for(String menu : perms){ - if("/dept/update".equals(menu)){ + for (Power_DeptVo power_dept : power_depts) { + int isUpdate = 0; + int isDelete = 0; + for (String menu : perms) { + if ("/dept/update".equals(menu)) { isUpdate = 1; } - if("/dept/delete".equals(menu)){ + if ("/dept/delete".equals(menu)) { isDelete = 1; } } - power_depts.get(i).setIsUpdate(isUpdate); - power_depts.get(i).setIsDelete(isDelete); + power_dept.setIsUpdate(isUpdate); + power_dept.setIsDelete(isDelete); } } return power_depts; @@ -145,11 +145,11 @@ public class Power_DeptServiceImpl implements Power_DeptService { public void export(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception { List depts = this.findSomeByMore(powerDept,request); if(null != depts && !depts.isEmpty()){ - for (int i = 0; i < depts.size(); i++) { - if(depts.get(i).getEffective() == 1){ - depts.get(i).setEffectiveCn("是"); - }else{ - depts.get(i).setEffectiveCn("否"); + for (Power_DeptVo dept : depts) { + if (dept.getEffective() == 1) { + dept.setEffectiveCn("是"); + } else { + dept.setEffectiveCn("否"); } } } @@ -173,11 +173,11 @@ public class Power_DeptServiceImpl implements Power_DeptService { public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception { List depts = this.findSomeByMore(powerDept,request); if(null != depts && !depts.isEmpty()){ - for (int i = 0; i < depts.size(); i++) { - if(depts.get(i).getEffective() == 1){ - depts.get(i).setEffectiveCn("是"); - }else{ - depts.get(i).setEffectiveCn("否"); + for (Power_DeptVo dept : depts) { + if (dept.getEffective() == 1) { + dept.setEffectiveCn("是"); + } else { + dept.setEffectiveCn("否"); } } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java index 495e479..65052b0 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java @@ -85,19 +85,19 @@ public class Power_RoleServiceImpl implements Power_RoleService { List power_roles = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId()); Set perms = powerUser1.getMenus(); if(null != power_roles && !power_roles.isEmpty()){ - for (int i = 0; i < power_roles.size(); i++) { - Integer isUpdate = 0; - Integer isDelete = 0; - for(String menu : perms){ - if("/role/update".equals(menu)){ + for (Power_RoleVo power_role : power_roles) { + int isUpdate = 0; + int isDelete = 0; + for (String menu : perms) { + if ("/role/update".equals(menu)) { isUpdate = 1; } - if("/role/delete".equals(menu)){ + if ("/role/delete".equals(menu)) { isDelete = 1; } } - power_roles.get(i).setIsUpdate(isUpdate); - power_roles.get(i).setIsDelete(isDelete); + power_role.setIsUpdate(isUpdate); + power_role.setIsDelete(isDelete); } } return power_roles; @@ -114,12 +114,12 @@ public class Power_RoleServiceImpl implements Power_RoleService { Power_User powerUser1 =(Power_User) request.getSession().getAttribute("CURRENT_USER"); List roleList = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId()); if(null != roleList && !roleList.isEmpty()){ - for (int i = 0; i < roleList.size(); i++) { - if(roleList.get(i).getEffective() != null){ - if(roleList.get(i).getEffective() == 1){ - roleList.get(i).setEffectiveCn("是"); - }else{ - roleList.get(i).setEffectiveCn("否"); + for (Power_RoleVo power_roleVo : roleList) { + if (power_roleVo.getEffective() != null) { + if (power_roleVo.getEffective() == 1) { + power_roleVo.setEffectiveCn("是"); + } else { + power_roleVo.setEffectiveCn("否"); } } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java index 0e9a76b..ed07cae 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java @@ -147,28 +147,28 @@ public class Power_Sys_DictServiceImpl implements Power_Sys_DictService { List resultList = new ArrayList<>(depts.length); Collections.addAll(resultList,depts); List deptList = new ArrayList<>(); - for (int i = 0; i < deptBySysFlagList.size(); i++) { - Integer deptStr = deptBySysFlagList.get(i).getDeptId(); - if(null != deptStr){ + for (Power_Sys_Dict power_sys_dict : deptBySysFlagList) { + Integer deptStr = power_sys_dict.getDeptId(); + if (null != deptStr) { deptList.add(deptStr.toString()); } } resultList.removeAll(deptList); if(null != resultList && !resultList.isEmpty()){ - for (int i = 0; i < resultList.size(); i++) { + for (String s : resultList) { Power_Sys_Dict dict = new Power_Sys_Dict(); - powerSysDict.setDeptId(Integer.valueOf(resultList.get(i))); - BeanUtils.copyProperties(powerSysDict,dict); + powerSysDict.setDeptId(Integer.valueOf(s)); + BeanUtils.copyProperties(powerSysDict, dict); list.add(dict); } } }else{ String[] depts = deptIds.split(","); - for (int i = 0; i < depts.length; i++) { - if(StringUtils.isNoneBlank(depts[i])){ + for (String dept : depts) { + if (StringUtils.isNoneBlank(dept)) { Power_Sys_Dict dict = new Power_Sys_Dict(); - powerSysDict.setDeptId(Integer.valueOf(depts[i])); - BeanUtils.copyProperties(powerSysDict,dict); + powerSysDict.setDeptId(Integer.valueOf(dept)); + BeanUtils.copyProperties(powerSysDict, dict); list.add(dict); } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java index 8064666..ec99183 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java @@ -84,18 +84,18 @@ public class Power_UserServiceImpl implements Power_UserService { @Override public Power_UserVo selectByPrimaryKey(Integer userId) { - String power_depts = ""; + StringBuilder power_depts = new StringBuilder(); Power_UserVo power_user = powerUserMapper.selectByPrimaryKey(userId); power_user.setUserPwd(MD5.JM(Base64.decode(power_user.getUserPwd()))); List power_depts1 = power_deptService.selectByPrimaryKeys(power_user.getDeptId()); for(int j=0;j someByMore = powerUserMapper.findSomeByMore(powerUser); - for(int i=0;i powerUsers = this.findSomeByMore(powerUser,request); if(null != powerUsers && !powerUsers.isEmpty()){ - for (int i = 0; i < powerUsers.size(); i++) { - if(null != powerUsers.get(i).getUserSex()){ - if(powerUsers.get(i).getUserSex() == 1){ - powerUsers.get(i).setSex("女"); - }else{ - powerUsers.get(i).setSex("男"); + for (Power_UserVo powerUser1 : powerUsers) { + if (null != powerUser1.getUserSex()) { + if (powerUser1.getUserSex() == 1) { + powerUser1.setSex("女"); + } else { + powerUser1.setSex("男"); } } - if(powerUsers.get(i).getEffective() == 1){ - powerUsers.get(i).setEffectiveCn("是"); - }else{ - powerUsers.get(i).setEffectiveCn("否"); + if (powerUser1.getEffective() == 1) { + powerUser1.setEffectiveCn("是"); + } else { + powerUser1.setEffectiveCn("否"); } } } @@ -219,18 +218,18 @@ public class Power_UserServiceImpl implements Power_UserService { public void export1(Power_UserVo powerUser,HttpServletRequest request,HttpServletResponse response) throws Exception { List powerUsers = this.findSomeByMore(powerUser,request); if(null != powerUsers && !powerUsers.isEmpty()){ - for (int i = 0; i < powerUsers.size(); i++) { - if(null != powerUsers.get(i).getUserSex()){ - if(powerUsers.get(i).getUserSex() == 1){ - powerUsers.get(i).setSex("女"); - }else{ - powerUsers.get(i).setSex("男"); + for (Power_UserVo powerUser1 : powerUsers) { + if (null != powerUser1.getUserSex()) { + if (powerUser1.getUserSex() == 1) { + powerUser1.setSex("女"); + } else { + powerUser1.setSex("男"); } } - if(powerUsers.get(i).getEffective() == 1){ - powerUsers.get(i).setEffectiveCn("是"); - }else{ - powerUsers.get(i).setEffectiveCn("否"); + if (powerUser1.getEffective() == 1) { + powerUser1.setEffectiveCn("是"); + } else { + powerUser1.setEffectiveCn("否"); } } }