From 615b187779734ddf48d77751f5979e7ed5bde0c4 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Wed, 5 Aug 2020 14:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81(=E5=8F=AF=E8=83=BD=E5=87=BA=E9=94=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +- power-admin/pom.xml | 5 + .../com/manage/controller/DeptController.java | 179 ++--- .../com/manage/controller/ExceptionUtils.java | 24 + .../controller/ExportExcelController.java | 2 + .../com/manage/controller/FontController.java | 416 +++++------- .../controller/GlobalExceptionHandler.java | 71 ++ .../com/manage/controller/LogAopAction.java | 17 +- .../manage/controller/LoginController.java | 29 +- .../com/manage/controller/PageController.java | 69 +- .../controller/PermissionsController.java | 6 +- .../controller/Power_LogController.java | 52 +- .../controller/Power_MenuController.java | 29 +- .../Power_MenuManageController.java | 272 ++++---- .../controller/Power_NoticeController.java | 209 +++--- .../controller/Power_Sys_DictController.java | 314 ++++----- .../RoleAndUserPowerController.java | 51 +- .../com/manage/controller/RoleController.java | 185 +---- .../manage/controller/T_MenuController.java | 15 +- .../com/manage/controller/UserController.java | 176 ++--- .../manage/interceptor/LoginInterceptor.java | 6 +- .../webservice/RoleAndUserTreeWebService.java | 14 - .../main/resources/config/config.properties | 2 +- .../src/main/resources/log4j.properties | 18 + .../src/main/test/com/manage/MapperTest.java | 57 -- .../main/test/com/manage/WebServiceTest.java | 48 -- .../webapp/WEB-INF/views/deptDir/blood.jsp | 225 ------- .../webapp/WEB-INF/views/dictDir/dict1.jsp | 210 ------ .../webapp/WEB-INF/views/loginDir/login1.jsp | 82 --- .../WEB-INF/views/loginDir/login174.jsp | 83 --- .../views/otherManage/backupDatabase.jsp | 19 +- .../WEB-INF/views/roleDir/roleNotDown.jsp | 210 ------ .../webapp/WEB-INF/views/userDir/user1.jsp | 316 --------- power-admin/src/main/webapp/WEB-INF/web.xml | 15 +- .../src/main/webapp/static/js/blood.js | 407 ----------- .../src/main/webapp/static/js/roleNotDown.js | 293 -------- .../src/main/webapp/static/js/user1.js | 632 ------------------ power-api/pom.xml | 43 -- power-foundaton/pom.xml | 5 + .../com/manage/util/ExceptionPrintUtil.java | 36 + .../java/com/manage/util/ExportExcelUtil.java | 20 +- .../ImportExcel/ImportExcelJudgeMethod.java | 16 +- .../service/ImportExcel/ImportExcelUtil.java | 15 +- .../manage/service/Power_Sys_DictService.java | 7 - .../com/manage/service/Power_UserService.java | 7 - .../manage/service/ipml/LogServiceImpl.java | 3 +- .../manage/service/ipml/PageServiceImpl.java | 30 +- .../manage/service/ipml/PowerServiceImpl.java | 223 +++--- .../service/ipml/Power_DeptServiceImpl.java | 57 +- .../service/ipml/Power_MenuServiceImpl.java | 3 +- .../service/ipml/Power_NoticeServiceImpl.java | 55 +- .../service/ipml/Power_RoleServiceImpl.java | 66 +- .../ipml/Power_Sys_DictServiceImpl.java | 32 +- .../service/ipml/Power_UserServiceImpl.java | 70 +- .../service/ipml/T_MenuServiceImpl.java | 5 +- .../ipml/User_Dept_MenuServiceImpl.java | 3 +- power_web/pom.xml | 27 - power_web/src/main/webapp/WEB-INF/web.xml | 7 - power_web/src/main/webapp/index.jsp | 5 - 59 files changed, 1229 insertions(+), 4273 deletions(-) create mode 100644 power-admin/src/main/java/com/manage/controller/ExceptionUtils.java create mode 100644 power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java delete mode 100644 power-admin/src/main/java/com/manage/interfaces/webservice/RoleAndUserTreeWebService.java create mode 100644 power-admin/src/main/resources/log4j.properties delete mode 100644 power-admin/src/main/test/com/manage/MapperTest.java delete mode 100644 power-admin/src/main/test/com/manage/WebServiceTest.java delete mode 100644 power-admin/src/main/webapp/WEB-INF/views/deptDir/blood.jsp delete mode 100644 power-admin/src/main/webapp/WEB-INF/views/dictDir/dict1.jsp delete mode 100644 power-admin/src/main/webapp/WEB-INF/views/loginDir/login1.jsp delete mode 100644 power-admin/src/main/webapp/WEB-INF/views/loginDir/login174.jsp delete mode 100644 power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp delete mode 100644 power-admin/src/main/webapp/WEB-INF/views/userDir/user1.jsp delete mode 100644 power-admin/src/main/webapp/static/js/blood.js delete mode 100644 power-admin/src/main/webapp/static/js/roleNotDown.js delete mode 100644 power-admin/src/main/webapp/static/js/user1.js delete mode 100644 power-api/pom.xml create mode 100644 power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java delete mode 100644 power_web/pom.xml delete mode 100644 power_web/src/main/webapp/WEB-INF/web.xml delete mode 100644 power_web/src/main/webapp/index.jsp diff --git a/pom.xml b/pom.xml index 7b498fb..f6194b5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,8 @@ pom 1.0-SNAPSHOT - power-api power-dao power-service - power_web power-admin power-foundaton @@ -34,6 +32,7 @@ 3.4.6 1.3.2 5.1.32 + 1.6.4 2.9.4 1.0.9 4.3.5 @@ -90,6 +89,12 @@ mysql-connector-java ${mysql.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + org.mybatis diff --git a/power-admin/pom.xml b/power-admin/pom.xml index 52f2665..75784cf 100644 --- a/power-admin/pom.xml +++ b/power-admin/pom.xml @@ -122,6 +122,11 @@ commons-fileupload commons-fileupload + + + org.slf4j + slf4j-log4j12 + power 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..8d31da1 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; @@ -31,7 +32,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.OutputStream; import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +67,7 @@ public class DeptController { pageHelper.setRows(list); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); e.printStackTrace(); CacheManager.addExcCount("exc"); } @@ -87,21 +88,6 @@ public class DeptController { return "deptDir/dept"; } - /** - * @Date 2020-01-02 - * @Author zwh - * @Description 查看部门返回页面 - * */ - @OptionalLog(module = "查看",methods = "部门管理页面") - @RequiresPermissions(value="/dept/bloodUI") - @RequestMapping("/bloodUI") - public String bloodUI(HttpServletRequest request, Model model){ - Power_User powerUser1 =(Power_User) request.getSession().getAttribute("CURRENT_USER"); - model.addAttribute("user",powerUser1); - CacheManager.addExcCount("noExc"); - return "deptDir/blood"; - } - /** * @Date 2019-4-22 * @Author ly @@ -115,6 +101,7 @@ public class DeptController { CacheManager.addExcCount("noExc"); return Msg.success().add("list",deptList); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return Msg.fail(); @@ -129,10 +116,11 @@ public class DeptController { @ResponseBody public Power_Dept selectDept(Integer deptId) { try { - Power_Dept power_dept = powerDeptService.selectByPrimaryKey(deptId); + Power_Dept powerDept = powerDeptService.selectByPrimaryKey(deptId); CacheManager.addExcCount("noExc"); - return power_dept; + return powerDept; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -146,19 +134,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 powerDept = powerDeptService.checkDeptName(deptName,dictId); + if(powerDept != null && !powerDept.isEmpty()){ + return Msg.fail("科室名已存在"); + }else{ + CacheManager.addExcCount("noExc"); + return Msg.success(); } } @@ -177,8 +159,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 powerDeptVo : list) { + hospitalMap.put(powerDeptVo.getDictId(), powerDeptVo.getHospitalName()); } for (Map.Entry entry : hospitalMap.entrySet()) { //医院层 @@ -191,12 +173,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 powerDeptVo : list) { + if (entry.getKey().equals(powerDeptVo.getDictId())) { PowerTree tree2 = new PowerTree(); tree2.setId(id); - tree2.setSelfId(list.get(i).getDeptId()); - tree2.setName(list.get(i).getDeptName()); + tree2.setSelfId(powerDeptVo.getDeptId()); + tree2.setName(powerDeptVo.getDeptName()); tree2.setParentId(parentId); treeList.add(tree2); id++; @@ -209,6 +191,7 @@ public class DeptController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -223,22 +206,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 powerDeptList = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId()); + if(null == powerDeptList || powerDeptList.isEmpty()){ + powerDeptService.insertSelective(powerDept); + CacheManager.addExcCount("noExc"); + return Msg.success(); + }else{ + return Msg.fail("科室名已存在!"); } - } /** * @Date 2019-4-25 @@ -249,23 +225,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 powerDeptList = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId()); + if(null != powerDeptList && !powerDeptList.isEmpty() && !powerDeptList.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 +244,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,46 +262,11 @@ public class DeptController { powerDeptService.export(powerDept,request,response); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } } - /** - * @Date 2019-4-29 - * @Author ly - * @Description 导出Excel - * */ - @OptionalLog(module = "导出excel",methods = "部门管理") - @RequiresPermissions(value="/dept/exportBlood") - @RequestMapping("/exportBlood") - public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response){ - try { - powerDeptService.exportBlood(powerDept,request,response); - CacheManager.addExcCount("noExc"); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - } - } - /** - * @Date 2019-4-22 - * @Author ly - * @Description 根据一组科室id查询科室 - * */ - @RequestMapping("/findById") - @ResponseBody - public ListfindById(String dept_ids){ - try { - ListdeptList = powerDeptService.selectByPrimaryKeys(dept_ids); - CacheManager.addExcCount("noExc"); - return deptList; - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return null; - } - } - /** * @Date 2019-08-06 @@ -348,16 +275,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); } /** @@ -370,7 +291,6 @@ public class DeptController { @RequestMapping(value="/importExcel",method = {RequestMethod.POST}) @ResponseBody public ResponseEntity importExcel(HttpServletRequest request){ - OutputStream os = null; HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.setContentType(new MediaType("text","html", Charset.forName("UTF-8"))); try { @@ -409,17 +329,10 @@ public class DeptController { } }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); //抛异常 return new ResponseEntity(e.getMessage(), responseHeaders, HttpStatus.OK); - }finally { - if(os != null){ - try { - os.close(); - }catch (Exception e){ - e.printStackTrace(); - } - } } } } diff --git a/power-admin/src/main/java/com/manage/controller/ExceptionUtils.java b/power-admin/src/main/java/com/manage/controller/ExceptionUtils.java new file mode 100644 index 0000000..afd3eda --- /dev/null +++ b/power-admin/src/main/java/com/manage/controller/ExceptionUtils.java @@ -0,0 +1,24 @@ +package com.manage.controller; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/6/10 10:59 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/6/10 10:59 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +public class ExceptionUtils { + public static String getExceptionStr(Exception e){ + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + e.printStackTrace(new PrintStream(baos)); + return baos.toString(); + } +} 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 515023b..04375f7 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; @@ -76,37 +77,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(); - } + public Msg getMenusByUserIdAndSysFlag(String userName,String sysFlag,Integer userId,Integer roleId,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 powerUsers = userMapper.checkUserName(userName); + if(null != powerUsers && !powerUsers.isEmpty()){ + if(powerUsers.get(0).getRoleId().equals(0) || powerUsers.get(0).getRoleId().equals(-100)){ + roleId = powerUsers.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); } /** @@ -124,16 +119,10 @@ public class FontController { */ @RequestMapping(value = "selectAllByUserIdOrRoleIdAndSysIdOrSysFlag") @ResponseBody - public Msg selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(Integer userId,Integer roleId,Integer sysId,String sysFlag){ - try { - List list = powerNoticeMapper.selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(userId, roleId, sysId, sysFlag); - 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) throws Exception{ + List list = powerNoticeMapper.selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(userId, roleId, sysId, sysFlag); + CacheManager.addExcCount("noExc"); + return Msg.success().add("list",list); } /** @@ -165,6 +154,7 @@ public class FontController { return null; } }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -199,6 +189,7 @@ public class FontController { return null; } }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -220,29 +211,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); } /** @@ -260,26 +245,21 @@ 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已过期或不存在"); - } - //更新过期时间 - Power_UserVo user = (Power_UserVo) cache.getValue(); - String date = String.valueOf(DateUtils.getDate()); - CacheManager.putCache(token,new Cache(date,user,TOKEN_EXPIRE_TIME)); - }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()); + //更新过期时间 + Power_UserVo user = (Power_UserVo) cache.getValue(); + String date = String.valueOf(DateUtils.getDate()); + CacheManager.putCache(token,new Cache(date,user,TOKEN_EXPIRE_TIME)); + }else{ + return Msg.fail("token不能为空"); } + return Msg.success(); } /** @@ -297,55 +277,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 (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()); } } } - 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已失效"); } } @@ -364,34 +338,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 (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)); } } - 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); } /** @@ -409,68 +377,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 powerMenu : list) { + User_Dept_Menu deptMenu = new User_Dept_Menu(); + String menuUrl = powerMenu.getMenuUrl(); + if (StringUtils.isNotBlank(menuUrl)) { + BeanUtils.copyProperties(powerMenu, deptMenu); + deptMenu.setMethodParent(powerMenu.getParentId()); + menuList.add(deptMenu); + } + if (StringUtils.isNotBlank(powerMenu.getMethod())) { + menus.add(powerMenu.getMenuUrl()); } } - userVo.setMenuList(menuList); - userVo.setMenus(menus); + } + userVo.setMenuList(menuList); + userVo.setMenus(menus); - //设置科室 - StringBuilder power_depts = new StringBuilder(); - List power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); - for(int j=0;j powerDeptList = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); + for(int j = 0;j < powerDeptList.size();j++){ + if(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); } /** @@ -567,6 +518,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..c7bb99e --- /dev/null +++ b/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java @@ -0,0 +1,71 @@ +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.apache.log4j.Logger; +import org.springframework.validation.BindException; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + private static Logger log = Logger.getLogger("errorMsg"); + @ExceptionHandler(value = Exception.class)//指定拦截的异常 + public ModelAndView errorHandler(Exception e) { + return returnMv(e, "服务器出错了,请联系系统管理员"); + } + + @ExceptionHandler(value = RuntimeException.class)//指定拦截的异常 + public ModelAndView runtimeHandler(Exception e) { + return returnMv(e, "服务器出错了,请联系系统管理员"); + } + + @ExceptionHandler(BindException.class) + @ResponseBody + public Map bindErrHandler(BindException e) { + Map map = new HashMap(3) {{ + put("code", "500"); + put("msg", "参数有误"); + BindingResult bindingResult = e.getBindingResult(); + put("fieldErrors", new HashMap(bindingResult.getErrorCount()) {{ + bindingResult.getFieldErrors().forEach(fieldError -> put(fieldError.getField(), fieldError.getDefaultMessage())); + }}); + }}; + log.error(map.toString()); + return map; + } + + 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/LogAopAction.java b/power-admin/src/main/java/com/manage/controller/LogAopAction.java index 726d2eb..8d6e245 100644 --- a/power-admin/src/main/java/com/manage/controller/LogAopAction.java +++ b/power-admin/src/main/java/com/manage/controller/LogAopAction.java @@ -6,6 +6,7 @@ package com.manage.controller; /** import com.manage.annotation.OptionalLog; import com.manage.entity.Power_Log; import com.manage.service.LogService; +import com.manage.util.ExceptionPrintUtil; import org.apache.commons.lang3.CharUtils; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -60,9 +61,8 @@ public class LogAopAction { Method method = null; try { method = target.getClass().getMethod(methodName, parameterTypes); - } catch (NoSuchMethodException e1) { - e1.printStackTrace(); - } catch (SecurityException e1) { + } catch (NoSuchMethodException | SecurityException e1) { + ExceptionPrintUtil.printException(e1); e1.printStackTrace(); } if (null != method) { @@ -77,13 +77,13 @@ public class LogAopAction { Map newmap = new HashMap(); for(Map.Entry entry : map.entrySet()){ String name = entry.getKey(); - String values[] = entry.getValue(); + String[] values = entry.getValue(); if(values==null){ newmap.put(name, new String[]{}); continue; } - String newvalues[] = new String[values.length]; + String[] newvalues = new String[values.length]; for(int i=0; i power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId()); - for(int j=0;j powerDeptList = power_deptService.selectByPrimaryKeys(user.getDeptId()); + for(int j=0;j sysList = new ArrayList<>(); + try { + logService.insert(log); + //修改该通知为已读 + if(null != noticeId && noticeId != -1){ powerNoticeService.updateNoticeReadFlag(noticeId); CacheManager.addExcCount("noExc"); - }catch (Exception e){ - e.printStackTrace(); - CacheManager.addExcCount("exc"); } - } - //查询当前用户 - Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); - //查询系统权限 - List sysList = new ArrayList<>(); - if(user.getRoleId() == 0){ - sysList = sysDictMapper.selectSysFlagsByUserId(null,null); - }else{ - sysList = sysDictMapper.selectSysFlagsByUserId(user.getUserId(),user.getRoleId()); + //查询当前用户 + Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); + if(user.getRoleId() == 0){ + sysList = sysDictMapper.selectSysFlagsByUserId(null,null); + }else{ + sysList = sysDictMapper.selectSysFlagsByUserId(user.getUserId(),user.getRoleId()); + } + }catch (Exception e){ + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + CacheManager.addExcCount("exc"); } int power = 0; int emr_medical_record = 0; @@ -181,26 +181,26 @@ public class PageController { } } } - for (int i = 0; i < sysList.size(); i++) { - String sysFlag = sysList.get(i).getSysFlag(); - if(StringUtils.isNotBlank(sysFlag)){ - if("power".equals(sysFlag)){ + for (Power_Sys_Dict powerSysDict : sysList) { + String sysFlag = powerSysDict.getSysFlag(); + if (StringUtils.isNotBlank(sysFlag)) { + if ("power".equals(sysFlag)) { power = 1; continue; } - if("emr_medical_record".equals(sysFlag)){ + if ("emr_medical_record".equals(sysFlag)) { emr_medical_record = 1; continue; } - if("emr_record".equals(sysFlag)){ + if ("emr_record".equals(sysFlag)) { emr_record = 1; continue; } - if("emr_apply_copy".equals(sysFlag)){ + if ("emr_apply_copy".equals(sysFlag)) { emr_apply_copy = 1; continue; } - if("emr_files".equals(sysFlag)){ + if ("emr_files".equals(sysFlag)) { emr_files = 1; continue; } @@ -252,15 +252,12 @@ public class PageController { try { //无异常 Integer noExc = CacheManager.getExcCount("noExc"); - String valueArr1[] = {noExc.toString()}; + String[] valueArr1 = {noExc.toString()}; Echarts echarts1 = new Echarts("无异常",null,valueArr1); //异常 Integer exc = CacheManager.getExcCount("exc"); - if(null == exc){ - exc = 0; - } - String valueArr2[] = {exc.toString()}; + String[] valueArr2 = {exc.toString()}; Echarts echarts2 = new Echarts("异常",null,valueArr2); //锁定 @@ -268,7 +265,7 @@ public class PageController { if(null == effectiveCount){ effectiveCount = 0; } - String valueArr3[] = {effectiveCount.toString()}; + String[] valueArr3 = {effectiveCount.toString()}; Echarts echarts3 = new Echarts("锁定",null,valueArr3); list.add(echarts1); diff --git a/power-admin/src/main/java/com/manage/controller/PermissionsController.java b/power-admin/src/main/java/com/manage/controller/PermissionsController.java index b99f227..bcd5300 100644 --- a/power-admin/src/main/java/com/manage/controller/PermissionsController.java +++ b/power-admin/src/main/java/com/manage/controller/PermissionsController.java @@ -68,9 +68,7 @@ public class PermissionsController { Method method = null; try { method = target.getClass().getMethod(methodName, parameterTypes); - } catch (NoSuchMethodException e1) { - e1.printStackTrace(); - } catch (SecurityException e1) { + } catch (NoSuchMethodException | SecurityException e1) { e1.printStackTrace(); } @@ -85,7 +83,7 @@ public class PermissionsController { if (user.getRoleId() == 0 && user.getRoleId() != -100) { object = pjp.proceed(); }else{ - Boolean flag = false; + boolean flag = false; Set menus = user.getMenus(); if (null != menus && !menus.isEmpty()) { for (String menuUrl : menus) { 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 e13119c..fbee328 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; @@ -13,7 +14,6 @@ import com.manage.vo.Power_UserVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -61,7 +61,7 @@ public class Power_LogController { @OptionalLog(module = "查看",methods = "日志管理页面") @RequiresPermissions("/otherManage/backupDatabase") @RequestMapping("backupDatabase") - public String backupDatabase(Model model){ + public String backupDatabase(){ CacheManager.addExcCount("noExc"); return "otherManage/backupDatabase"; } @@ -91,7 +91,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 +107,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 +131,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 +153,21 @@ public class Power_LogController { @RequestMapping("deleteLogByIds/{ids}") @RequiresPermissions("/otherManage/deleteLogByIds") @ResponseBody - public Msg deleteLogByIds(@PathVariable("ids")String ids){ - try{ - 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] + ","); - }else{ - str.append(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.toString()); - 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 +205,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..951b60e 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 @@ -1,22 +1,17 @@ package com.manage.controller; import com.manage.entity.Power_Menu; -import com.manage.entity.Power_Menu_User; -import com.manage.entity.Power_User; import com.manage.service.cache.CacheManager; import com.manage.service.Power_MenuService; import com.manage.util.ActionScopeUtils; import com.manage.util.Constant; import com.manage.util.Msg; import com.manage.vo.Power_UserVo; -import com.manage.vo.User_Dept_Menu; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.ArrayList; import java.util.List; /** @@ -46,22 +41,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..e1431f4 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; @@ -55,19 +57,21 @@ public class Power_MenuManageController { @RequestMapping(value = "getMenuList",produces = {"text/json;charset=UTF-8"}) @ResponseBody public String getMenuList(){ + List menus = new ArrayList<>(); + Power_Menu menu = new Power_Menu(); + menu.setMenuId(0); + menu.setMenuName("菜单列表"); + menus.add(menu); + List menus1 = null; try { - List menus = new ArrayList<>(); - Power_Menu menu = new Power_Menu(); - menu.setMenuId(0); - menu.setMenuName("菜单列表"); - menus.add(menu); - List menus1 = menuService.selectAll(null,null,null); + menus1 = menuService.selectAll(null,null,null); menus.addAll(menus1); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(menus); CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -76,42 +80,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 +111,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..080f68e 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.*; @@ -31,8 +32,13 @@ public class Power_NoticeController { @OptionalLog(module = "查看",methods = "通知管理页面") @RequestMapping(value = "pageUI") public String notice(HttpServletRequest request, Model model){ - noticeService.loadSys(request,model); - model.addAttribute("user",(Power_User)request.getSession().getAttribute("CURRENT_USER")); + try { + noticeService.loadSys(request,model); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + } + model.addAttribute("user",request.getSession().getAttribute("CURRENT_USER")); CacheManager.addExcCount("noExc"); return "/noticeDir/noticePage"; } @@ -42,7 +48,7 @@ public class Power_NoticeController { public PageHelper selectAll(Power_NoticeVo notice, HttpServletRequest request) { PageHelperpageHelper = new PageHelper(); Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - Listpower_notices = new ArrayList(); + List powerNotices = new ArrayList(); List getTatal = new ArrayList(); try { /*if(user.getRoleId() == 0){ @@ -52,45 +58,24 @@ public class Power_NoticeController { }*/ if(user.getRoleId() == 0){ getTatal = this.noticeMapper.getTotal(null,null,notice); - power_notices = this.noticeMapper.selectALlByPower(null,null,notice); + powerNotices = this.noticeMapper.selectALlByPower(null,null,notice); }else{ getTatal = this.noticeMapper.getTotal(user.getRoleId(),user.getUserId(),notice); - power_notices = this.noticeMapper.selectALlByPower(user.getRoleId(),user.getUserId(),notice); + powerNotices = this.noticeMapper.selectALlByPower(user.getRoleId(),user.getUserId(),notice); } pageHelper.setTotal(getTatal.size()); //查询当前页实体对象 - pageHelper.setRows(power_notices); + pageHelper.setRows(powerNotices); CacheManager.addExcCount("noExc"); return pageHelper; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; } } - - - public List putChildren(List moduleList, Power_NoticeVo notice,Power_User user) { - if (moduleList.size() > 0) { - for (Power_Notice mod2 : moduleList) { - HashMap param = new HashMap(); - notice.setParentId(mod2.getNoticeId()); - List res2 = new ArrayList<>(); - if(user.getRoleId() == -100 || user.getRoleId() == 0){ - res2 = this.noticeMapper.selectNoticeListByParentId(notice,null); - }else{ - res2 = this.noticeMapper.selectNoticeListByParentId(notice,user.getUserId()); - } - if (res2.size() > 0) { - res2 = putChildren(res2,notice,user); - } - mod2.setChildren(res2); - } - } - return moduleList; - } - @RequestMapping(value = "getNoticeTypeTree",produces = {"text/json;charset=UTF-8"}) @ResponseBody public String getNoticeTypeTree(){ @@ -99,6 +84,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 +93,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 +177,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 +186,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 +206,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..15f635b 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; @@ -62,10 +63,11 @@ public class Power_Sys_DictController { @ResponseBody public List selectHosList(HttpServletRequest request){ try { - List power_sys_dicts = powerSysDictService.selectHosList(request); + List powerSysDicts = powerSysDictService.selectHosList(request); CacheManager.addExcCount("noExc"); - return power_sys_dicts; + return powerSysDicts; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -76,10 +78,11 @@ public class Power_Sys_DictController { @ResponseBody public List selectList(){ try { - List power_sys_dicts = powerSysDictService.selectList(); + List powerSysDicts = powerSysDictService.selectList(); CacheManager.addExcCount("noExc"); - return power_sys_dicts; + return powerSysDicts; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -90,10 +93,11 @@ public class Power_Sys_DictController { @ResponseBody public Power_Sys_Dict selectDict(Integer dictId){ try { - Power_Sys_Dict power_sys_dict = powerSysDictService.selectByPrimaryKey(dictId); + Power_Sys_Dict powerSysDict = powerSysDictService.selectByPrimaryKey(dictId); CacheManager.addExcCount("noExc"); - return power_sys_dict; + return powerSysDict; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -101,202 +105,163 @@ 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 public List selectType(){ try { - List power_sys_dictVos = powerSysDictService.selectSysType(); + List powerSysDictVos = powerSysDictService.selectSysType(); CacheManager.addExcCount("noExc"); - return power_sys_dictVos; + return powerSysDictVos; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; } } - @RequestMapping("/export") - public void download(HttpServletResponse response){ - try { - powerSysDictService.export(response); - CacheManager.addExcCount("noExc"); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - } - } @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(); } } @@ -324,7 +289,7 @@ public class Power_Sys_DictController { dict = hospital; model.addAttribute("dict",dict); } - if(level != 0 && selfId >= 0 || selfId == -100){ + if(selfId >= 0 || selfId == -100){ //权限系统是否存在,不存在才加载 Power_Sys_DictVo powerSysExsit = powerSysDictService.getHospitalByParentId(selfId, "权限系统"); if(null == powerSysExsit && level != 2 || "权限系统".equals(hospital.getSysType())){ @@ -338,9 +303,7 @@ public class Power_Sys_DictController { sysTypes.add("科研系统"); sysTypes.add("其它"); model.addAttribute("sysTypes",sysTypes); - if(hospital != null){ - selfId = hospital.getHospitalId(); - } + selfId = hospital.getHospitalId(); List depts = deptService.selectDeptByDictId(selfId,dict.getSysFlag()); model.addAttribute("depts",depts); } @@ -359,6 +322,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 +331,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..3c85b4a 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; @@ -98,7 +100,7 @@ public class RoleAndUserPowerController { */ @RequestMapping(value = "getMenuBySysIdAndRoleIdPowerTree",produces = {"text/json;charset=UTF-8"}) @ResponseBody - public String getMenuBySysIdAndRoleIdPowerTree(String sysFlag,Integer roleId,HttpServletRequest request){ + public String getMenuBySysIdAndRoleIdPowerTree(String sysFlag,Integer roleId){ try { List menus = powerService.getMenuBySysIdAndRoleIdPowerTree(sysFlag,roleId); ObjectMapper mapper = new ObjectMapper(); @@ -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,21 +210,15 @@ 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(); } -/**************************************用户菜单权限操作************************************************/ +/***********************用户菜单权限操作******************************/ /** * @ProjectName: userPowerList * @Description: 跳转到用户分配权限页面 @@ -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 98a9c54..fbc52b4 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(); } @@ -83,18 +85,6 @@ public class RoleController { CacheManager.addExcCount("noExc"); return "roleDir/role"; } - /** - * @Date 2019-4-25 - * @Author ly - * @Description 返回页面 - * */ - @OptionalLog(module = "查看",methods = "角色管理页面") - @RequiresPermissions(value="/role/pageUINotDown") - @RequestMapping("/pageUINotDown") - public String pageUINotDown(){ - CacheManager.addExcCount("noExc"); - return "roleDir/roleNotDown"; - } /** * @Date 2019-08-02 @@ -103,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(); } } @@ -129,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(); } @@ -155,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(); } /** @@ -180,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 @@ -204,6 +170,7 @@ public class RoleController { CacheManager.addExcCount("noExc"); return powerRole; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -222,27 +189,12 @@ public class RoleController { powerRoleService.export(powerRole,response,request); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } } - /** - * @Date 2019-4-25 - * @Author ly - * @Description 导出Excel - * */ - @OptionalLog(module = "导出excel",methods = "角色管理") - @RequiresPermissions(value="/role/export") - @RequestMapping("/exportNotDown") - public void exportNotDown(Power_RoleVo powerRole, HttpServletResponse response, HttpServletRequest request){ - try { - powerRoleService.exportNotDown(powerRole,response,request); - CacheManager.addExcCount("noExc"); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - } - } + /** * @Date 2019-4-30 * @Author ly @@ -252,10 +204,11 @@ public class RoleController { @ResponseBody public List selectList(HttpServletRequest request){ try { - List power_roles = powerRoleService.selectListByPower(request); + List powerRoles = powerRoleService.selectListByPower(request); CacheManager.addExcCount("noExc"); - return power_roles; + return powerRoles; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -272,7 +225,6 @@ public class RoleController { @RequestMapping(value="/importExcel",method = {RequestMethod.POST}) @ResponseBody public ResponseEntity importExcel(HttpServletRequest request){ - OutputStream os = null; HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.setContentType(new MediaType("text","html",Charset.forName("UTF-8"))); try { @@ -310,79 +262,10 @@ 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); - }finally { - if(os != null){ - try { - os.close(); - }catch (Exception e){ - e.printStackTrace(); - } - } - } - } - - /** - * @Date 2019-10-11 - * @Author zengwh - * @Description 导入excel - * */ - @OptionalLog(module = "导入excel",methods = "角色管理") - @RequiresPermissions(value="/role/importExcel") - @RequestMapping(value="/importExcelNotDown",method = {RequestMethod.POST}) - @ResponseBody - public ResponseEntity importExcelNotDown(HttpServletRequest request){ - OutputStream os = null; - HttpHeaders responseHeaders = new HttpHeaders(); - responseHeaders.setContentType(new MediaType("text","html",Charset.forName("UTF-8"))); - try { - //读取文件 - MultipartResolver resolver = new CommonsMultipartResolver(request.getSession().getServletContext()); - MultipartHttpServletRequest multipartRequest = resolver.resolveMultipart(request); - MultipartFile multipartFile = multipartRequest.getFile("upfile"); - //属性名 - String[] fieldNames = {"roleName","remark","effective"}; - //判断集中类中的方法名 - String[] judgeMethods = {"judgeRoleName","judgeRemark","convertEffective"}; - //导入excel的操作 - Power_Role role = new Power_Role(); - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); - Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); - role.setCreater(user.getUserName()); - role.setUpdater(user.getUserName()); - role.setCreateDate(fmt.format(new Date())); - role.setUpdateDate(fmt.format(new Date())); - //实例化 - ImportExcelUtil.newInstance("power_RoleMapper",role, Power_Role.class); - //导入excel的操作 - ImportExcelEntity excelEntity = ImportExcelUtil.fileImport(multipartFile,fieldNames, judgeMethods); - CacheManager.addExcCount("noExc"); - if(excelEntity.getSuccessCount() == 0 && excelEntity.getWrongCount() == 0){ - //无数据 - return new ResponseEntity("无数据!", responseHeaders, HttpStatus.OK); - } - if(excelEntity.getWrongCount() == 0){ - //成功 - return new ResponseEntity(null, responseHeaders, HttpStatus.OK); - }else{ - //有出错数据 - String msgStr = excelEntity.getWorkBookKey()+"@已成功导入"+excelEntity.getSuccessCount()+"条,失败"+excelEntity.getWrongCount()+"条,随后将导出错误记录!"; - return new ResponseEntity(msgStr, responseHeaders, HttpStatus.OK); - } - }catch (Exception e){ - CacheManager.addExcCount("exc"); - //抛异常 - return new ResponseEntity(e.getMessage(), responseHeaders, HttpStatus.OK); - }finally { - if(os != null){ - try { - os.close(); - }catch (Exception e){ - e.printStackTrace(); - } - } } } } 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..5f1dfca 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,9 @@ 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() throws Exception{ + 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..5c21743 100644 --- a/power-admin/src/main/java/com/manage/controller/UserController.java +++ b/power-admin/src/main/java/com/manage/controller/UserController.java @@ -5,7 +5,6 @@ import com.manage.annotation.RequiresPermissions; import com.manage.dao.Power_User_DictMapper; import com.manage.encrypt.Base64; import com.manage.encrypt.MD5; -import com.manage.entity.Power_Dept; import com.manage.entity.Power_User; import com.manage.service.Power_DeptService; import com.manage.service.cache.CacheManager; @@ -30,7 +29,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.OutputStream; import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.Date; @@ -62,6 +60,7 @@ public class UserController { pageHelper.setRows(list); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -76,30 +75,20 @@ public class UserController { Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); //根据登陆者查询所属医院id。非系统管理员,查询所属医院id Integer dictId = null; - if(!user.getRoleId().equals(0)){ - Power_User_Dict power_user_dict = userDictMapper.selectDictIdByUserId(user.getUserId()); - dictId = power_user_dict.getDictId(); + List depts = null; + try { + if(!user.getRoleId().equals(0)){ + Power_User_Dict powerUserDict = userDictMapper.selectDictIdByUserId(user.getUserId()); + dictId = powerUserDict.getDictId(); + } + depts = deptService.selectDeptByDictId(dictId,null); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); } - List depts = deptService.selectDeptByDictId(dictId,null); model.addAttribute("depts",depts); return "userDir/user"; } - @OptionalLog(module = "查看",methods = "用户管理页面") - @RequiresPermissions(value="/user/pageUI1") - @RequestMapping("/pageUI1") - public String pageUI1(Model model,HttpServletRequest request){ - CacheManager.addExcCount("noExc"); - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - //根据登陆者查询所属医院id。非系统管理员,查询所属医院id - Integer dictId = null; - if(!user.getRoleId().equals(0)){ - Power_User_Dict power_user_dict = userDictMapper.selectDictIdByUserId(user.getUserId()); - dictId = power_user_dict.getDictId(); - } - List depts = deptService.selectDeptByDictId(dictId,null); - model.addAttribute("depts",depts); - return "userDir/user1"; - } @OptionalLog(module = "导出excel",methods = "用户管理") @RequiresPermissions(value="/user/export") @@ -109,18 +98,7 @@ public class UserController { powerUserService.export(powerUser,request,response); CacheManager.addExcCount("noExc"); }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - } - } - @OptionalLog(module = "导出excel",methods = "用户管理") - @RequiresPermissions(value="/user/export") - @RequestMapping("/export1") - public void download1(Power_UserVo powerUser,HttpServletRequest request,HttpServletResponse response){ - try { - powerUserService.export1(powerUser,request,response); - CacheManager.addExcCount("noExc"); - }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -128,19 +106,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 +120,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 +146,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 +161,15 @@ 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(); + assert attr != null; + 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 +179,7 @@ public class UserController { CacheManager.addExcCount("noExc"); return powerUser; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -246,6 +193,7 @@ public class UserController { model.addAttribute("user",userVo); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -255,16 +203,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); } /** @@ -277,7 +219,6 @@ public class UserController { @RequestMapping(value="/importExcel",method = {RequestMethod.POST}) @ResponseBody public ResponseEntity importExcel(HttpServletRequest request){ - OutputStream os = null; HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.setContentType(new MediaType("text","html", Charset.forName("UTF-8"))); try { @@ -314,17 +255,10 @@ 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); - }finally { - if(os != null){ - try { - os.close(); - }catch (Exception e){ - e.printStackTrace(); - } - } } } } diff --git a/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java b/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java index a3f89f4..e595984 100644 --- a/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java +++ b/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Properties; -public class LoginInterceptor implements HandlerInterceptor { +public class LoginInterceptor implements HandlerInterceptor { @Value("${TOKEN_EXPIRE_TIME}") private long TOKEN_EXPIRE_TIME; @Autowired @@ -43,7 +43,7 @@ public class LoginInterceptor implements HandlerInterceptor { if(!"/getSessionRemainingTime".equals(parentUrl)){ request.getSession().setAttribute(request.getSession().getId(),System.currentTimeMillis()); } - if (excludes(parentUrl, Constant.RELEASE_REQUEST,request)) { + if (excludes(parentUrl, Constant.RELEASE_REQUEST)) { response.setHeader("Access-Control-Allow-Origin","*"); return true; }else{ @@ -76,7 +76,7 @@ public class LoginInterceptor implements HandlerInterceptor { } - private boolean excludes(String url,String key,HttpServletRequest request){ + private boolean excludes(String url,String key){ Properties props = new Properties(); ClassLoader loader = Thread.currentThread().getContextClassLoader(); try { diff --git a/power-admin/src/main/java/com/manage/interfaces/webservice/RoleAndUserTreeWebService.java b/power-admin/src/main/java/com/manage/interfaces/webservice/RoleAndUserTreeWebService.java deleted file mode 100644 index 202221b..0000000 --- a/power-admin/src/main/java/com/manage/interfaces/webservice/RoleAndUserTreeWebService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.manage.interfaces.webservice; - - -import com.manage.vo.PowerTree; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import java.util.List; - -@WebService -public interface RoleAndUserTreeWebService { - @WebMethod() - List getRolePowerTree(); -} diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties index 652fb47..ece2fc1 100644 --- a/power-admin/src/main/resources/config/config.properties +++ b/power-admin/src/main/resources/config/config.properties @@ -9,7 +9,7 @@ TOKEN_EXPIRE_TIME = 3600000 ##################################################服务器ip########################################################## #通用服务器IP与通用服务器端口 -SERVER_IP = 192.168.1.101 +SERVER_IP = 192.168.1.3 SERVER_PORT = 8081 #power权限系统ip diff --git a/power-admin/src/main/resources/log4j.properties b/power-admin/src/main/resources/log4j.properties new file mode 100644 index 0000000..817ab7b --- /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/test/com/manage/MapperTest.java b/power-admin/src/main/test/com/manage/MapperTest.java deleted file mode 100644 index 622663b..0000000 --- a/power-admin/src/main/test/com/manage/MapperTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.manage; - -import com.manage.dao.Power_MenuMapper; -import com.manage.dao.T_MenuMapper; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.FileSystemXmlApplicationContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations={"classpath:config/applicationContext.xml"}) -public class MapperTest { - - @Autowired - T_MenuMapper t_menuMapper; - - /** - * 测试角色mapper - */ - @Test - public void testCRUD(){ - //1、创建SpringIOC容器 - ApplicationContext ioc=new FileSystemXmlApplicationContext("classpath:config/applicationContext.xml"); - T_MenuMapper menuMapper=ioc.getBean(T_MenuMapper.class); - System.out.println(menuMapper); - //Power_MenuMapper powerMenuMapper=ioc.getBean(Power_MenuMapper.class); - //System.out.println(powerMenuMapper); - - //menuMapper.selectByPrimaryKey(1); - - //ApplicationContext ioc=new ClassPathXmlApplicationContext("config/applicationContext.xml"); - //2、从容器中获取mapper - //T_RoleMapper bean=ioc.getBean(T_RoleMapper.class); - //System.out.println(t_roleMapper); - - //1、插入角色 - //t_roleMapper.insertSelective(new T_Role(null,"vip用户","注册的用户","1","admin","2018-03-03 18:18:00","admin","2018-03-03 18:18:00")); - //1、插入用户 - //t_userMapper.insertSelective(new T_User(null,"user6","user6",1,23,"1350167656","123484896@qq.com","福建省***","***","游客用户","1","admin","2018-03-03 18:18:00","admin","2018-03-03 18:18:00",3)); - //3、批量插入用户,使用可以执行批量操作的sqlSession - /*T_UserMapper mapper=sqlSession.getMapper(T_UserMapper.class); - for(int i=0;i<10;i++){ - String uuid=UUID.randomUUID().toString().substring(0,6)+""+i; - mapper.insertSelective(new T_User(null,uuid,uuid,1,23,"135016735"+i,uuid+"@qq.com","福建省***","***","游客用户","1","admin","2018-03-03 18:18:00","admin","2018-03-03 18:18:00",3,"")); - } - System.out.println("批量完成");*/ - //修改 - /*T_User user=new T_User(); - user.setUserId(1); - t_userMapper.updateByPrimaryKey(user);*/ - System.out.println(123); - } -} diff --git a/power-admin/src/main/test/com/manage/WebServiceTest.java b/power-admin/src/main/test/com/manage/WebServiceTest.java deleted file mode 100644 index 49b5cb6..0000000 --- a/power-admin/src/main/test/com/manage/WebServiceTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.manage; - -import com.manage.dao.Power_MenuMapper; -import com.manage.dao.T_MenuMapper; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.FileSystemXmlApplicationContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - - -public class MapperTest { - /** - * 测试角色mapper - */ - public static void main(String[] arg){ - JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance(); - Client client = dcf.createClient("http://192.168.1.3:8081/WebService/PowerWebService?wsdl"); - Object[] objects = new Object[0]; - String error = null; - try { - // invoke("方法名",参数1,参数2,参数3....); - objects = client.invoke("getInfosByUserId",token,"0"); - Result result = JSON.parseObject(objects[0].toString() - , new TypeReference() {}); - String permStrs = ""; - if(null != result.getPowerMenuList() && !result.getPowerMenuList().isEmpty()){ - for (Power_Menu p: result.getPowerMenuList()) { - if(StringUtils.isNoneBlank(p.getMenuName())){ - permStrs+=p.getMenuName() + ","; - } - } - } - Power_User powerUser = result.getPowerUser(); - if(powerUser != null){ - Power_User admin = (Power_User)SecurityUtils.getSubject().getPrincipal(); - UserToken userToken = new UserToken(powerUser.getUserName(),powerUser.getUserPwd(),true,powerUser.getRoleId(),permStrs); - Subject subject = SecurityUtils.getSubject(); - subject.login(userToken); - } - String msg = ""; - if (error != null) {//出错了,返回登录页面 - return "redirect://http:192.168.1.3:8080/login"; - } - } -} diff --git a/power-admin/src/main/webapp/WEB-INF/views/deptDir/blood.jsp b/power-admin/src/main/webapp/WEB-INF/views/deptDir/blood.jsp deleted file mode 100644 index d7e727e..0000000 --- a/power-admin/src/main/webapp/WEB-INF/views/deptDir/blood.jsp +++ /dev/null @@ -1,225 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="/WEB-INF/jspf/common.jspf" %> -<%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %> - - - 部门管理 - - - - - - - -
- - - -
-
-

基本管理/部门管理

-
-
-
-
- - -
- -
- -
- -
-
-
-
- -
- -
-
-
- - -
-
- -
-
-
-
-
-
- - - - - - - - - -
-
-
-
-
- - - - - - - - -<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %> - - \ No newline at end of file diff --git a/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict1.jsp b/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict1.jsp deleted file mode 100644 index f23aa4d..0000000 --- a/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict1.jsp +++ /dev/null @@ -1,210 +0,0 @@ -<%-- - Created by IntelliJ IDEA. - User: HJL Date: 2019/4/6 - Time: 16:57 - To change this template use File | Settings | File Templates. ---%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="/WEB-INF/jspf/common.jspf" %> - - - 归属管理(医院、系统) - - - - - - - - - - - -
-
-
-
-
-
基本管理/科室管理
-
-
-
- -
- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
- -
- -
-
-
- -
- -
-
-
- - -
-
-
-
-
-
- - - 导出Excel - -
-
-
-
-
-
- - - - - - - - - - - - - - - \ No newline at end of file diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login1.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login1.jsp deleted file mode 100644 index 81d74ac..0000000 --- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login1.jsp +++ /dev/null @@ -1,82 +0,0 @@ -<%@ page import="java.net.URLDecoder" %> -<%@ page import="com.manage.encrypt.Base64" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="/WEB-INF/jspf/common.jspf" %> -<% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String password=""; - String userName=""; - String checked=""; - Cookie[] cookies = request.getCookies(); //取出cookie对象组 - for(int i = 0; cookies != null && i < cookies.length;i++){ - Cookie cookie = cookies[i]; // 取出其中的一个对象,含有name ,value - if(cookie != null && "name".equals(cookie.getName())){ //获取第一个cookie对象的name - userName = URLDecoder.decode(cookie.getValue(), "UTF-8");//进行解码 - checked = "checked"; - } - if(cookie != null && "password".equals(cookie.getName())){ - password = cookie.getValue(); - password = Base64.decodeBase64(password); - } - } -%> - - - 嘉时软件 - - - - - - - - - - - - - - diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login174.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login174.jsp deleted file mode 100644 index 1f75d0f..0000000 --- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login174.jsp +++ /dev/null @@ -1,83 +0,0 @@ -<%@ page import="java.net.URLDecoder" %> -<%@ page import="com.manage.encrypt.Base64" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="/WEB-INF/jspf/common.jspf" %> -<% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String password=""; - String userName=""; - String checked=""; - Cookie[] cookies = request.getCookies(); //取出cookie对象组 - for(int i = 0; cookies != null && i < cookies.length;i++){ - Cookie cookie = cookies[i]; // 取出其中的一个对象,含有name ,value - if(cookie != null && "name".equals(cookie.getName())){ //获取第一个cookie对象的name - userName = URLDecoder.decode(cookie.getValue(), "UTF-8");//进行解码 - checked = "checked"; - } - if(cookie != null && "password".equals(cookie.getName())){ - password = cookie.getValue(); - password = Base64.decodeBase64(password); - } - } -%> - - - 嘉时软件 - - - - - - - - - - - - - - diff --git a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp index 3c3828d..dcaaf58 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp @@ -73,11 +73,10 @@ } /**查询按钮组*/ - .btnsDiv { - width: 100%; - height: 32px; + .btns{ text-align: right; - padding-top: 5px; + margin-top: 5px; + margin-right: 15px; } /**表格div*/ @@ -98,7 +97,7 @@
- +
@@ -106,7 +105,7 @@
- +
@@ -114,7 +113,7 @@
- +
@@ -122,17 +121,17 @@
- +
- +
-
+
diff --git a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp deleted file mode 100644 index fb86912..0000000 --- a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp +++ /dev/null @@ -1,210 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="/WEB-INF/jspf/common.jspf" %> -<%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %> - - - 角色管理 - - - - - - - -
- - -
-
-

基本管理/角色管理

-
-
-
-
- - -
-
- -
- -
-
-
- - -
-
- -
-
-
-
-
-
- - - - - - - - - -
-
-
-
-
- - - - - - - - -<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %> - - \ No newline at end of file diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user1.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user1.jsp deleted file mode 100644 index c82d334..0000000 --- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user1.jsp +++ /dev/null @@ -1,316 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="/WEB-INF/jspf/common.jspf" %> -<%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %> - - - 用户管理 - - - - - - - - - -
- - -
-
-

基本管理/用户管理

-
-
-
-
- - -
-
- - -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
-
-
-
- - - - - - - - - - - - -
-
-
-
-
- - - - - - - - -<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %> - - \ No newline at end of file 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-admin/src/main/webapp/static/js/blood.js b/power-admin/src/main/webapp/static/js/blood.js deleted file mode 100644 index 75f23ad..0000000 --- a/power-admin/src/main/webapp/static/js/blood.js +++ /dev/null @@ -1,407 +0,0 @@ -var form = '' -var pageNumber = 1; -$(function(){ - var columns = []; - columns.push({ - checkbox:true - }, - { - title:'序号', - field:'no', - formatter: function (value, row, index) { - //获取每页显示的数量 - var pageSize = $('#bootstrapTable').bootstrapTable('getOptions').pageSize; - //获取当前是第几页 - if(pageNumber == 1){ - pageNumber = $('#bootstrapTable').bootstrapTable('getOptions').pageNumber; - } - //返回序号,注意index是从0开始的,所以要加上1 - return pageSize * (pageNumber - 1) + index + 1; - } - }, - { - title:'部门名', - field:'deptName', - }); - var roleId = $("#roleId").val(); - if(roleId == 0){ - columns.push({ - title:'所属医院', - field:'hospitalName', - }); - } - columns.push( - { - title:'是否有效', - field:'effective', - formatter: function (value, row, index) { - if(value ==1){ - return '是' - }else if(value ==0){ - return '否' - } - } - }, - { - title:'创建时间', - field:'createDate', - }, - { - title:'创建人', - field:'creater', - }, - { - title:'修改时间', - field:'updateDate', - }, - { - title:'修改人', - field:'updater', - }, - { - title:'操作', - field:'deptId', formatter: function(value,row,index){ - var editanddrop = ''; - if(row.isUpdate == 1){ - editanddrop += ''; - } - if(row.isDelete == 1){ - editanddrop += ''; - } - return editanddrop; - } - }); - $('#myModal').modal('hide'); - loadDict(); - //先销毁表格 - $('#bootstrapTable').bootstrapTable({ - //表格高度 - height: getHeight(), - method : 'get', - url :path+ "/dept/pageList",//请求路径 - striped : true, //是否显示行间隔色 - pageNumber : 1, //初始化加载第一页 - pagination : true,//是否分页 - sidePagination : 'server',//server:服务器端分页|client:前端分页 - pageSize : 10,//单页记录数 - pageList : [ 5, 10, 20, 30 ],//可选择单页记录数 - cache: false, - paginationPreText : '上一页', - paginationNextText : '下一页', - queryParams : function(params) {//上传服务器的参数 - var temp = {//如果是在服务器端实现分页,limit、offset这两个参数是必须的 - limit : params.limit, // 每页显示数量 - offset : params.offset, // SQL语句起始索引 - page : (params.offset / params.limit) + 1, //当前页码 - deptName:$("#dept_name").val(), - dictId:$("#dict_id option:selected").val(), - effective:$("#effective option:selected").val(), - creater:$("#creater").val(), - }; - return temp; - }, - columns : columns, - onLoadSuccess: function(){ //加载成功时执行 - $(".page-list").show(); - $("th").css({'text-align':'center','vertical-align':'middle'}) - $("td").css({'text-align':'center','vertical-align':'middle'}) - }, - //监听分页点击事件 - onPageChange: function(num, type) { - pageNumber = num; - }, - //选中单个复选框 - onCheck:function(row){ - var checks = $("#checks").val(); - $("#checks").val(checks+=row.deptId + ","); - }, - //取消单个复选框 - onUncheck:function(row){ - var checks = $("#checks").val(); - checks = checks.replace(row.deptId + ",",""); - $("#checks").val(checks); - }, - //全选 - onCheckAll:function(rows){ - $("#checks").val(""); - var checks = ''; - for(var i=0;i' + comment['hospitalName'] - + ''; - }); - $('#dict_id').append(html); - $('#re_dictId').append(html); - } - } - }); -} -//验证部门名不能重复 -$("#re_deptName").blur(function(){ - var deptId = $("#re_deptId").val(); - var deptName = $("#re_deptName").val(); - if(deptId == '' && deptName != ''){ - var dictId = $("#re_dictId").val(); - $.ajax({ - type:'get', - url:path+'/dept/checkDeptName', - data:{deptName:deptName,dictId:dictId}, - dataType:'json', - success:function(data){ - if(data.code == 200){ - toastr.warning("部门名已存在"); - $("#re_deptName").val(""); - $("#re_deptName").focus(); - } - } - }) - } - -}) -//编辑框回显 -function edit(id){ - $("#myModalLabel").text("编辑"); - $.ajax({ - type: "post", - url: path+ "/dept/selectDept", - data:{ - deptId:id - }, - dataType:"json", - success: function(data){ - $("#re_deptId").val(data.deptId); - $("#re_deptName").val(data.deptName); - $("#re_dictId").find("option[value='"+data.dictId+"']").attr("selected",true); - $("#re_effective").find("option[value='"+data.effective+"']").attr("selected",true); - $("#re_remark").val(data.remark); - } - }); - $('#myModal').modal('show') -} -//删除 -function drop(id) { - Common.confirm({ - title: "提示", - message: "确定是否删除这条记录", - operate: function (reselt) { - if (reselt) { - $.ajax({ - type: "post", - url: path + "/dept/delete", - data: { - deptId: id - }, - async: false, - success: function (data) { - if ("success" == data.msg) { - toastr.success("删除成功!"); - $("#checks").val(""); - backToPage(); - } - }, - error: function () { - window.confirm("删除失败"); - } - }) - } - } - }) -} -//新增框 -function add() { - initable(); - $("#myModalLabel").text('增加'); - $('#myModal').modal('show'); - $("#re_dictId").empty(); - loadDict(); -} -//提交更改 -$('#btn_submit').click(function () { - var deptName = $("#re_deptName").val(); - var dictId = $("#re_dictId").val(); - if(deptName != ''){ - if(dictId != ''){ - var btype = $("#myModalLabel").text(); - if(btype=='编辑'){ - $.ajax({ - type: "post", - url: path+ "/dept/update", - data:$("#updateaddform").serialize(), - dataType:"json", - success: function(data){ - if("success"==data.msg){ - toastr.success("修改成功!"); - backToPage(); - $('#myModal').modal('hide'); - }else{ - toastr.warning(data.msg); - } - } - }) - }else if(btype =='增加'){ - $.ajax({ - type: "post", - url:path+ "/dept/add", - data:$("#updateaddform").serialize(), - dataType:"json", - success: function(data){ - if("success"==data.msg){ - toastr.success("添加成功!"); - setTimeout(function(){ - window.location.reload(); - },500) - $('#myModal').modal('hide'); - }else{ - toastr.warning(data.msg); - } - } - }) - } - }else{ - toastr.warning("所属医院不能为空!"); - } - }else{ - toastr.warning("部门名称不能为空!"); - } -}) -//初始化模态框 -function initable(){ - $("#re_deptId").val(""); - $("#updateaddform")[0].reset(); -} -//导出excel功能 -function exportExcel(){ - var roleId = $("#roleId").val(); - var url = ''; - var checks = $("#checks").val(); - if(checks != '') { - checks = checks.substring(0, checks.length - 1); - if(roleId == 0){ - url = path+"/dept/exportBlood?deptName="+$("#dept_name").val()+"&dictId="+$("#dict_id").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks; - }else{ - url = path+"/dept/exportBlood?deptName="+$("#dept_name").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks; - } - window.location.href = url; - }else{ - Common.confirm({ - title: "提示", - message: "没有选中,您确定要按搜索栏条件导出?", - operate: function (reselt) { - if (reselt) { - if (roleId == 0) { - url = path + "/dept/export?deptName=" + $("#dept_name").val() + "&dictId=" + $("#dict_id").val() + "&effective=" + $("#effective").val() + "&creater=" + $("#creater").val() + "&checks=" + checks; - } else { - url = path + "/dept/export?deptName=" + $("#dept_name").val() + "&effective=" + $("#effective").val() + "&creater=" + $("#creater").val() + "&checks=" + checks; - } - window.location.href = url; - } - } - }) - } -} -//搜索 -$('#queryBtn').click(function () { - $("#checks").val(""); - refresh(); -}) -//获取table的高度 -function getHeight() { - return $(window).height() * 0.8; -} -//刷新表格 -function refresh() { - $('#bootstrapTable').bootstrapTable('refresh',{ - url :path+ '/dept/pageList' - }) -} -//清空 -function clearForm(){ - $("#updateaddform")[0].reset(); -} -//监听关闭模态框刷新事件 -$('#myModal1').on('hide.bs.modal', function () { - window.location.reload(); -}); \ No newline at end of file diff --git a/power-admin/src/main/webapp/static/js/roleNotDown.js b/power-admin/src/main/webapp/static/js/roleNotDown.js deleted file mode 100644 index ba3d4c4..0000000 --- a/power-admin/src/main/webapp/static/js/roleNotDown.js +++ /dev/null @@ -1,293 +0,0 @@ -/** - * Created by ly on 2019/4/25. - */ -var pageNumber = 1; -var form = ''; -$(function(){ - $('#myModal').modal('hide'); - //先销毁表格 - $('#bootstrapTable').bootstrapTable({ - //表格高度 - height: getHeight(), - method : 'get', - url : path+ "/role/pageList",//请求路径 - striped : true, //是否显示行间隔色 - pageNumber : 1, //初始化加载第一页 - pagination : true,//是否分页 - sidePagination : 'server',//server:服务器端分页|client:前端分页 - pageSize : 10,//单页记录数 - pageList : [ 5, 10, 20, 30 ],//可选择单页记录数 - cache: false, - paginationPreText : '上一页', - paginationNextText : '下一页', - queryParams : function(params) {//上传服务器的参数 - var temp = {//如果是在服务器端实现分页,limit、offset这两个参数是必须的 - limit : params.limit, // 每页显示数量 - offset : params.offset, // SQL语句起始索引 - page : (params.offset / params.limit) + 1, //当前页码 - roleId:$("#role_id").val(), - roleName:$("#role_name").val(), - effective : $("#effective option:selected").val(), - creater:$("#creater").val(), - }; - return temp; - }, - columns : [{ - checkbox:true - }, - { - title:'序号', - field:'no', - formatter: function (value, row, index) { - //获取每页显示的数量 - var pageSize = $('#bootstrapTable').bootstrapTable('getOptions').pageSize; - //获取当前是第几页 - if(pageNumber == 1){ - pageNumber = $('#bootstrapTable').bootstrapTable('getOptions').pageNumber; - } - //返回序号,注意index是从0开始的,所以要加上1 - return pageSize * (pageNumber - 1) + index + 1; - } - }, - { - title:'角色名', - field:'roleName', - }, - { - title:'备注', - field:'remark', - formatter:function (value,row,index) { - if(value ==null){ - return ""; - }else{ - return value; - } - } - }, - { - title:'是否有效', - field:'effective', - formatter: function (value, row, index) { - if(value ==1){ - return '是' - }else if(value ==0){ - return '否' - } - } - }, - { - title:'创建时间', - field:'createDate', - }, - { - title:'创建人', - field:'creater', - }, - - { - title:'操作', - field:'roleId', formatter: function(value,row,index){ - var editanddrop = ''; - if(row.isUpdate == 1){ - editanddrop += ''; - } - if(row.isDelete == 1){ - editanddrop += ''; - } - return editanddrop; - } - } - ], - onLoadSuccess: function(){ //加载成功时执行 - $(".page-list").show(); - $("th").css({'text-align':'center','vertical-align':'middle'}) - $("td").css({'text-align':'center','vertical-align':'middle'}) - }, - //监听分页点击事件 - onPageChange: function(num, type) { - pageNumber = num; - }, - //选中单个复选框 - onCheck:function(row){ - var checks = $("#checks").val(); - $("#checks").val(checks+=row.roleId + ","); - }, - //取消单个复选框 - onUncheck:function(row){ - var checks = $("#checks").val(); - checks = checks.replace(row.roleId + ",",""); - $("#checks").val(checks); - }, - //全选 - onCheckAll:function(rows){ - $("#checks").val(""); - var checks = ''; - for(var i=0;i编辑'; - } - if(row.isDelete == 1){ - editanddrop += ''; - } - return editanddrop; - } - } - ], - onLoadSuccess: function(){ //加载成功时执行 - $(".page-list").show(); - $("th").css({'text-align':'center','vertical-align':'middle'}) - $("td").css({'text-align':'center','vertical-align':'middle'}) - }, - //监听分页点击事件 - onPageChange: function(num, type) { - pageNumber = num; - }, - //选中单个复选框 - onCheck:function(row){ - var checks = $("#checks").val(); - var userNames = $("#userNames").val(); - $("#checks").val(checks+=row.userId + ","); - $("#userNames").val(userNames+=row.userName + ","); - }, - //取消单个复选框 - onUncheck:function(row){ - var checks = $("#checks").val(); - var userNames = $("#userNames").val(); - checks = checks.replace(row.userId + ",",""); - userNames = userNames.replace(row.userName + ",",""); - $("#checks").val(checks); - $("#userNames").val(userNames); - }, - //全选 - onCheckAll:function(rows){ - $("#checks").val(""); - $("#userNames").val(""); - var checks = ''; - var userNames = ''; - for(var i=0;i'+value+'

' - return value; -} - - -//验证表单 -//验证用户名不重复 -$("#re_userName").blur(function(){ - var userId = $("#userId").val(); - var userName = $("#re_userName").val(); - if(userId == '' && userName != ''){ - $.ajax({ - type:'get', - url:path+'/user/checkUserName?userName='+userName, - dataType:'json', - success:function(data){ - if(data.code == 200){ - toastr.warning(data.msg); - $("#re_userName").val(""); - $("#re_userName").focus(); - } - } - }) - } -}) -//验证密码长度不少于6位 -$("#re_userPwd").blur(function(){ - var password = $("#re_userPwd").val(); - if(password != '' && password.length < 6){ - toastr.warning("密码长度不能少于6位!"); - } -}) -/*//验证手机号 -$("#re_userTel").blur(function(){ - var tel = $("#re_userTel").val(); - if(tel != ''){ - if(!tel.match(/^1[34578]\d{9}$/)){ - toastr.warning("移动电话格式不正确!"); - $("#re_userTel").val(""); - $("#re_userTel").focus(); - } - } -}) -//验证邮箱 -$("#re_userEmail").blur(function(){ - var email = $("#re_userEmail").val(); - if(email != ''){ - if(!email.match(/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/)){ - toastr.warning("邮箱地址格式不正确!"); - $("#re_userEmail").val(""); - $("#re_userEmail").focus(); - } - } -})*/ -//所属科室多选树形 -function showMenu1() { - var cityObj = $('#txtTreeSelect1'); - var cityOffset = cityObj.offset(); - $("#menuContent1").css({ left: cityOffset.left + "px", top: cityOffset.top + cityObj.outerHeight() + "px" }).slideDown("fast"); - $("body").bind("mousedown", onBodyDown1); -} -function onBodyDown1(event) { - if (!(event.target.id == "menuBtn" || event.target.id == "menuContent1" || $(event.target).parents("#menuContent1").length > 0)) { - hideMenu1(); - } -} -function hideMenu1() { - $("#menuContent1").fadeOut("name"); - $("body").unbind("mousedown", onBodyDown1); -} -//加载角色 -function loadRole(){ - $.ajax({ - type: "GET", - url: path+"/role/selectList", - dataType: "json", - success: function(data){ - var html = ''; - $.each(data, function(commentIndex, comment){ - html += ''; - }); - $('#re_roleId').append(html); - $('#roleId').append(html); - } - }); -} -function loadDept(){ - $.ajax({ - type: "GET", - url: path+"/dept/selectList", - dataType: "json", - success: function(data){ - var html = ''; - for(var i = 0;i < data.extend.list.length;i++){ - html += ''; - } - $('#dept_id').append(html); - } - }); -} -//搜索 -$('#queryBtn').click(function () { - $("#checks").val(""); - refresh(); -}) -//编辑框回显 -function edit(id){ - $("#re_userName").prop("readOnly",true); - $("#passwordDiv").hide(); - $("#myModalLabel").text("编辑"); - $.ajax({ - type: "post", - url: path+"/user/selectUser", - data:{ - userId:id - }, - dataType:"json", - success: function(data){ - $("#userId").val(data.userId); - $("#re_userName").val(data.userName); - $("#name").val(data.name); - var deptIds = data.deptId; - var deptArr = deptIds.split(","); - $('#deptId').selectpicker('val', deptArr); - if(data.userSex == 1){ - $("#re_userSex").val("1"); - }else{ - $("#re_userSex").val("0"); - } - $("#re_userAge").val(data.userAge); - $("#re_userTel").val(data.userTel); - $("#re_userEmail").val(data.userEmail); - $("#re_userPosition").val(data.userPosition); - $("#txtTreeSelect1").val(data.powerDepts); - $("#deptIds").val(data.deptId); - $("#re_roleId").find("option[value='"+data.roleId+"']").attr("selected",true); - $("#re_effective").find("option[value='"+data.effective+"']").attr("selected",true); - $("#re_remark").val(data.remark); - /*loadTree(); - var deptIds = data.deptId; - if(deptIds != ''){ - var deptIdSplit =deptIds.split(","); - for (var i = 0;i < deptIdSplit.length;i++){ - if(deptIdSplit[i] != ''){ - //选中节点 - treeSelectNode(deptIdSplit[i]); - } - } - }*/ - } - }); - $('#myModal').modal('show'); -} -//删除 -function drop(id) { - Common.confirm({ - title: "提示", - message: "确定是否删除这条记录", - operate: function (reselt) { - if (reselt) { - $.ajax({ - type: "post", - url: path + "/user/delete", - data: { - userId: id - }, - async: false, - success: function (data) { - if ("success" == data.msg) { - toastr.success("删除成功!"); - $("#checks").val(""); - $("#userNames").val(""); - backToPage(); - } else { - toastr.error(data.msg); - } - }, - error: function () { - window.confirm("删除失败"); - } - }) - } - } - }) -} -//新增框 -function add() { - $("#re_userName").prop("readOnly",false); - clearForm(); - $("#userId").val(""); - $("#deptIds").val(""); - $('.selectpicker').selectpicker('val','1'); - $('#myModal').modal('show'); - $("#passwordDiv").show(); -} -//清空 -function clearForm(){ - $("#updateaddform")[0].reset(); - //loadTree(); - $("#deptIds").val(""); -} -//提交更改 -$('#btn_submit').click(function () { - var reUserTel = $("#re_userTel").val(); - if(reUserTel != ''){ - if(!reUserTel.match(/^1[34578]\d{9}$/)){ - toastr.warning("移动电话格式不正确!"); - $("#re_userTel").val(""); - $("#re_userTel").focus(); - return false; - } - } - var reUserEmail = $("#re_userEmail").val(); - if(reUserEmail != ''){ - if(!reUserEmail.match(/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/)){ - toastr.warning("邮箱地址格式不正确!"); - $("#re_userEmail").val(""); - $("#re_userEmail").focus(); - return false; - } - } - var userName = $("#re_userName").val(); - var userPwd = $("#re_userPwd").val(); - var deptIds = $("#deptIds").val(); - var roleId = $("#re_roleId").val(); - if(userName != ''){ - if(userPwd != '' || $("#userId").val() != ''){ - if(userPwd.length >= 6 || $("#userId").val() != ''){ - if(deptIds != ''){ - if(roleId != ''){ - saveForm(); - }else{ - toastr.warning("所属角色不能为空,如未显示角色请到角色管理添加角色!"); - } - }else{ - toastr.warning("所属科室不能为空!"); - } - }else{ - toastr.warning("密码长度不能少于6位!"); - } - }else{ - toastr.warning("密码不能为空!"); - } - }else{ - toastr.warning("用户名不能为空!"); - } -}) - -function saveForm(){ - var userId = $("#userId").val(); - if(userId != ''){ - $.ajax({ - type: "post", - url:path+ "/user/update", - data:$("#updateaddform").serialize(), - dataType:"json", - success: function(data){ - if("success"==data.msg){ - toastr.success("修改成功!"); - $('#myModal').modal('hide'); - backToPage(); - }else{ - toastr.warning(data.msg); - } - } - }) - }else if(userId == ''){ - $.ajax({ - type: "post", - url:path+ "/user/add", - data:$("#updateaddform").serialize(), - dataType:"json", - success: function(data){ - if("success"==data.msg){ - toastr.success("添加成功!"); - setTimeout(function(){ - window.location.reload(); - },500) - }else{ - toastr.warning(data.msg); - } - } - }) - } -} -//获取table的高度 -function getHeight() { - return $(window).height() - 190; -} -//刷新表格 -function refresh() { - $('#bootstrapTable').bootstrapTable('refresh',{ - url : path+'/user/pageList' - }) -} -//重置密码 -function resetPassword(){ - var checks = $("#checks").val(); - var userNames = $("#userNames").val(); - if(checks != ''){ - var ids = checks.split(","); - var userName = userNames.split(","); - if(ids.length == 2){ - Common.confirm({ - title: "提示", - message: '确定是否重置用户名'+userName[0]+'的密码为000000', - operate: function (reselt) { - if (reselt) { - $.ajax({ - type: 'post', - url: path + '/user/resetPassword', - data: {userId: ids[0]}, - dataType: 'json', - success: function (data) { - if (data.code == 100) { - toastr.success("重置成功!"); - $("#checks").val(""); - $("#userNames").val(""); - backToPage(); - } else { - toastr.error("重置失败,请联系系统管理员!") - } - } - }) - } - } - }) - }else{ - toastr.warning("以防重置密码误选择,只允许一次重置一个!") - } - }else{ - toastr.warning("请至少选中一条记录!") - } -} -//导出excel功能 -function exportExcel(){ - var checks = $("#checks").val(); - if(checks != '') { - checks = checks.substring(0, checks.length - 1); - var url = path+"/user/export1?checks="+checks; - window.location.href = url; - }else{ - Common.confirm({ - title: "提示", - message: "没有选中,您确定要按搜索栏条件导出?", - operate: function (reselt) { - if (reselt) { - var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val(); - window.location.href = url; - } - } - }) - /* if(confirm('没有选中,您确定要按搜索栏条件导出?')) { - var url = path+"/user/export?userName="+$("#user_name").val()+"&userEmail="+$("#user_email").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&checks="+checks; - window.location.href = url; - }*/ - } - -} -/**树操作*/ -/*var setting = { - view: { - showIcon: true,//设置 zTree 是否显示节点的图标。默认值:true - showLine: true//设置 zTree 是否显示节点之间的连线。默认值:true - }, - data: { - simpleData: { - chkStyle: "checkbox", - enable: true, - idKey: "id", - pIdKey: "parentId" - } - }, - check:{ - enable:true - }, - callback: { - onCheck:onCheck - } -}; -function onCheck(e, treeId, treeNode) { - var treeObj=$.fn.zTree.getZTreeObj("treeDemo"), - nodes=treeObj.getCheckedNodes(true); - var deptIds = ''; - var deptNames = ''; - //父节点必须一样 - var parentId = new Array(); - for (var i = 0; i < nodes.length; i++) { - if(nodes[i].level == 0){ - var id = nodes[i].id; - parentId.push(id); - } - if(nodes[i].level == 1){ - var deptId = nodes[i].selfId; - deptIds += deptId + ","; - deptNames += nodes[i].name + ","; - } - } - if(parentId.length > 1) { - toastr.warning("科室必须全部属于同一医院!"); - treeObj.checkNode(treeNode,false,true); - }else{ - if(deptIds != ''){ - deptIds = deptIds.substring(0,deptIds.length-1); - deptNames = deptNames.substring(0,deptNames.length-1); - } - $("#txtTreeSelect1").val(deptNames); - $("#deptIds").val(deptIds); - } -} -var zNodes = []; -function loadTree() { - $.ajax({ - type: "GET", - url: path + "/dept/selectDeptTreeByUserId", - dataType: "json", - async: false, - success: function (data) { - $.fn.zTree.init($("#treeDemo"), setting, data); - zTree = $.fn.zTree.getZTreeObj("treeDemo"); - var nodes = zTree.getNodes(); - for (var i = 0; i < nodes.length; i++) { //设置节点展开 - zTree.expandNode(nodes[i], true, false, true); - } - } - }); -} -//加载树 -$(function(){ - $("#re_userName").val(""); - $("#updateaddform")[0].reset(); - loadTree(); -}) -//选中节点 selfId -function treeSelectNode(selfId){ - var zTree = $.fn.zTree.getZTreeObj("treeDemo"); - var node = zTree.getNodeByParam("selfId",selfId); - if(node != null){ - zTree.checkNode(node, true, true); - } -}*/ - -//监听关闭模态框刷新事件 -$('#myModal1').on('hide.bs.modal', function () { - window.location.reload(); -}); \ No newline at end of file diff --git a/power-api/pom.xml b/power-api/pom.xml deleted file mode 100644 index 5dca49d..0000000 --- a/power-api/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - power - com.manage - 1.0-SNAPSHOT - - 4.0.0 - - power-api - - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - - 1.8 - 1.8 - UTF-8 - true - true - true - - 1.3 - 128m - 512m - - - - - power-api - - diff --git a/power-foundaton/pom.xml b/power-foundaton/pom.xml index af50070..f4d8ead 100644 --- a/power-foundaton/pom.xml +++ b/power-foundaton/pom.xml @@ -46,6 +46,11 @@ bcprov-jdk14 compile + + + org.slf4j + slf4j-log4j12 + - http://www.example.com - - - UTF-8 - 1.7 - 1.7 - - - power_web - - diff --git a/power_web/src/main/webapp/WEB-INF/web.xml b/power_web/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 9f88c1f..0000000 --- a/power_web/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - Archetype Created Web Application - diff --git a/power_web/src/main/webapp/index.jsp b/power_web/src/main/webapp/index.jsp deleted file mode 100644 index c38169b..0000000 --- a/power_web/src/main/webapp/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - -

Hello World!

- -