diff --git a/.gitignore b/.gitignore index 3f7ceb3..7a45b09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/target/ +target /.idea/ -power.iml \ No newline at end of file +*.iml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7b498fb..4830128 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 @@ -101,6 +100,12 @@ mybatis ${mybatis.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + com.alibaba diff --git a/power-admin/pom.xml b/power-admin/pom.xml index 52f2665..64d4525 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..bbf032e 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 @@ -109,16 +95,10 @@ public class DeptController { * */ @RequestMapping("/selectList") @ResponseBody - public Msg selectList(HttpServletRequest request) { - try { - List deptList = powerDeptService.selectDeptByUserId(request); - CacheManager.addExcCount("noExc"); - return Msg.success().add("list",deptList); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg selectList(HttpServletRequest request) throws Exception{ + List deptList = powerDeptService.selectDeptByUserId(request); + CacheManager.addExcCount("noExc"); + return Msg.success().add("list",deptList); } /** * @Date 2019-4-30 @@ -129,10 +109,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; @@ -148,8 +129,8 @@ public class DeptController { @ResponseBody public Msg checkDeptName(String deptName,Integer dictId) { try { - List power_dept = powerDeptService.checkDeptName(deptName,dictId); - if(power_dept != null && !power_dept.isEmpty()){ + List powerDept = powerDeptService.checkDeptName(deptName,dictId); + if(powerDept != null && !powerDept.isEmpty()){ return Msg.fail("科室名已存在"); }else{ CacheManager.addExcCount("noExc"); @@ -177,8 +158,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 +172,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 +190,7 @@ public class DeptController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -223,22 +205,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 +224,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 +243,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,27 +261,12 @@ 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 @@ -334,13 +280,13 @@ public class DeptController { CacheManager.addExcCount("noExc"); return deptList; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; } } - /** * @Date 2019-08-06 * @Author zengwenhe @@ -348,16 +294,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 +310,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 { @@ -382,16 +321,16 @@ public class DeptController { String[] fieldNames = {"deptName","dictId","effective","remark",}; //判断集中类中的方法名 String[] judgeMethods = {"judgeDeptName","judgeDictId","convertEffective","judgeRemark"}; - Power_Dept power_dept = new Power_Dept(); + Power_Dept powerDept = new Power_Dept(); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); - power_dept.setCreater(user.getUserName()); - power_dept.setUpdater(user.getUserName()); - power_dept.setCreateDate(fmt.format(new Date())); - power_dept.setUpdateDate(fmt.format(new Date())); - power_dept.setDeptCode(""); + powerDept.setCreater(user.getUserName()); + powerDept.setUpdater(user.getUserName()); + powerDept.setCreateDate(fmt.format(new Date())); + powerDept.setUpdateDate(fmt.format(new Date())); + powerDept.setDeptCode(""); //实例化 - ImportExcelUtil.newInstance("power_DeptMapper",power_dept, Power_Dept.class); + ImportExcelUtil.newInstance("power_DeptMapper",powerDept, Power_Dept.class); //导入excel的操作 ImportExcelEntity excelEntity = ImportExcelUtil.fileImport(multipartFile,fieldNames,judgeMethods); CacheManager.addExcCount("noExc"); @@ -409,17 +348,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/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index 8d80898..046c51d 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -11,7 +11,9 @@ import com.manage.service.cache.Cache; import com.manage.service.cache.CacheManager; import com.manage.service.ipml.Power_NoticeServiceImpl; import com.manage.service.webSocket.WsPool; +import com.manage.util.ActionScopeUtils; 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 +78,30 @@ 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,22 +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已过期或不存在"); - } - }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(); } /** @@ -293,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 (User_Dept_Menu deptMenu : menuList) { + String menuSysFlag = deptMenu.getSysFlag(); + if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) { + list.add(deptMenu); + if (StringUtils.isNotBlank(deptMenu.getMethod())) { + menus.add(deptMenu.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已失效"); } } @@ -360,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 (User_Dept_Menu dept_menu : menuList) { + String menuSysFlag = dept_menu.getSysFlag(); + if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) { + list.add(dept_menu); } } - CacheManager.addExcCount("noExc"); - return Msg.success().add("list",list); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); } + CacheManager.addExcCount("noExc"); + return Msg.success().add("list",list); } /** @@ -405,72 +377,67 @@ public class FontController { */ @RequestMapping(value = "getToken",method = RequestMethod.GET) @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); - //归档特殊token=1462903487866169011 - if("1462903487866169011".equals(password)){ - password = null; - } - 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); + //归档特殊token=1462903487866169011 + if("1462903487866169011".equals(password)){ + password = null; + } + 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); - //设置科室 - String power_depts = ""; - List power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); - for(int j=0;j powerDeptsList = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); + for(int j=0;j user = userMapper.checkUserName(userName); - if(null == user || user.isEmpty()){ - return Msg.fail("该工号不存在!"); - } - return Msg.success().add("user",user); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(e.getMessage()); + public Msg checkUserName(String userName) throws Exception{ + if(StringUtils.isBlank(userName)){ + return Msg.fail("工号不能为空!"); + } + //查询用户 + List user = userMapper.checkUserName(userName); + if(null == user || user.isEmpty()){ + return Msg.fail("该工号不存在!"); } + return Msg.success().add("user",user); } /** @@ -567,6 +522,7 @@ public class FontController { } } }catch (Exception e){ + ExceptionPrintUtil.printException(e); e.printStackTrace(); } } diff --git a/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java b/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java new file mode 100644 index 0000000..08852f3 --- /dev/null +++ b/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java @@ -0,0 +1,51 @@ +package com.manage.controller; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/5/15 16:14 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/5/15 16:14 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ + +import com.alibaba.fastjson.support.spring.FastJsonJsonView; +import com.manage.util.ExceptionPrintUtil; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.servlet.ModelAndView; + +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(value = Exception.class)//指定拦截的异常 + public ModelAndView errorHandler(Exception e) { + return returnMv(e, "服务器出错了,请联系系统管理员"); + } + + @ExceptionHandler(value = RuntimeException.class)//指定拦截的异常 + public ModelAndView runtimeHandler(Exception e) { + return returnMv(e, "服务器出错了,请联系系统管理员"); + } + + private ModelAndView returnMv(Exception e, String msg) { + ModelAndView mv = new ModelAndView(); + /* 使用FastJson提供的FastJsonJsonView视图返回，不需要捕获异常 */ + FastJsonJsonView view = new FastJsonJsonView(); + Map attributes = new HashMap<>(1); + attributes.put("code", "500"); + attributes.put("msg", msg); + view.setAttributesMap(attributes); + mv.setView(view); + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return mv; + } +} diff --git a/power-admin/src/main/java/com/manage/controller/LogAopAction.java b/power-admin/src/main/java/com/manage/controller/LogAopAction.java index 726d2eb..d7dedfa 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; @@ -62,8 +63,6 @@ public class LogAopAction { method = target.getClass().getMethod(methodName, parameterTypes); } catch (NoSuchMethodException e1) { e1.printStackTrace(); - } catch (SecurityException e1) { - e1.printStackTrace(); } if (null != method) { //插入表操作 @@ -77,13 +76,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 list = null; List menuList = new ArrayList<>(); @@ -92,16 +91,16 @@ public class LoginController { list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),null); } if(null != list && !list.isEmpty()){ - for (int i = 0; i < list.size(); i++) { + for (Power_Menu powerMenu : list) { User_Dept_Menu deptMenu = new User_Dept_Menu(); - String menuUrl = list.get(i).getMenuUrl(); - if(StringUtils.isNotBlank(menuUrl)){ - BeanUtils.copyProperties(list.get(i),deptMenu); - deptMenu.setMethodParent(list.get(i).getParentId()); + String menuUrl = powerMenu.getMenuUrl(); + if (StringUtils.isNotBlank(menuUrl)) { + BeanUtils.copyProperties(powerMenu, deptMenu); + deptMenu.setMethodParent(powerMenu.getParentId()); menuList.add(deptMenu); } - if(StringUtils.isNotBlank(list.get(i).getMethod())){ - menus.add(list.get(i).getMenuUrl()); + if (StringUtils.isNotBlank(powerMenu.getMethod())) { + menus.add(powerMenu.getMenuUrl()); } } } @@ -109,16 +108,16 @@ public class LoginController { user.setMenus(menus); //设置科室 - String power_depts = ""; - List power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId()); - for(int j=0;j powerDeptsList = power_deptService.selectByPrimaryKeys(user.getDeptId()); + for(int j=0;j menus = new TreeSet<>(); - List list = null; - if (user.getRoleId().equals(0) || user.getRoleId().equals(-100)) { - list = powerMenuService.queryAllPowerMenu(null,user.getRoleId()); - } else { - list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),null); - } - if(null != list && !list.isEmpty()){ - for (int i = 0; i < list.size(); i++) { - if(StringUtils.isNotBlank(list.get(i).getMethod())){ - menus.add(list.get(i).getMenuUrl()); - } - } - } - user.setMenus(menus);*/ return "/loginDir/index"; } @@ -151,7 +130,7 @@ public class PageController { int emr_record1 = 0; int emr_apply_copy1 = 0; int emr_files1 = 0; - if(null != sysList && !sysList.isEmpty()){ + if(!sysList.isEmpty()){ //获取权限菜单 List menuList = powerUser.getMenuList(); if(null != menuList && !menuList.isEmpty()) { @@ -181,28 +160,27 @@ 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; } } } @@ -247,37 +225,32 @@ public class PageController { @RequestMapping("getEcharts1") @ResponseBody - public Msg getEcharts1(){ + public Msg getEcharts1() throws Exception{ List list = new ArrayList<>(); - try { - //无异常 - Integer noExc = CacheManager.getExcCount("noExc"); - String valueArr1[] = {noExc.toString()}; - Echarts echarts1 = new Echarts("无异常",null,valueArr1); + /*//无异常 + Integer noExc = CacheManager.getExcCount("noExc"); + String valueArr1[] = {noExc.toString()}; + Echarts echarts1 = new Echarts("无异常",null,valueArr1); - //异常 - Integer exc = CacheManager.getExcCount("exc"); - if(null == exc){ - exc = 0; - } - String valueArr2[] = {exc.toString()}; - Echarts echarts2 = new Echarts("异常",null,valueArr2); - - //锁定 - Integer effectiveCount = pageService.selectEffectiveCount(); - if(null == effectiveCount){ - effectiveCount = 0; - } - String valueArr3[] = {effectiveCount.toString()}; - Echarts echarts3 = new Echarts("锁定",null,valueArr3); + //异常 + Integer exc = CacheManager.getExcCount("exc"); + if(null == exc){ + exc = 0; + } + String valueArr2[] = {exc.toString()}; + Echarts echarts2 = new Echarts("异常",null,valueArr2); - list.add(echarts1); - list.add(echarts2); - list.add(echarts3); - }catch (Exception e){ - e.printStackTrace(); - return Msg.fail(e.getMessage()); + //锁定 + Integer effectiveCount = pageService.selectEffectiveCount(); + if(null == effectiveCount){ + effectiveCount = 0; } + String valueArr3[] = {effectiveCount.toString()}; + Echarts echarts3 = new Echarts("锁定",null,valueArr3); + + list.add(echarts1); + list.add(echarts2); + list.add(echarts3);*/ return Msg.success().add("list",list); } 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..b051c34 100644 --- a/power-admin/src/main/java/com/manage/controller/PermissionsController.java +++ b/power-admin/src/main/java/com/manage/controller/PermissionsController.java @@ -102,57 +102,6 @@ public class PermissionsController { } } } - /*object = pjp.proceed(); - //接受客户端的数据 - Map map = request.getParameterMap(); - // 解决获取参数乱码 - Map newmap = new HashMap(); - for(Map.Entry entry : map.entrySet()){ - String name = entry.getKey(); - String values[] = entry.getValue(); - - if(values==null){ - newmap.put(name, new String[]{}); - continue; - } - String newvalues[] = new String[values.length]; - for(int i=0; i map = request.getParameterMap(); - // 解决获取参数乱码 - Map newmap = new HashMap(); - for(Map.Entry entry : map.entrySet()){ - String name = entry.getKey(); - String values[] = entry.getValue(); - if(values==null){ - newmap.put(name, new String[]{}); - continue; - } - String newvalues[] = new String[values.length]; - for(int i=0; i 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(","); - String str = ""; - for (int i = 0; i < idList.length; i++) { - if(StringUtils.isNoneBlank(idList[i])){ - if(i != idList.length - 1){ - str += idList[i] + ","; - }else{ - str += idList[i]; - } + public Msg deleteLogByIds(@PathVariable("ids")String ids) throws Exception{ + String[] idList = ids.split(","); + StringBuilder str = new StringBuilder(); + for (int i = 0; i < idList.length; i++) { + if(StringUtils.isNoneBlank(idList[i])){ + if(i != idList.length - 1){ + str.append(idList[i]).append(","); + }else{ + str.append(idList[i]); } } - logService.deleteLogByIds(str); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("删除失败，请联系超管!"); } + logService.deleteLogByIds(str.toString()); + CacheManager.addExcCount("noExc"); + return Msg.success(); } /** @@ -216,6 +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..e3ada87 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; /** @@ -30,88 +25,18 @@ public class Power_MenuController { @Autowired private Power_MenuService powerMenuService; - /*@RequestMapping("powerMenuList") - @ResponseBody - public Msg list() { - try { - List list = powerMenuService.queryAllPowerMenu("power"); - CacheManager.addExcCount("noExc"); - return Msg.success().add("list",list); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } - }*/ - @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(); - } - -/* - Power_User user = (Power_User) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER); + public Msg indexMenu() throws Exception{ + Power_UserVo user = (Power_UserVo) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER); List list = null; - List listPower = null; - if (user.getRoleId().equals(0)) { - list = powerMenuService.queryAllPowerMenu(); - return Msg.success().add("listRole", list); - } else if(user.getRoleId().equals(-100)){ - listPower = powerMenuService.queryPoswerMenuByUserId(user.getUserId()); - List indexList = new ArrayList<>(); - if(null != listPower && !listPower.isEmpty()){ - for (int i = 0; i < listPower.size(); i++) { - if(StringUtils.isBlank(listPower.get(i).getMenuName()) || "菜单管理".equals(listPower.get(i).getMenuName())){ - indexList.add(listPower.get(i)); - } - } - } - if(null != indexList && !indexList.isEmpty()){ - for (int i = 0; i < indexList.size(); i++) { - for (int j = 0; j < listPower.size(); j++) { - if(listPower.get(j).getMenuId() == indexList.get(i).getMenuId()){ - listPower.remove(indexList.get(i)); - } - } - } - } - return Msg.success().add("listPower", listPower); + if(user.getRoleId().equals(0) || user.getRoleId().equals(-100)){ + list = powerMenuService.queryAllPowerMenu("power",user.getRoleId()); } else{ - List menuList = powerMenuService.queryMenuViewByUserId(user.getUserId()); - List indexList = new ArrayList<>(); - if(null != menuList && !menuList.isEmpty()){ - for (int i = 0; i < menuList.size(); i++) { - if(StringUtils.isBlank(menuList.get(i).getMenuName())){ - indexList.add(menuList.get(i)); - } - } - } - if(null != indexList && !indexList.isEmpty()){ - for (int i = 0; i < indexList.size(); i++) { - for (int j = 0; j < menuList.size(); j++) { - if(menuList.get(j).getMenuId() == indexList.get(i).getMenuId()){ - menuList.remove(indexList.get(i)); - } - } - } - } - return Msg.success().add("listUser", menuList); + list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),"power"); } -*/ + CacheManager.addExcCount("noExc"); + return Msg.success().add("listPower", list); } } diff --git a/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java b/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java index b8b9790..0cce435 100644 --- a/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java +++ b/power-admin/src/main/java/com/manage/controller/Power_MenuManageController.java @@ -8,6 +8,7 @@ import com.manage.entity.Power_Menu; import com.manage.service.cache.CacheManager; import com.manage.service.PowerService; import com.manage.service.Power_MenuService; +import com.manage.util.ExceptionPrintUtil; import com.manage.util.Msg; import com.manage.vo.Power_Sys_DictVo; import org.apache.commons.lang3.StringUtils; @@ -45,6 +46,7 @@ public class Power_MenuManageController { CacheManager.addExcCount("noExc"); return JSON.toJSONString(dicts); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -68,6 +70,7 @@ public class Power_MenuManageController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -76,42 +79,30 @@ public class Power_MenuManageController { @RequestMapping(value = "checkMenuName") @ResponseBody - public Msg checkMenuName(String sysFlag,String menuName){ - try { - List menus = menuService.checkMenuNameBySysId(sysFlag,menuName); - CacheManager.addExcCount("noExc"); - if(null != menus && !menus.isEmpty()){ - return Msg.fail(); - }else{ - return Msg.success(); - } - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return null; + public Msg checkMenuName(String sysFlag,String menuName) throws Exception{ + List menus = menuService.checkMenuNameBySysId(sysFlag,menuName); + CacheManager.addExcCount("noExc"); + if(null != menus && !menus.isEmpty()){ + return Msg.fail(); + }else{ + return Msg.success(); } } @RequestMapping(value = "checkMethodName") @ResponseBody - public Msg checkMethodName(Integer parentId,String methodName,String method){ - try { - List menus = new ArrayList<>(); - if(StringUtils.isNotBlank(method)){ - menus = menuService.checkMethodByParentId(parentId, null,method); - }else{ - menus = menuService.checkMethodByParentId(parentId, methodName,null); - } - CacheManager.addExcCount("noExc"); - if(null != menus && !menus.isEmpty()){ - return Msg.fail(); - }else{ - return Msg.success(); - } - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return null; + public Msg checkMethodName(Integer parentId,String methodName,String method) throws Exception{ + List menus = new ArrayList<>(); + if(StringUtils.isNotBlank(method)){ + menus = menuService.checkMethodByParentId(parentId, null,method); + }else{ + menus = menuService.checkMethodByParentId(parentId, methodName,null); + } + CacheManager.addExcCount("noExc"); + if(null != menus && !menus.isEmpty()){ + return Msg.fail(); + }else{ + return Msg.success(); } } @@ -119,141 +110,129 @@ public class Power_MenuManageController { @RequiresPermissions(value="/menu/update") @RequestMapping(value="update",method = RequestMethod.POST) @ResponseBody - public Msg addMenu(Power_Menu menu,String sysName){ + public Msg addMenu(Power_Menu menu,String sysName) throws Exception{ if(StringUtils.isNotBlank(menu.getMenuUrl())){ if(!menu.getMenuUrl().contains("/") && !"#".equals(menu.getMenuUrl())){ return Msg.fail("菜单地址必须包含斜杠/,建目录必须为单个字符#"); } } - try { - List menus = new ArrayList<>(); - if(StringUtils.isNotBlank(menu.getSysFlag())){ - menus = menuService.checkMenuNameBySysId(menu.getSysFlag(), menu.getMenuName()); - } - if(menu.getMenuId() == null){ - if(StringUtils.isNoneBlank(menu.getMethod())) { - Integer parentId = menu.getParentId(); - Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); - String menuUrl = parentMenu.getMenuUrl(); - if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { - String methodUrl = ""; - // /user /user/pageUI user/pageUI ../user/pageUI - String str1 = ""; - String str = menuUrl.substring(0, 1); - if(menuUrl.length() >= 3){ - str1 = menuUrl.substring(0, 3); - } - if("/".equals(str)){ - menuUrl = menuUrl.substring(1,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "/" + menu.getMethod(); - } - }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ - menuUrl = menuUrl.substring(3,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "../" + menu.getMethod(); - } + List menus = new ArrayList<>(); + if(StringUtils.isNotBlank(menu.getSysFlag())){ + menus = menuService.checkMenuNameBySysId(menu.getSysFlag(), menu.getMenuName()); + } + if(menu.getMenuId() == null){ + if(StringUtils.isNoneBlank(menu.getMethod())) { + Integer parentId = menu.getParentId(); + Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); + String menuUrl = parentMenu.getMenuUrl(); + if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { + String methodUrl = ""; + // /user /user/pageUI user/pageUI ../user/pageUI + String str1 = ""; + String str = menuUrl.substring(0, 1); + if(menuUrl.length() >= 3){ + str1 = menuUrl.substring(0, 3); + } + if("/".equals(str)){ + menuUrl = menuUrl.substring(1,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ + String[] menuss = menuUrl.split("/"); + methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); }else{ + methodUrl = "/" + menu.getMethod(); + } + }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ + menuUrl = menuUrl.substring(3,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ String[] menuss = menuUrl.split("/"); - methodUrl = menuss[0] + "/" + menu.getMethod(); + methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); + }else{ + methodUrl = "../" + menu.getMethod(); } - menu.setMenuUrl(methodUrl); }else{ - return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); - } - List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); - List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); - if(null != checkMethodNames && !checkMethodNames.isEmpty()){ - return Msg.fail("功能名称不能重复!"); - } - if(null != checkMethods && !checkMethods.isEmpty()){ - return Msg.fail("功能方法已存在!"); + String[] menuss = menuUrl.split("/"); + methodUrl = menuss[0] + "/" + menu.getMethod(); } + menu.setMenuUrl(methodUrl); }else{ - if(null != menus && !menus.isEmpty()){ - return Msg.fail("菜单名不能重复!"); - } + return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); + } + List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); + List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); + if(null != checkMethodNames && !checkMethodNames.isEmpty()){ + return Msg.fail("功能名称不能重复!"); + } + if(null != checkMethods && !checkMethods.isEmpty()){ + return Msg.fail("功能方法已存在!"); } - menuService.addMenu(menu,sysName); }else{ - if(StringUtils.isNoneBlank(menu.getMethod())) { - Integer parentId = menu.getParentId(); - Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); - String menuUrl = parentMenu.getMenuUrl(); - if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { - String methodUrl = ""; - // /user /user/pageUI user/pageUI ../user/pageUI - String str1 = ""; - String str = menuUrl.substring(0, 1); - if(menuUrl.length() >= 3){ - str1 = menuUrl.substring(0, 3); - } - if("/".equals(str)){ - menuUrl = menuUrl.substring(1,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "/" + menu.getMethod(); - } - }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ - menuUrl = menuUrl.substring(3,menuUrl.length()); - if(StringUtils.isNotBlank(menuUrl)){ - String[] menuss = menuUrl.split("/"); - methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); - }else{ - methodUrl = "../" + menu.getMethod(); - } + if(null != menus && !menus.isEmpty()){ + return Msg.fail("菜单名不能重复!"); + } + } + menuService.addMenu(menu,sysName); + }else{ + if(StringUtils.isNoneBlank(menu.getMethod())) { + Integer parentId = menu.getParentId(); + Power_Menu parentMenu = powerMenuMapper.selectByPrimaryKey(parentId); + String menuUrl = parentMenu.getMenuUrl(); + if (StringUtils.isNoneBlank(menuUrl) && menuUrl.contains("/")) { + String methodUrl = ""; + // /user /user/pageUI user/pageUI ../user/pageUI + String str1 = ""; + String str = menuUrl.substring(0, 1); + if(menuUrl.length() >= 3){ + str1 = menuUrl.substring(0, 3); + } + if("/".equals(str)){ + menuUrl = menuUrl.substring(1,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ + String[] menuss = menuUrl.split("/"); + methodUrl = "/" + menuss[0] + "/" + menu.getMethod(); }else{ + methodUrl = "/" + menu.getMethod(); + } + }else if(StringUtils.isNotBlank(str1) && "../".equals(str1)){ + menuUrl = menuUrl.substring(3,menuUrl.length()); + if(StringUtils.isNotBlank(menuUrl)){ String[] menuss = menuUrl.split("/"); - methodUrl = menuss[0] + "/" + menu.getMethod(); + methodUrl = "../" + menuss[0] + "/" + menu.getMethod(); + }else{ + methodUrl = "../" + menu.getMethod(); } - menu.setMenuUrl(methodUrl); }else{ - return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); - } - List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); - List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); - if(null != checkMethodNames && !checkMethodNames.isEmpty() && !checkMethodNames.get(0).getMenuId().equals(menu.getMenuId())){ - return Msg.fail("方法名不能重复!"); - } - if(null != checkMethods && !checkMethods.isEmpty() && !checkMethods.get(0).getMenuId().equals(menu.getMenuId())){ - return Msg.fail("功能方法已存在!"); + String[] menuss = menuUrl.split("/"); + methodUrl = menuss[0] + "/" + menu.getMethod(); } + menu.setMenuUrl(methodUrl); }else{ - if(null != menus && !menus.isEmpty() && !menus.get(0).getMenuId().equals(menu.getMenuId())){ - return Msg.fail("菜单名不能重复!"); - } + return Msg.fail("父级菜单url地址格式不正确,正确示例：/user或/user/pageUI!"); + } + List checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null); + List checkMethods = menuService.checkMethodByParentId(menu.getParentId(),null,menu.getMethod()); + if(null != checkMethodNames && !checkMethodNames.isEmpty() && !checkMethodNames.get(0).getMenuId().equals(menu.getMenuId())){ + return Msg.fail("方法名不能重复!"); + } + if(null != checkMethods && !checkMethods.isEmpty() && !checkMethods.get(0).getMenuId().equals(menu.getMenuId())){ + return Msg.fail("功能方法已存在!"); + } + }else{ + if(null != menus && !menus.isEmpty() && !menus.get(0).getMenuId().equals(menu.getMenuId())){ + return Msg.fail("菜单名不能重复!"); } - menuService.updateMenu(menu,sysName); } - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("保存失败,请联系系统管理员!"); + menuService.updateMenu(menu,sysName); } + CacheManager.addExcCount("noExc"); + return Msg.success(); } @RequiresPermissions(value="/menu/delete") @RequestMapping("delete/{menuId}") @ResponseBody - public Msg delMenu(@PathVariable("menuId")Integer menuId){ - try { - menuService.deleteMenuByMenuId(menuId); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg delMenu(@PathVariable("menuId")Integer menuId) throws Exception{ + menuService.deleteMenuByMenuId(menuId); + CacheManager.addExcCount("noExc"); + return Msg.success(); } } diff --git a/power-admin/src/main/java/com/manage/controller/Power_NoticeController.java b/power-admin/src/main/java/com/manage/controller/Power_NoticeController.java index fcd2375..d33a190 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.*; @@ -32,7 +33,7 @@ public class Power_NoticeController { @RequestMapping(value = "pageUI") public String notice(HttpServletRequest request, Model model){ noticeService.loadSys(request,model); - model.addAttribute("user",(Power_User)request.getSession().getAttribute("CURRENT_USER")); + model.addAttribute("user",request.getSession().getAttribute("CURRENT_USER")); CacheManager.addExcCount("noExc"); return "/noticeDir/noticePage"; } @@ -45,11 +46,6 @@ public class Power_NoticeController { Listpower_notices = new ArrayList(); List getTatal = new ArrayList(); try { - /*if(user.getRoleId() == 0){ - power_notices = this.noticeMapper.selectSysByAdmin(null,null,notice); - }else{ - power_notices = this.noticeMapper.selectSysByAdmin(user.getRoleId(),user.getUserId(),notice); - }*/ if(user.getRoleId() == 0){ getTatal = this.noticeMapper.getTotal(null,null,notice); power_notices = this.noticeMapper.selectALlByPower(null,null,notice); @@ -63,34 +59,13 @@ public class Power_NoticeController { 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 +74,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 +83,78 @@ 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 +165,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 +174,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 +194,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(); + 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..e12c6d0 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,8 +7,8 @@ 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; import com.manage.vo.Power_Sys_DictVo; import org.apache.commons.lang3.StringUtils; @@ -62,10 +62,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 +77,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 +92,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 +104,155 @@ 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"; - } - if(!deptIds.contains(",")){ - List deptBySysFlagList = sysDictMapper.selectDeptIdByParentIdAndSysFlag(powerSysDict.getParentId(), powerSysDict.getSysFlag(),deptIds); - if(null != deptBySysFlagList && !deptBySysFlagList.isEmpty()){ - return Msg.fail("系统标识已存在!"); - } + 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("系统标识已存在!"); } - /*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 +280,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 +294,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 +313,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 +322,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..17ecc0b 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,19 +210,13 @@ public class RoleAndUserPowerController { @RequiresPermissions(value="/menuPower/addRoleMenu") @RequestMapping("/addRoleMenu") @ResponseBody - public Msg addRoleMenu(Integer roleId,String sysFlag,String menus){ - try { - //医院管理员不需要保存 - if(roleId != -100){ - powerService.addRoleMenu(roleId,sysFlag,menus); - } - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("保存失败,请联系系统管理员!"); + public Msg addRoleMenu(Integer roleId,String sysFlag,String menus) throws Exception{ + //医院管理员不需要保存 + if(roleId != -100){ + powerService.addRoleMenu(roleId,sysFlag,menus); } + CacheManager.addExcCount("noExc"); + return Msg.success(); } /**************************************用户菜单权限操作************************************************/ /** @@ -263,6 +262,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -291,6 +291,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -319,6 +320,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -341,20 +343,14 @@ public class RoleAndUserPowerController { @RequiresPermissions(value="/menuPower/addUserMenu") @RequestMapping("addUserMenu") @ResponseBody - public Msg addUserMenu(Integer userId, String sysFlag, String menus){ - try { - Power_UserVo user = userService.selectByPrimaryKey(userId); - //医院管理员不需要保存 - if(user.getRoleId() != -100){ - powerService.addUserMenu(userId,sysFlag,menus); - } - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch(Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail("保存失败,请联系系统管理员!"); + public Msg addUserMenu(Integer userId, String sysFlag, String menus) throws Exception{ + Power_UserVo user = userService.selectByPrimaryKey(userId); + //医院管理员不需要保存 + if(user.getRoleId() != -100){ + powerService.addUserMenu(userId,sysFlag,menus); } + CacheManager.addExcCount("noExc"); + return Msg.success(); } /******************************************归属管理操作*********************************************************/ /** @@ -379,6 +375,7 @@ public class RoleAndUserPowerController { CacheManager.addExcCount("noExc"); return json; }catch(Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; diff --git a/power-admin/src/main/java/com/manage/controller/RoleController.java b/power-admin/src/main/java/com/manage/controller/RoleController.java index 98a9c54..feebcab 100644 --- a/power-admin/src/main/java/com/manage/controller/RoleController.java +++ b/power-admin/src/main/java/com/manage/controller/RoleController.java @@ -3,10 +3,10 @@ package com.manage.controller; import com.manage.annotation.OptionalLog; import com.manage.annotation.RequiresPermissions; import com.manage.entity.Power_Role; -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; @@ -28,7 +28,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; @@ -66,6 +65,7 @@ public class RoleController { pageHelper.setRows(list); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -77,18 +77,6 @@ public class RoleController { * @Description 返回页面 * */ @OptionalLog(module = "查看",methods = "角色管理页面") - @RequiresPermissions(value="/role/pageUI") - @RequestMapping("/pageUI") - public String pageUI(){ - 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(){ @@ -103,23 +91,16 @@ 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(); } } - /** * @Date 2019-4-25 * @Author ly @@ -129,20 +110,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 +130,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 +149,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 +167,7 @@ public class RoleController { CacheManager.addExcCount("noExc"); return powerRole; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; @@ -222,6 +186,7 @@ public class RoleController { powerRoleService.export(powerRole,response,request); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -239,6 +204,7 @@ public class RoleController { powerRoleService.exportNotDown(powerRole,response,request); CacheManager.addExcCount("noExc"); }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); } @@ -252,78 +218,17 @@ 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; } } - /** - * @Date 2019-10-11 - * @Author zengwh - * @Description 导入excel - * */ - @OptionalLog(module = "导入excel",methods = "角色管理") - @RequiresPermissions(value="/role/importExcel") - @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 { - //读取文件 - MultipartResolver resolver = new CommonsMultipartResolver(request.getSession().getServletContext()); - MultipartHttpServletRequest multipartRequest = resolver.resolveMultipart(request); - MultipartFile multipartFile = multipartRequest.getFile("upfile"); - //属性名 - String[] fieldNames = {"roleName","remark","showRecord","downloadRecord","effective"}; - //判断集中类中的方法名 - String[] judgeMethods = {"judgeRoleName","judgeRemark","judgeShowRecord","judgeDownloadRecord","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(); - } - } - } - } - /** * @Date 2019-10-11 * @Author zengwh @@ -334,7 +239,6 @@ public class RoleController { @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 { @@ -372,17 +276,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(); - } - } } } } 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..120027d 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(@PathVariable("id")Integer id) 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..33af36c 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,14 @@ public class UserController { @RequiresPermissions(value="/user/resetPassword") @RequestMapping("/resetPassword") @ResponseBody - public Msg update(Integer userId){ - try { - ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request =attr.getRequest(); - Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId); - powerUser.setUserPwd(Base64.encode(MD5.KL("000000"))); - powerUserService.updateByPrimaryKeySelective(powerUser,request); - CacheManager.addExcCount("noExc"); - return Msg.success(); - }catch (Exception e){ - CacheManager.addExcCount("exc"); - e.printStackTrace(); - return Msg.fail(); - } + public Msg update(Integer userId) throws Exception{ + ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request =attr.getRequest(); + Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId); + powerUser.setUserPwd(Base64.encode(MD5.KL("000000"))); + powerUserService.updateByPrimaryKeySelective(powerUser,request); + CacheManager.addExcCount("noExc"); + return Msg.success(); } @RequestMapping("/selectUser") @ResponseBody @@ -233,11 +178,13 @@ public class UserController { CacheManager.addExcCount("noExc"); return powerUser; }catch (Exception e){ + ExceptionPrintUtil.printException(e); CacheManager.addExcCount("exc"); e.printStackTrace(); return null; } } + @RequestMapping(value = "/toUpdatePassword") public String toUpdatePassword(HttpServletRequest request, Model model){ try { @@ -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 d9c7f41..0d1de87 100644 --- a/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java +++ b/power-admin/src/main/java/com/manage/interceptor/LoginInterceptor.java @@ -2,13 +2,15 @@ package com.manage.interceptor; import com.manage.encrypt.Base64; import com.manage.encrypt.MD5; -import com.manage.entity.Power_User; import com.manage.service.cache.Cache; import com.manage.service.cache.CacheManager; import com.manage.service.Power_UserService; import com.manage.util.Constant; +import com.manage.util.DateUtils; +import com.manage.vo.Power_UserVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; import org.springframework.web.servlet.HandlerInterceptor; @@ -18,10 +20,12 @@ 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 Power_UserService powerUserService; - + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception { String ctx = request.getServletContext().getContextPath(); String url = request.getRequestURI(); @@ -37,7 +41,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{ @@ -46,6 +50,12 @@ public class LoginInterceptor implements HandlerInterceptor { token = MD5.JM(Base64.decode(token)); Cache cache = CacheManager.getCacheInfo(token); if (cache != null) { + if(!"/getSessionRemainingTime".equals(parentUrl)) { + //更新过期时间 + Power_UserVo user = (Power_UserVo) cache.getValue(); + String date = String.valueOf(DateUtils.getDate()); + CacheManager.putCache(token, new Cache(date, user, TOKEN_EXPIRE_TIME)); + } return true; } } @@ -55,16 +65,16 @@ public class LoginInterceptor implements HandlerInterceptor { } @Override - public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception { + public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView){ } @Override - public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception { + public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e){ } - 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 { @@ -73,23 +83,20 @@ public class LoginInterceptor implements HandlerInterceptor { e.printStackTrace(); } String value = props.getProperty(key); - if(value != null && !"/".equals(value) && value.indexOf(",") != -1){ + if(value != null && !"/".equals(value) && value.contains(",")){ String[] values = value.split(","); PathMatcher matcher = new AntPathMatcher(); for(String v : values){ - if(matcher.match(v,url)) + if(matcher.match(v,url)) { return true; + } + } + }else { + assert value != null; + if(value.equals(url)){ + return true; } - }else if(value.equals(url)){ - return true; } return false; } - - private boolean isHasAuthority(String url,Power_User power_user){ - if(!powerUserService.validUserRoleMenu(url,power_user.getUserId())){ - return false; - } - return true; - } } diff --git a/power-admin/src/main/java/com/manage/interfaces/cache/Cache.java b/power-admin/src/main/java/com/manage/interfaces/cache/Cache.java deleted file mode 100644 index 0ebc1a0..0000000 --- a/power-admin/src/main/java/com/manage/interfaces/cache/Cache.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.manage.interfaces.cache; - -/** - * @Description 缓存DTO - * @Date 2019/7/2 11:41 - * @Created by ljx - */ -public class Cache { - private String key;//缓存ID - private Object value;//缓存数据 - private long timeOut;//更新时间 - private boolean expired; //是否终止 - public Cache() { - super(); - } - - public Cache(String key, Object value, long timeOut, boolean expired) { - this.key = key; - this.value = value; - this.timeOut = timeOut; - this.expired = expired; - } - - public Cache(String key, Object value, long timeOut) { - this.key = key; - this.value = value; - this.timeOut = timeOut; - } - public Cache(String key, Object value) { - this.key = key; - this.value = value; - } - - public String getKey() { - return key; - } - - public long getTimeOut() { - return timeOut; - } - - public Object getValue() { - return value; - } - - public void setKey(String string) { - key = string; - } - - public void setTimeOut(long l) { - timeOut = l; - } - - public void setValue(Object object) { - value = object; - } - - public boolean isExpired() { - return expired; - } - - public void setExpired(boolean b) { - expired = b; - } -} diff --git a/power-admin/src/main/java/com/manage/interfaces/cache/CacheManager.java b/power-admin/src/main/java/com/manage/interfaces/cache/CacheManager.java deleted file mode 100644 index db23b16..0000000 --- a/power-admin/src/main/java/com/manage/interfaces/cache/CacheManager.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.manage.interfaces.cache; - -import com.manage.vo.Power_UserVo; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -public class CacheManager { - private static HashMap cacheMap = new HashMap(); - - private CacheManager() { - super(); - } - public static boolean getSimpleFlag(String key){ - try{ - return (Boolean) cacheMap.get(key); - }catch(NullPointerException e){ - return false; - } - } - public static long getServerStartdt(String key){ - try { - return (Long)cacheMap.get(key); - } catch (Exception ex) { - return 0; - } - } - public synchronized static boolean setSimpleFlag(String key,boolean flag){ - if (flag && getSimpleFlag(key)) { - return false; - }else{ - cacheMap.put(key, flag); - return true; - } - } - public synchronized static boolean setSimpleFlag(String key,long serverbegrundt){ - if (cacheMap.get(key) == null) { - cacheMap.put(key,serverbegrundt); - return true; - }else{ - return false; - } - } - - - private synchronized static Cache getCache(String key) { - return (Cache) cacheMap.get(key); - } - - private synchronized static boolean hasCache(String key) { - return cacheMap.containsKey(key); - } - - public synchronized static void clearAll() { - cacheMap.clear(); - } - - public synchronized static void clearAll(String type) { - Iterator i = cacheMap.entrySet().iterator(); - String key; - ArrayList arr = new ArrayList(); - try { - while (i.hasNext()) { - java.util.Map.Entry entry = (java.util.Map.Entry) i.next(); - key = (String) entry.getKey(); - if (key.startsWith(type)) { - arr.add(key); - } - } - for (int k = 0; k < arr.size(); k++) { - clearOnly(arr.get(k)); - } - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - public synchronized static void clearOnly(String key) { - cacheMap.remove(key); - } - - public synchronized static void putCache(String key, Cache obj) { - cacheMap.put(key, obj); - } - - public static Cache getCacheInfo(String key) { - - if (hasCache(key)) { - Cache cache = getCache(key); - if (cacheExpired(cache)) { - cache.setExpired(true); - } - return cache; - }else - return null; - } - - public static void putCacheInfo(String key, Cache obj, long dt,boolean expired) { - Cache cache = new Cache(); - cache.setKey(key); - cache.setTimeOut(dt + System.currentTimeMillis()); - cache.setValue(obj); - cache.setExpired(expired); - cacheMap.put(key, cache); - } - public static void putCacheInfo(String key,Cache obj,long dt){ - Cache cache = new Cache(); - cache.setKey(key); - cache.setTimeOut(dt+System.currentTimeMillis()); - cache.setValue(obj); - cache.setExpired(false); - cacheMap.put(key,cache); - } - - public static boolean cacheExpired(Cache cache) { - if (null == cache) { - return false; - } - long nowDt = System.currentTimeMillis(); - long cacheDt = cache.getTimeOut(); - if (cacheDt <= 0||cacheDt>nowDt) { - return false; - } else { - return true; - } - } - - public static int getCacheSize() { - return cacheMap.size(); - } - - public static int getCacheSize(String type) { - int k = 0; - Iterator i = cacheMap.entrySet().iterator(); - String key; - try { - while (i.hasNext()) { - java.util.Map.Entry entry = (java.util.Map.Entry) i.next(); - key = (String) entry.getKey(); - if (key.indexOf(type) != -1) { - k++; - } - } - } catch (Exception ex) { - ex.printStackTrace(); - } - - return k; - } - - public static ArrayList getCacheAllkey() { - ArrayList a = new ArrayList(); - try { - Iterator i = cacheMap.entrySet().iterator(); - while (i.hasNext()) { - java.util.Map.Entry entry = (java.util.Map.Entry) i.next(); - a.add((String) entry.getKey()); - } - } catch (Exception ex) {} finally { - return a; - } - } - - public static ArrayList getCacheListkey(String type) { - ArrayList a = new ArrayList(); - String key; - try { - Iterator i = cacheMap.entrySet().iterator(); - while (i.hasNext()) { - java.util.Map.Entry entry = (java.util.Map.Entry) i.next(); - key = (String) entry.getKey(); - if (key.indexOf(type) != -1) { - a.add(key); - } - } - } catch (Exception ex) {} finally { - return a; - } - } - - public synchronized static void removeCacheByObject(Power_UserVo obj) { - ArrayList a = new ArrayList(); - Object key; - ArrayList arr = new ArrayList(); - try { - Iterator i = cacheMap.entrySet().iterator(); - while (i.hasNext()) { - Map.Entry entry = (Map.Entry) i.next(); - Cache cache = CacheManager.getCacheInfo((String)entry.getKey()); - Power_UserVo o = (Power_UserVo)cache.getValue(); - if (obj.getUserName().equals(o.getUserName())) { - arr.add((String)entry.getKey()); - } - } - if(null != arr && !arr.isEmpty()){ - for (int k = 0; k < arr.size(); k++) { - clearOnly(arr.get(k)); - } - } - } catch (Exception ex) {} - } - -} \ No newline at end of file diff --git a/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java b/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java index c2de6fa..5703725 100644 --- a/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java +++ b/power-admin/src/main/java/com/manage/interfaces/webservice/PowerWebService.java @@ -10,7 +10,4 @@ public interface PowerWebService { @WebMethod() String getInfosByUserId(@WebParam(name = "token") String token,String sysId); - - @WebMethod - String tempTest(); } 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/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java index 5d2b4f3..e35c81f 100644 --- a/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java +++ b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java @@ -4,13 +4,10 @@ import com.alibaba.fastjson.JSON; import com.manage.dao.Power_MenuMapper; import com.manage.encrypt.Base64; import com.manage.encrypt.MD5; -import com.manage.entity.Power_Menu; -import com.manage.entity.Power_User; import com.manage.service.cache.Cache; import com.manage.service.cache.CacheManager; import com.manage.interfaces.webservice.PowerWebService; import com.manage.service.User_Dept_MenuService; -import com.manage.util.Constant; import com.manage.vo.Power_UserVo; import com.manage.vo.Power_UserWebServiceVo; import com.manage.vo.User_Dept_Menu; @@ -37,10 +34,6 @@ public class PowerWebServiceImpl implements PowerWebService { public String getInfosByUserId(String token,String sysFlag) { Power_UserWebServiceVo userWebServiceVo = new Power_UserWebServiceVo(); if(StringUtils.isNotBlank(token)){ - //归档系统的特殊登录token=1462903487866169011 - if("1462903487866169011".equals(token)){ - - } token = MD5.JM(Base64.decode(token)); Cache cache = CacheManager.getCacheInfo(token); if(cache != null){ @@ -70,36 +63,4 @@ public class PowerWebServiceImpl implements PowerWebService { } return JSON.toJSONString(userWebServiceVo); } - - @Override - public String tempTest() { - return "aaaa~~~~~~~~~~~~~~~~~~~~~~~"; - } - - private List getPowerMenuMethods(Power_User powerUser, String sysId){ - // 根据用户ID以及系统Id查出所有的用户菜单 - List powerUserMenus = powerMenuMapper.selectUserMenuByUserIdAndDictId(powerUser.getUserId(), Integer.parseInt(sysId)); - // 根据用户ID以及系统Id查出所有的角色菜单 - List powerRoleMenus = powerMenuMapper.selectRoleMenuByUserIdAndDictId(powerUser.getUserId(), Integer.parseInt(sysId)); - // 当前用户的所有菜单集合 - List tempPowerMenus = new ArrayList<>(powerRoleMenus); - for (Power_Menu powerMenu:powerUserMenus) { - if(powerMenu.getFlag().equals(Constant.EFFECTIVE_YES)){ - tempPowerMenus.add(powerMenu); - }else if(powerMenu.getFlag().equals(Constant.EFFECTIVE_NO)){ - tempPowerMenus.remove(powerMenu); - } - } - - List powerMenus = new ArrayList<>(tempPowerMenus); - for (Power_Menu powerMenu:tempPowerMenus) { - for (int i = 0;i"); - String substring = buffer.substring(0, i); - String substring1 = substring.substring(substring.length() - 4, substring.length()); - Float f = Float.valueOf(substring1); - Math.round(f); - System.out.println(substring1); - return buffer.toString(); - } - - public String getBody(String val) { - String start = ""; - String end = ""; - int s = val.indexOf(start) + start.length(); - int e = val.indexOf(end); - return val.substring(s, e); - } -} 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..101458a 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 @@ -78,6 +78,7 @@ height: 32px; text-align: right; padding-top: 5px; + padding-right: 22px; } /**表格div*/ @@ -98,7 +99,7 @@
- +
@@ -106,7 +107,7 @@
- +
@@ -114,7 +115,7 @@
- +
@@ -122,10 +123,10 @@
- +
- +
diff --git a/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp b/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp deleted file mode 100644 index b652e12..0000000 --- a/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp +++ /dev/null @@ -1,219 +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..1a27d89 100644 --- a/power-admin/src/main/webapp/WEB-INF/web.xml +++ b/power-admin/src/main/webapp/WEB-INF/web.xml @@ -46,14 +46,14 @@ org.springframework.web.context.ContextLoaderListener - + + + webAppRootKey + power.root + + + org.springframework.web.util.WebAppRootListener + dispatcherServlet diff --git a/power-admin/src/main/webapp/doc/视图power_user_dict.sql b/power-admin/src/main/webapp/doc/视图power_user_dict.sql new file mode 100644 index 0000000..ce08b8f --- /dev/null +++ b/power-admin/src/main/webapp/doc/视图power_user_dict.sql @@ -0,0 +1,14 @@ +CREATE VIEW power_user_dict AS +SELECT +`power_user`.`user_id` AS `user_id`, +`power_dept`.`dict_id` AS `dict_id` +FROM + (( + `power_user` + JOIN `mysql`.`help_topic` `b` ON (( + `b`.`help_topic_id` < (( length( `power_user`.`dept_id` ) - length( REPLACE ( `power_user`.`dept_id`, _latin1 ',', _latin1 '' ))) + 1 )))) + LEFT JOIN `power_dept` ON (( + `power_dept`.`dept_id` = `power_user`.`dept_id` + ))) +GROUP BY + `power_user`.`user_id` \ No newline at end of file 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/role.js b/power-admin/src/main/webapp/static/js/role.js deleted file mode 100644 index ed0d42f..0000000 --- a/power-admin/src/main/webapp/static/js/role.js +++ /dev/null @@ -1,357 +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:'showRecord', - formatter: function (value, row, index) { - if(value ==1){ - return '是' - }else if(value ==0){ - return '否' - } - } - }, - { - title:'是否可下载', - field:'downloadRecord', - formatter: function (value, row, index) { - if(value ==1){ - return '是' - }else if(value ==0){ - return '否' - } - } - }, - { - 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?userName="+$("#user_name").val()+"&userEmail="+$("#user_email").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&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()+"&userEmail="+$("#user_email").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&checks="+checks; - 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-admin/src/main/webapp/static/template/用户列表导入模板(脐血库).xls b/power-admin/src/main/webapp/static/template/用户列表导入模板(脐血库).xls deleted file mode 100644 index f4d6ace..0000000 Binary files a/power-admin/src/main/webapp/static/template/用户列表导入模板(脐血库).xls and /dev/null differ diff --git a/power-admin/src/main/webapp/static/template/角色列表导入模板.xls b/power-admin/src/main/webapp/static/template/角色列表导入模板.xls deleted file mode 100644 index e9afb1c..0000000 Binary files a/power-admin/src/main/webapp/static/template/角色列表导入模板.xls and /dev/null differ diff --git a/power-admin/src/main/webapp/static/template/部门列表导入模板.xls b/power-admin/src/main/webapp/static/template/部门列表导入模板.xls deleted file mode 100644 index 8ae96b7..0000000 Binary files a/power-admin/src/main/webapp/static/template/部门列表导入模板.xls and /dev/null differ diff --git a/power-admin/target/classes/com/manage/controller/DeptController.class b/power-admin/target/classes/com/manage/controller/DeptController.class index eaffff7..5c9ec7b 100644 Binary files a/power-admin/target/classes/com/manage/controller/DeptController.class and b/power-admin/target/classes/com/manage/controller/DeptController.class differ diff --git a/power-admin/target/classes/com/manage/controller/FontController.class b/power-admin/target/classes/com/manage/controller/FontController.class index e0cb1f8..256e79a 100644 Binary files a/power-admin/target/classes/com/manage/controller/FontController.class and b/power-admin/target/classes/com/manage/controller/FontController.class differ diff --git a/power-admin/target/classes/com/manage/controller/LogAopAction.class b/power-admin/target/classes/com/manage/controller/LogAopAction.class index 0fc5ef5..23de19e 100644 Binary files a/power-admin/target/classes/com/manage/controller/LogAopAction.class and b/power-admin/target/classes/com/manage/controller/LogAopAction.class differ diff --git a/power-admin/target/classes/com/manage/controller/LoginController.class b/power-admin/target/classes/com/manage/controller/LoginController.class index d52bb02..56be45d 100644 Binary files a/power-admin/target/classes/com/manage/controller/LoginController.class and b/power-admin/target/classes/com/manage/controller/LoginController.class differ diff --git a/power-admin/target/classes/com/manage/controller/PageController.class b/power-admin/target/classes/com/manage/controller/PageController.class index 09c60b6..d5efdf2 100644 Binary files a/power-admin/target/classes/com/manage/controller/PageController.class and b/power-admin/target/classes/com/manage/controller/PageController.class differ diff --git a/power-admin/target/classes/com/manage/controller/PermissionsController.class b/power-admin/target/classes/com/manage/controller/PermissionsController.class index 57af7be..98f5220 100644 Binary files a/power-admin/target/classes/com/manage/controller/PermissionsController.class and b/power-admin/target/classes/com/manage/controller/PermissionsController.class differ diff --git a/power-admin/target/classes/com/manage/controller/Power_LogController.class b/power-admin/target/classes/com/manage/controller/Power_LogController.class index 7f191e6..3a8ecfa 100644 Binary files a/power-admin/target/classes/com/manage/controller/Power_LogController.class and b/power-admin/target/classes/com/manage/controller/Power_LogController.class differ diff --git a/power-admin/target/classes/com/manage/controller/Power_MenuController.class b/power-admin/target/classes/com/manage/controller/Power_MenuController.class index 35759f7..8547089 100644 Binary files a/power-admin/target/classes/com/manage/controller/Power_MenuController.class and b/power-admin/target/classes/com/manage/controller/Power_MenuController.class differ diff --git a/power-admin/target/classes/com/manage/controller/Power_MenuManageController.class b/power-admin/target/classes/com/manage/controller/Power_MenuManageController.class index 52206e3..0e018de 100644 Binary files a/power-admin/target/classes/com/manage/controller/Power_MenuManageController.class and b/power-admin/target/classes/com/manage/controller/Power_MenuManageController.class differ diff --git a/power-admin/target/classes/com/manage/controller/Power_NoticeController.class b/power-admin/target/classes/com/manage/controller/Power_NoticeController.class index f08fb60..3789cc3 100644 Binary files a/power-admin/target/classes/com/manage/controller/Power_NoticeController.class and b/power-admin/target/classes/com/manage/controller/Power_NoticeController.class differ diff --git a/power-admin/target/classes/com/manage/controller/Power_Sys_DictController.class b/power-admin/target/classes/com/manage/controller/Power_Sys_DictController.class index 12c44d5..465fed3 100644 Binary files a/power-admin/target/classes/com/manage/controller/Power_Sys_DictController.class and b/power-admin/target/classes/com/manage/controller/Power_Sys_DictController.class differ diff --git a/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class b/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class index 453788a..1bdf038 100644 Binary files a/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class and b/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class differ diff --git a/power-admin/target/classes/com/manage/controller/RoleController.class b/power-admin/target/classes/com/manage/controller/RoleController.class index f8cdb57..34c9511 100644 Binary files a/power-admin/target/classes/com/manage/controller/RoleController.class and b/power-admin/target/classes/com/manage/controller/RoleController.class differ diff --git a/power-admin/target/classes/com/manage/controller/T_MenuController.class b/power-admin/target/classes/com/manage/controller/T_MenuController.class index 913ec4a..6563d43 100644 Binary files a/power-admin/target/classes/com/manage/controller/T_MenuController.class and b/power-admin/target/classes/com/manage/controller/T_MenuController.class differ diff --git a/power-admin/target/classes/com/manage/controller/UserController.class b/power-admin/target/classes/com/manage/controller/UserController.class index 98f62ae..9c47250 100644 Binary files a/power-admin/target/classes/com/manage/controller/UserController.class and b/power-admin/target/classes/com/manage/controller/UserController.class differ diff --git a/power-admin/target/classes/com/manage/interceptor/LoginInterceptor.class b/power-admin/target/classes/com/manage/interceptor/LoginInterceptor.class index 7c159c6..3a39141 100644 Binary files a/power-admin/target/classes/com/manage/interceptor/LoginInterceptor.class and b/power-admin/target/classes/com/manage/interceptor/LoginInterceptor.class differ diff --git a/power-admin/target/classes/com/manage/interfaces/cache/Cache.class b/power-admin/target/classes/com/manage/interfaces/cache/Cache.class deleted file mode 100644 index 51f65ec..0000000 Binary files a/power-admin/target/classes/com/manage/interfaces/cache/Cache.class and /dev/null differ diff --git a/power-admin/target/classes/com/manage/interfaces/cache/CacheManager.class b/power-admin/target/classes/com/manage/interfaces/cache/CacheManager.class deleted file mode 100644 index c4831d6..0000000 Binary files a/power-admin/target/classes/com/manage/interfaces/cache/CacheManager.class and /dev/null differ diff --git a/power-admin/target/classes/com/manage/interfaces/webservice/PowerWebService.class b/power-admin/target/classes/com/manage/interfaces/webservice/PowerWebService.class index bbef865..2a8e02b 100644 Binary files a/power-admin/target/classes/com/manage/interfaces/webservice/PowerWebService.class and b/power-admin/target/classes/com/manage/interfaces/webservice/PowerWebService.class differ diff --git a/power-admin/target/classes/com/manage/interfaces/webservice/RoleAndUserTreeWebService.class b/power-admin/target/classes/com/manage/interfaces/webservice/RoleAndUserTreeWebService.class deleted file mode 100644 index 2902af6..0000000 Binary files a/power-admin/target/classes/com/manage/interfaces/webservice/RoleAndUserTreeWebService.class and /dev/null differ diff --git a/power-admin/target/classes/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.class b/power-admin/target/classes/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.class index 34ed9ba..4f38e3c 100644 Binary files a/power-admin/target/classes/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.class and b/power-admin/target/classes/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.class differ diff --git a/power-admin/target/classes/com/manage/test.class b/power-admin/target/classes/com/manage/test.class deleted file mode 100644 index c4772b2..0000000 Binary files a/power-admin/target/classes/com/manage/test.class and /dev/null differ 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..d9f60ae 100644 --- a/power-foundaton/pom.xml +++ b/power-foundaton/pom.xml @@ -46,23 +46,11 @@ bcprov-jdk14 compile - - - net.java.dev.jna - jna - 4.5.0 + org.slf4j + slf4j-log4j12 - - net.java.dev.jna - jna-platform - 4.5.0 - --> - @@ -76,7 +64,6 @@ 1.8 UTF-8 - diff --git a/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java b/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java new file mode 100644 index 0000000..cffbf13 --- /dev/null +++ b/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java @@ -0,0 +1,36 @@ +package com.manage.util; + +import org.apache.log4j.Logger; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/8/4 14:18 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/8/4 14:18 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +public class ExceptionPrintUtil { + private static Logger log = Logger.getLogger("errorMsg"); + public static void printException(Exception e){ + //方法名 + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + e.printStackTrace(new PrintStream(baos)); + String exception = baos.toString(); + log.error(exception); + try { + baos.flush(); + baos.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } +} diff --git a/power-service/src/main/java/com/manage/App.java b/power-service/src/main/java/com/manage/App.java deleted file mode 100644 index 9939a1f..0000000 --- a/power-service/src/main/java/com/manage/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.manage; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java index 38f4aa0..9f8ea2e 100644 --- a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java +++ b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java @@ -308,23 +308,23 @@ public class ImportExcelJudgeMethod { Power_User powerUser1 =(Power_User) session.getAttribute("CURRENT_USER"); //获取医院ID Power_User_Dict userDict = userDictMapper.selectDictIdByUserId(powerUser1.getUserId()); - String deptIds = ""; + StringBuilder deptIds = new StringBuilder(); if(value.contains("@")){ String[] values = value.split("@"); - for (int i = 0; i < values.length; i++) { - if(StringUtils.isNotBlank(values[i])){ - List power_dept = deptMapper.checkDeptName(values[i], userDict.getDictId()); - if(power_dept != null && !power_dept.isEmpty()){ - deptIds += power_dept.get(0).getDeptId()+","; - }else{ - return "\""+head+"\"其中有不存在,"; + for (String value1 : values) { + if (StringUtils.isNotBlank(value1)) { + List powerDept = deptMapper.checkDeptName(value1, userDict.getDictId()); + if (powerDept != null && !powerDept.isEmpty()) { + deptIds.append(powerDept.get(0).getDeptId()).append(","); + } else { + return "\"" + head + "\"其中有不存在,"; } } } }else{ - List power_dept = deptMapper.checkDeptName(value, userDict.getDictId()); - if(power_dept != null && !power_dept.isEmpty()){ - deptIds += power_dept.get(0).getDeptId()+","; + List powerDept = deptMapper.checkDeptName(value, userDict.getDictId()); + if(powerDept != null && !powerDept.isEmpty()){ + deptIds.append(powerDept.get(0).getDeptId()).append(","); }else{ return "\""+head+"\"不存在,"; } @@ -435,8 +435,8 @@ public class ImportExcelJudgeMethod { Power_User powerUser1 =(Power_User) session.getAttribute("CURRENT_USER"); //获取医院ID Power_User_Dict userDict = userDictMapper.selectDictIdByUserId(powerUser1.getUserId()); - List power_dept = deptMapper.checkDeptName(value, userDict.getDictId()); - if(power_dept != null && !power_dept.isEmpty()){ + List powerDept = deptMapper.checkDeptName(value, userDict.getDictId()); + if(powerDept != null && !powerDept.isEmpty()){ return "\""+head+"\"已存在,"; }else{ f.set(object,value); diff --git a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java index 0d462ad..38ad23c 100644 --- a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java +++ b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java @@ -76,13 +76,13 @@ public class ImportExcelUtil { boolean flag = isRowEmpty(row); if(!flag){ if(row.getPhysicalNumberOfCells() !=0){ - String wrongStr = ""; + StringBuilder wrongStr = new StringBuilder(); for (int k = 0; k < fieldNames.length; k++) { //对象赋值后返回错误对象 - wrongStr += getValueByField(object, fieldNames[k], getCellValue(row.getCell(k)), getCellValue(head.getCell(k)),judgeMethods[k]); + wrongStr.append(getValueByField(object, fieldNames[k], getCellValue(row.getCell(k)), getCellValue(head.getCell(k)), judgeMethods[k])); } //有错误信息在行尾创建cell，并标红提示文字 - if(StringUtils.isNotBlank(wrongStr)){ + if(StringUtils.isNotBlank(wrongStr.toString())){ //设置错误信息字体为红色加粗 Font font = workbook.createFont(); font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); @@ -92,8 +92,8 @@ public class ImportExcelUtil { Cell cell = row.createCell( fieldNames.length); cell.setCellStyle(cellStyle); cell.setCellType(HSSFCell.CELL_TYPE_STRING); - wrongStr = wrongStr.substring(0,wrongStr.length()-1); - cell.setCellValue(wrongStr); + wrongStr = new StringBuilder(wrongStr.substring(0, wrongStr.length() - 1)); + cell.setCellValue(wrongStr.toString()); wrongCount++; }else{ successCount++; @@ -110,7 +110,7 @@ public class ImportExcelUtil { //批量新增成功记录 SimpleInsert(list); //删除正确行 - if(null != workbook && null != wrongRowIndex && !wrongRowIndex.isEmpty()){ + if(!wrongRowIndex.isEmpty()){ //定义删除次数，对应后方下角标都要减去删除次数 int deleteCount = 0; //递归删除 @@ -154,7 +154,7 @@ public class ImportExcelUtil { } //判断空行 - public static boolean isRowEmpty(Row row) { + private static boolean isRowEmpty(Row row) { for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) { Cell cell = row.getCell(c); if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK) { @@ -171,7 +171,7 @@ public class ImportExcelUtil { //删除此行 removeRow(sheet,index); deleteCount++; - if(null != wrongRowIndex && !wrongRowIndex.isEmpty()){ + if(!wrongRowIndex.isEmpty()){ removeSheet(sheet,deleteCount,wrongRowIndex); } } @@ -182,7 +182,7 @@ public class ImportExcelUtil { * object:赋值对象，fieldName:属性名，value:excel表格值,head:表格头名称(中文名)，judgeMethod:判断方法 * */ private static String getValueByField(Object object,String fieldName,String value,String head,String judgeMethod){ - String wrongStr = ""; + StringBuilder wrongStr = new StringBuilder(); try { Class clazz = object.getClass(); for (; clazz != Object.class; clazz = clazz.getSuperclass()) { @@ -200,7 +200,7 @@ public class ImportExcelUtil { //执行方法 String returnWrongStr = (String)method.invoke(importExcelJudgeMethod, fieldName, value, f, object, head); if(StringUtils.isNotBlank(returnWrongStr)){ - wrongStr+=returnWrongStr; + wrongStr.append(returnWrongStr); } }else{ if(StringUtils.isNotBlank(value)){ @@ -219,15 +219,15 @@ public class ImportExcelUtil { } }catch (Exception e){ e.printStackTrace(); - wrongStr+="\""+head+"\"格式不正确,"; + wrongStr.append("\"").append(head).append("\"格式不正确,"); } - return wrongStr; + return wrongStr.toString(); } /** * 删除行 * */ - public static void removeRow(Sheet sheet, int rowIndex) { + private static void removeRow(Sheet sheet, int rowIndex) { int lastRowNum=sheet.getLastRowNum(); if(rowIndex>=0&&rowIndex workBookMap = new HashMap<>(); //通过key获取工作簿 public static Workbook getWorkBookMapByKey(String workBookKey){ - Workbook workbook = workBookMap.get(workBookKey); - return workbook; - } - - //移除缓存的工作簿 - public static void removeWorkBookMapByKey(String workBookKey){ - workBookMap.remove(workBookKey); + return workBookMap.get(workBookKey); } public static void copy(Object source, Object dest) throws Exception { diff --git a/power-service/src/main/java/com/manage/service/Power_Sys_DictService.java b/power-service/src/main/java/com/manage/service/Power_Sys_DictService.java index 2c5d986..f671446 100644 --- a/power-service/src/main/java/com/manage/service/Power_Sys_DictService.java +++ b/power-service/src/main/java/com/manage/service/Power_Sys_DictService.java @@ -40,13 +40,6 @@ public interface Power_Sys_DictService { * */ ListselectSysType(); - /** - * @Date 2019-4-25 - * @Author ly - * @Description 导出Excel表 - * */ - void export(HttpServletResponse response)throws Exception; - /**@Date 2019-04-28 * @Author zengwh * 查询全部 diff --git a/power-service/src/main/java/com/manage/service/cache/CacheManager.java b/power-service/src/main/java/com/manage/service/cache/CacheManager.java index 883ea40..7c54bac 100644 --- a/power-service/src/main/java/com/manage/service/cache/CacheManager.java +++ b/power-service/src/main/java/com/manage/service/cache/CacheManager.java @@ -9,108 +9,27 @@ import java.util.Map; public class CacheManager { private static HashMap cacheMap = new HashMap(); - private static HashMap cacheExceptionMap = new HashMap(); - private static HashMap> loginUserCacheMap = new HashMap(); - //无异常数量 - private static Integer noExcCount = 0; - //异常数量 - private static Integer excCount = 0; - - //添加用户登录缓存 - public synchronized static void addloginUserCount(String date,String userName){ - //取出当天数据 - HashMap map = loginUserCacheMap.get(date); - if(null == map){ - map = new HashMap<>(); - //首次登录 - map.put(userName,1); - }else{ - //取出该用户当天登录数 - Integer count = (Integer)map.get(userName); - if(null == count){ - count = 0; - } - //加1 - count++; - //重置 - map.put(userName,count); - } - //重置 - loginUserCacheMap.put(date,map); - } - - //获取当天用户集合 - public static HashMap getCurrentDayCount(String date){ - //取出当天数据 - HashMap map = loginUserCacheMap.get(date); - return map; - } - //添加异常数量 - public synchronized static void addExcCount(String type){ + public static void addExcCount(String type){ if("noExc".equals(type)){ - noExcCount++; - cacheExceptionMap.put(type,noExcCount); } if("exc".equals(type)){ - excCount++; - cacheExceptionMap.put(type,excCount); } } - //取异常数量 - public synchronized static Integer getExcCount(String type){ - return (Integer)cacheExceptionMap.get(type); - } - - private CacheManager() { - super(); - } - public static boolean getSimpleFlag(String key){ - try{ - return (Boolean) cacheMap.get(key); - }catch(NullPointerException e){ - return false; - } - } - public static long getServerStartdt(String key){ - try { - return (Long)cacheMap.get(key); - } catch (Exception ex) { - return 0; - } - } - public synchronized static boolean setSimpleFlag(String key,boolean flag){ - if (flag && getSimpleFlag(key)) { - return false; - }else{ - cacheMap.put(key, flag); - return true; - } - } - public synchronized static boolean setSimpleFlag(String key,long serverbegrundt){ - if (cacheMap.get(key) == null) { - cacheMap.put(key,serverbegrundt); - return true; - }else{ - return false; - } - } - - - private synchronized static Cache getCache(String key) { + private static Cache getCache(String key) { return (Cache) cacheMap.get(key); } - private synchronized static boolean hasCache(String key) { + private static boolean hasCache(String key) { return cacheMap.containsKey(key); } - public synchronized static void clearAll() { + public static void clearAll() { cacheMap.clear(); } - public synchronized static void clearAll(String type) { + public static void clearAll(String type) { Iterator i = cacheMap.entrySet().iterator(); String key; ArrayList arr = new ArrayList(); @@ -122,24 +41,23 @@ public class CacheManager { arr.add(key); } } - for (int k = 0; k < arr.size(); k++) { - clearOnly(arr.get(k)); + for (String s : arr) { + clearOnly(s); } } catch (Exception ex) { ex.printStackTrace(); } } - public synchronized static void clearOnly(String key) { + public static void clearOnly(String key) { cacheMap.remove(key); } - public synchronized static void putCache(String key, Cache obj) { + public static void putCache(String key, Cache obj) { cacheMap.put(key, obj); } public static Cache getCacheInfo(String key) { - if (hasCache(key)) { Cache cache = getCache(key); if (cacheExpired(cache)) { @@ -150,24 +68,7 @@ public class CacheManager { return null; } - public static void putCacheInfo(String key, Cache obj, long dt, boolean expired) { - Cache cache = new Cache(); - cache.setKey(key); - cache.setTimeOut(dt + System.currentTimeMillis()); - cache.setValue(obj); - cache.setExpired(expired); - cacheMap.put(key, cache); - } - public static void putCacheInfo(String key, Cache obj, long dt){ - Cache cache = new Cache(); - cache.setKey(key); - cache.setTimeOut(dt+System.currentTimeMillis()); - cache.setValue(obj); - cache.setExpired(false); - cacheMap.put(key,cache); - } - - public static boolean cacheExpired(Cache cache) { + private static boolean cacheExpired(Cache cache) { if (null == cache) { return false; } @@ -180,62 +81,8 @@ public class CacheManager { } } - public static int getCacheSize() { - return cacheMap.size(); - } - - public static int getCacheSize(String type) { - int k = 0; - Iterator i = cacheMap.entrySet().iterator(); - String key; - try { - while (i.hasNext()) { - Map.Entry entry = (Map.Entry) i.next(); - key = (String) entry.getKey(); - if (key.indexOf(type) != -1) { - k++; - } - } - } catch (Exception ex) { - ex.printStackTrace(); - } - - return k; - } - - public static ArrayList getCacheAllkey() { - ArrayList a = new ArrayList(); - try { - Iterator i = cacheMap.entrySet().iterator(); - while (i.hasNext()) { - Map.Entry entry = (Map.Entry) i.next(); - a.add((String) entry.getKey()); - } - } catch (Exception ex) {} finally { - return a; - } - } - - public static ArrayList getCacheListkey(String type) { - ArrayList a = new ArrayList(); - String key; - try { - Iterator i = cacheMap.entrySet().iterator(); - while (i.hasNext()) { - Map.Entry entry = (Map.Entry) i.next(); - key = (String) entry.getKey(); - if (key.indexOf(type) != -1) { - a.add(key); - } - } - } catch (Exception ex) {} finally { - return a; - } - } //根据用户信息删除缓存 public synchronized static void removeCacheByObject(Power_UserVo obj) { - ArrayList a = new ArrayList(); - Object key; ArrayList arr = new ArrayList(); try { Iterator i = cacheMap.entrySet().iterator(); @@ -247,12 +94,11 @@ public class CacheManager { arr.add((String)entry.getKey()); } } - if(null != arr && !arr.isEmpty()){ - for (int k = 0; k < arr.size(); k++) { - clearOnly(arr.get(k)); + if(!arr.isEmpty()){ + for (String s : arr) { + clearOnly(s); } } - } catch (Exception ex) {} + } catch (Exception ignored) {} } - } \ No newline at end of file diff --git a/power-service/src/main/java/com/manage/service/ipml/LogServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/LogServiceImpl.java index 0d00150..1d2330a 100644 --- a/power-service/src/main/java/com/manage/service/ipml/LogServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/LogServiceImpl.java @@ -3,6 +3,7 @@ package com.manage.service.ipml; import com.manage.dao.Power_LogMapper; import com.manage.entity.Power_Log; import com.manage.service.LogService; +import com.manage.util.ExceptionPrintUtil; import com.manage.vo.Power_UserVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -93,12 +94,13 @@ public class LogServiceImpl implements LogService { } if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) { ipAddress = request.getRemoteAddr(); - if(ipAddress.equals("127.0.0.1") || ipAddress.equals("0:0:0:0:0:0:0:1")){ + if("127.0.0.1".equals(ipAddress) || "0:0:0:0:0:0:0:1".equals(ipAddress)){ //根据网卡取本机配置的IP InetAddress inet=null; try { inet = InetAddress.getLocalHost(); } catch (UnknownHostException e) { + ExceptionPrintUtil.printException(e); e.printStackTrace(); } ipAddress= inet.getHostAddress(); diff --git a/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java index ee88811..f3d0d66 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java @@ -37,14 +37,14 @@ public class PageServiceImpl { private int TEMPERATUREROWNUM; @Autowired private Power_UserMapper userMapper; - private static int byteToMb = 1024 * 1024; + private int byteToMb = 1024 * 1024; public Integer selectEffectiveCount(){ return userMapper.selectEffectiveCount(); } public Map getEcharts2(){ Map returnMap = new HashMap(); - List dateList = getDayListOfMonth(); + /*List dateList = getDayListOfMonth(); //日期集合 List dayList = new ArrayList<>(); //意向客户集合 @@ -120,13 +120,13 @@ public class PageServiceImpl { //添加长期客户 returnMap.put("longTermList",longTermList); //添加流失客户 - returnMap.put("lossList",lossList); + returnMap.put("lossList",lossList);*/ return returnMap; } public Map getEcharts3(){ Map returnMap = new HashMap(); - List dateList = getDayListOfMonth(); + /*List dateList = getDayListOfMonth(); //日期集合 List dayList = new ArrayList<>(); //登录次数集合 @@ -167,13 +167,12 @@ public class PageServiceImpl { //添加日期集合 returnMap.put("dayList",dayList); //日期对应登录数 - returnMap.put("dataList",dataList); + returnMap.put("dataList",dataList);*/ return returnMap; } public int getEcharts4() throws Exception{ - SigarUtils s = new SigarUtils(); - s.initSigar(); + SigarUtils.initSigar(); int cpuCount = cpu(); return cpuCount; } @@ -185,7 +184,6 @@ public class PageServiceImpl { cpuList = sigar.getCpuPercList(); double combined = 0; for (int i = 0; i < infos.length; i++) {// 不管是单块CPU还是多CPU都适用 - CpuInfo info = infos[i]; combined += cpuList[i].getCombined()*100.0D; } return (int)combined/6; @@ -201,10 +199,11 @@ public class PageServiceImpl { } catch (FileNotFoundException e) { e.printStackTrace(); } - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); byte[] bytes = new byte[1024]; try { - for(int n ; (n = input.read(bytes))!=-1 ; ){ + assert input != null; + for(int n; (n = input.read(bytes))!=-1 ; ){ buffer.append(new String(bytes,0,n,"GBK")); } } catch (IOException e) { @@ -213,7 +212,7 @@ public class PageServiceImpl { int i = buffer.toString().lastIndexOf(""); String substring = buffer.substring(0, i); String substring1 = substring.substring(substring.length() - 4, substring.length()); - Float f = Float.valueOf(substring1); + float f = Float.valueOf(substring1); temperature = Math.round(f); }catch (Exception e){ e.printStackTrace(); @@ -223,9 +222,8 @@ public class PageServiceImpl { public List getEcharts6() throws Exception{ List list = new ArrayList<>(); - SigarUtils s = new SigarUtils(); //初始化 - s.initSigar(); + SigarUtils.initSigar(); Sigar sigar = new Sigar(); //获取内存对象 Mem mem = sigar.getMem(); @@ -253,7 +251,7 @@ public class PageServiceImpl { int month = aCalendar.get(Calendar.MONTH) + 1;//月份 int day = aCalendar.getActualMaximum(Calendar.DATE); for (int i = 1; i <= day; i++) { - String aDate = String.valueOf(year)+"-"+month+"-"+i; + String aDate = year+"-"+month+"-"+i; list.add(aDate); } return list; diff --git a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java index 279f40d..25f5088 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java @@ -6,7 +6,6 @@ import com.manage.service.PowerService; import com.manage.vo.PowerTree; import com.manage.vo.Power_Sys_DictVo; import com.manage.vo.Power_UserAndRoleTree; -import com.manage.vo.Power_UserVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -110,7 +109,7 @@ public class PowerServiceImpl implements PowerService { } } } - if(null != hosList && !hosList.isEmpty()){ + if(!hosList.isEmpty()){ //组织树 int id = 1; int oneLevelId = 0; @@ -126,7 +125,7 @@ public class PowerServiceImpl implements PowerService { id++; //获取该医院不重复角色 Map roleListByHosId = new HashMap<>(); - if(null != roleList && !roleList.isEmpty()) { + if(!roleList.isEmpty()) { //属于该医院的权限系统下有有该角色 for (Power_UserAndRoleTree powerRole : roleList) { if (null != powerRole.getParentId() && powerRole.getParentId().equals(hos.getSelfId())) { @@ -135,7 +134,7 @@ public class PowerServiceImpl implements PowerService { } } //第二级权限系统 - if(null != powerList && !powerList.isEmpty()){ + if(!powerList.isEmpty()){ for(Power_UserAndRoleTree powerSys : powerList){ if(powerSys.getParentId().equals(hos.getSelfId())){ Power_UserAndRoleTree tree2 = new Power_UserAndRoleTree(); @@ -147,7 +146,7 @@ public class PowerServiceImpl implements PowerService { treeList.add(tree2); id++; //第三级角色 - if(null != roleListByHosId && !roleListByHosId.isEmpty()){ + if(!roleListByHosId.isEmpty()){ //属于该医院的权限系统下有有该角色 for (Map.Entry entry : roleListByHosId.entrySet()) { if(entry.getValue().getParentId().equals(hos.getSelfId())){ @@ -167,12 +166,12 @@ public class PowerServiceImpl implements PowerService { //取系统和角色 Map sysListByHosDeptId = new HashMap<>(); List tempRoleList = new ArrayList<>(); - if(null != deptList && !deptList.isEmpty()) { + if(!deptList.isEmpty()) { for (Power_UserAndRoleTree dept : deptList) { if (dept.getParentId().equals(hos.getSelfId())) { Set sysFlagSet = new TreeSet<>(); //获取该科室不重复系统 - if (null != sysList && !sysList.isEmpty()) { + if (!sysList.isEmpty()) { for (Power_UserAndRoleTree sys : sysList) { if (null != sys.getParentId() && sys.getDeptId().equals(dept.getDeptId())) { sysListByHosDeptId.put(sys.getSysFlag(),sys); @@ -181,23 +180,23 @@ public class PowerServiceImpl implements PowerService { } } //给角色设置系统权限 - if (null != roleList && !roleList.isEmpty()) { + if (!roleList.isEmpty()) { for (Power_UserAndRoleTree role : roleList) { - String sysFlagStr = ""; + StringBuilder sysFlagStr = new StringBuilder(); String deptId = role.getDeptId(); if(StringUtils.isNotBlank(deptId)){ //单一科室 if (!deptId.contains(",")) { if (deptId.equals(dept.getDeptId())) { - if(null != sysFlagSet && !sysFlagSet.isEmpty()){ + if(!sysFlagSet.isEmpty()){ for(String sysFlag:sysFlagSet){ - sysFlagStr += sysFlag + ","; + sysFlagStr.append(sysFlag).append(","); } } - if(StringUtils.isNotBlank(sysFlagStr)){ + if(StringUtils.isNotBlank(sysFlagStr.toString())){ Power_UserAndRoleTree tempRole = new Power_UserAndRoleTree(); BeanUtils.copyProperties(role,tempRole); - tempRole.setSysFlag(sysFlagStr); + tempRole.setSysFlag(sysFlagStr.toString()); tempRoleList.add(tempRole); } } @@ -206,15 +205,15 @@ public class PowerServiceImpl implements PowerService { String[] deptIds = deptId.split(","); for (String deptStr : deptIds) { if (StringUtils.isNotBlank(deptStr) && deptStr.equals(dept.getDeptId())) { - if(null != sysFlagSet && !sysFlagSet.isEmpty()){ + if(!sysFlagSet.isEmpty()){ for(String sysFlag:sysFlagSet){ - sysFlagStr += sysFlag + ","; + sysFlagStr.append(sysFlag).append(","); } } - if(StringUtils.isNotBlank(sysFlagStr)){ + if(StringUtils.isNotBlank(sysFlagStr.toString())){ Power_UserAndRoleTree tempRole = new Power_UserAndRoleTree(); BeanUtils.copyProperties(role,tempRole); - tempRole.setSysFlag(sysFlagStr); + tempRole.setSysFlag(sysFlagStr.toString()); tempRoleList.add(tempRole); } } @@ -226,7 +225,7 @@ public class PowerServiceImpl implements PowerService { } } //第三级系统 - if (null != sysListByHosDeptId && !sysListByHosDeptId.isEmpty()) { + if (!sysListByHosDeptId.isEmpty()) { for (Map.Entry sys : sysListByHosDeptId.entrySet()) { if(sys.getValue().getParentId().equals(hos.getSelfId())){ Power_UserAndRoleTree tree5 = new Power_UserAndRoleTree(); @@ -239,7 +238,7 @@ public class PowerServiceImpl implements PowerService { id++; //第四级角色 Map roleListBySys = new HashMap<>(); - if (null != roleList && !roleList.isEmpty()) { + if (!roleList.isEmpty()) { for (Power_UserAndRoleTree role : tempRoleList) { String sysFlag = role.getSysFlag(); if(StringUtils.isNotBlank(sysFlag)){ @@ -248,13 +247,12 @@ public class PowerServiceImpl implements PowerService { for (String sysFlagStr : sysFlags) { if (StringUtils.isNotBlank(sysFlagStr) && sysFlagStr.equals(sys.getValue().getSysFlag())) { roleListBySys.put(role.getSelfId(),role); - continue; } } } } } - if(null != roleListBySys && !roleListBySys.isEmpty()){ + if(!roleListBySys.isEmpty()){ for (Map.Entry roleBySys:roleListBySys.entrySet()) { Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree(); BeanUtils.copyProperties(roleBySys.getValue(), tree6); @@ -299,10 +297,10 @@ public class PowerServiceImpl implements PowerService { //否则按角色菜单表该角色的权限选中 List roleMenus = roleMenuMapper.selectRoleMenuByRoleId(roleId); if(null != menus && !menus.isEmpty() && null != roleMenus && !roleMenus.isEmpty()){ - for (int i = 0; i < menus.size(); i++) { - for (int j = 0; j < roleMenus.size(); j++) { - if(menus.get(i).getMenuId().equals(roleMenus.get(j).getMenuId())){ - menus.get(i).setChecked("true"); + for (Power_Menu menu : menus) { + for (Power_Role_Menu roleMenu : roleMenus) { + if (menu.getMenuId().equals(roleMenu.getMenuId())) { + menu.setChecked("true"); break; } } @@ -404,7 +402,7 @@ public class PowerServiceImpl implements PowerService { } } } - if(null != hosList && !hosList.isEmpty()){ + if(!hosList.isEmpty()){ //组织树 int id = 1; int oneLevelId = 0; @@ -420,7 +418,7 @@ public class PowerServiceImpl implements PowerService { treeList.add(tree1); id++; //第二级权限系统 - if(null != powerList && !powerList.isEmpty()){ + if(!powerList.isEmpty()){ for(Power_UserAndRoleTree powerSys : powerList){ if(powerSys.getParentId().equals(hos.getSelfId())){ Power_UserAndRoleTree tree2 = new Power_UserAndRoleTree(); @@ -429,10 +427,10 @@ public class PowerServiceImpl implements PowerService { twoLevelId = id; tree2.setParentId(oneLevelId); tree2.setSysFlag(powerSys.getSysFlag()); - Boolean isParent = false; + boolean isParent = false; id++; //第三级用户 - if(null != userList && !userList.isEmpty()){ + if(!userList.isEmpty()){ //属于该医院的权限系统下有有该用户 for(Power_UserAndRoleTree powerUser : userList){ if(null != powerUser.getParentId() && powerUser.getParentId().equals(hos.getSelfId())){ @@ -462,7 +460,7 @@ public class PowerServiceImpl implements PowerService { } } //第二级科室 - if(null != deptList && !deptList.isEmpty()){ + if(!deptList.isEmpty()){ for(Power_UserAndRoleTree dept : deptList){ if(dept.getParentId().equals(hos.getSelfId())){ Power_UserAndRoleTree tree4 = new Power_UserAndRoleTree(); @@ -475,7 +473,7 @@ public class PowerServiceImpl implements PowerService { id++; } //第三级系统 - if(null != sysList && !sysList.isEmpty()){ + if(!sysList.isEmpty()){ for(Power_UserAndRoleTree sys : sysList) { if (null != sys.getParentId() && sys.getDeptId().equals(dept.getDeptId()) && sys.getParentId().equals(hos.getSelfId())) { Power_UserAndRoleTree tree5 = new Power_UserAndRoleTree(); @@ -485,9 +483,9 @@ public class PowerServiceImpl implements PowerService { tree5.setSysFlag(sys.getSysFlag()); threeLevelId = id; id++; - Boolean isParent = false; + boolean isParent = false; //第四级用户 - if(null != userList && !userList.isEmpty()) { + if(!userList.isEmpty()) { for (Power_UserAndRoleTree users : userList) { String deptId = users.getDeptId(); if(StringUtils.isNotBlank(deptId)){ @@ -617,8 +615,8 @@ public class PowerServiceImpl implements PowerService { //roleId为-100医院管理员，菜单功能全选中 if(null != user.getRoleId() && user.getRoleId() == -100){ if(null != menus && !menus.isEmpty()){ - for (int i = 0; i < menus.size(); i++) { - menus.get(i).setChecked("true"); + for (Power_Menu menu : menus) { + menu.setChecked("true"); } } }else{ @@ -626,10 +624,10 @@ public class PowerServiceImpl implements PowerService { List userMenus = userMenuMapper.selectUserAndRoleMenuPower(sysFlag, userId); if(null != menus && !menus.isEmpty() && null != userMenus && !userMenus.isEmpty()){ //有符合权限则checked设为true - for (int i = 0; i < menus.size(); i++) { - for (int j = 0; j < userMenus.size(); j++) { - if(menus.get(i).getMenuId().equals(userMenus.get(j).getMenuId())){ - menus.get(i).setChecked("true"); + for (Power_Menu menu : menus) { + for (Power_User_Menu userMenu : userMenus) { + if (menu.getMenuId().equals(userMenu.getMenuId())) { + menu.setChecked("true"); break; } } @@ -658,36 +656,30 @@ public class PowerServiceImpl implements PowerService { String userName = user.getUserName(); //查询该用户对应系统在用户菜单表中已有的权限，先删除后新增 userMenuMapper.deleteUserMenuByUserIdAndSysFlag(sysFlag, userId); - /* List userPowers = userMenuMapper.selectUserMenuPower(sysFlag,userId); - if(null != userPowers && !userPowers.isEmpty()){ - for (int i = 0; i < userPowers.size(); i++) { - userMenuMapper.deleteByPrimaryKey(userPowers.get(i).getUserMenuId()); - } - }*/ - Power_User power_user = userMapper.selectByPrimaryKey(userId); + Power_User powerUser = userMapper.selectByPrimaryKey(userId); //查询该用户对应的角色菜单权限 - List rolePowers = roleMenuMapper.selectRoleMenuPower(sysFlag, power_user.getRoleId()); + List rolePowers = roleMenuMapper.selectRoleMenuPower(sysFlag, powerUser.getRoleId()); if(null != rolePowers && !rolePowers.isEmpty()){ if(StringUtils.isBlank(menus)){ //全取消 List list = new ArrayList<>(); - for (int i = 0; i < rolePowers.size(); i++) { - list.add(addUserFunction(userName, userId, rolePowers.get(i).getMenuId().toString(), 0)); + for (Power_Role_Menu rolePower : rolePowers) { + list.add(addUserFunction(userName, userId, rolePower.getMenuId().toString(), 0)); } userMenuMapper.simpleInsertUserMenu(list); }else{ //计算新增和删除 List roles = new ArrayList<>(); List users = new ArrayList<>(); - for (int i = 0; i < rolePowers.size(); i++) { - roles.add(rolePowers.get(i).getMenuId().toString()); + for (Power_Role_Menu rolePower : rolePowers) { + roles.add(rolePower.getMenuId().toString()); } String[] menu = menus.split(","); users = Arrays.asList(menu); //新增部分 Collection inserts=new ArrayList(users); inserts.removeAll(roles); - if(null != inserts && !inserts.isEmpty()){ + if(!inserts.isEmpty()){ //新增flag为1 List list = new ArrayList<>(); for (String insertMenu : inserts) { @@ -700,7 +692,7 @@ public class PowerServiceImpl implements PowerService { //删除部分 Collection deletes=new ArrayList(roles); deletes.removeAll(users); - if(null != deletes && !deletes.isEmpty()){ + if(!deletes.isEmpty()){ List list = new ArrayList<>(); for(String deleteMenu : deletes){ if(StringUtils.isNotBlank(deleteMenu)){ @@ -772,17 +764,17 @@ public class PowerServiceImpl implements PowerService { int twoLevel = 0; Map hospitalNameSet = new HashMap<>(); if(null != dicts && !dicts.isEmpty()){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){ - hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getHospitalName())) { + hospitalNameSet.put(dict.getDictId(), dict.getHospitalName()); } //用户集合 - if(null == dicts.get(i).getDictId()){ - userList.add(dicts.get(i)); + if (null == dict.getDictId()) { + userList.add(dict); } } } - if(null != hospitalNameSet && !hospitalNameSet.isEmpty()){ + if(!hospitalNameSet.isEmpty()){ for(Integer hosKey : hospitalNameSet.keySet()){ Map deptNameSet = new HashMap<>(); Map poweSysNameSet = new HashMap<>(); @@ -794,23 +786,22 @@ public class PowerServiceImpl implements PowerService { tree1.setId(id); tree1.setName(hospitalNameSet.get(hosKey)); treeList.add(tree1); - for (int i = 0; i < dicts.size(); i++) { + for (Power_Sys_DictVo dict : dicts) { //查询病案系统的科室 - if(StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getSysFlag().equals(sysFlag) && dicts.get(i).getParentId().equals(hosKey) && null != dicts.get(i).getDictDeptId()){ - deptIds.add(dicts.get(i).getDictDeptId()); + if (StringUtils.isNotBlank(dict.getSysFlag()) && dict.getSysFlag().equals(sysFlag) && dict.getParentId().equals(hosKey) && null != dict.getDictDeptId()) { + deptIds.add(dict.getDictDeptId()); } } - if(null != deptIds && !deptIds.isEmpty()){ + if(!deptIds.isEmpty()){ for(Integer deptId : deptIds){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getDeptIds()) && dicts.get(i).getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dicts.get(i).getDeptName())){ - deptNameSet.put(dicts.get(i).getDeptIds(),dicts.get(i).getDeptName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getDeptIds()) && dict.getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dict.getDeptName())) { + deptNameSet.put(dict.getDeptIds(), dict.getDeptName()); } } } - if(null != deptNameSet && !deptNameSet.isEmpty()){ + if(!deptNameSet.isEmpty()){ for (String key : deptNameSet.keySet()) { - Map sysNameSet = new HashMap<>(); //科室层 id++; twoLevel = id; @@ -820,20 +811,20 @@ public class PowerServiceImpl implements PowerService { tree2.setName(deptNameSet.get(key)); treeList.add(tree2); Map roleMap = new HashMap<>(); - if (null != userList && !userList.isEmpty()) { - for (int j = 0; j < userList.size(); j++) { - if(StringUtils.isNoneBlank(userList.get(j).getSysType())){ - String deptIdss = userList.get(j).getDeptIds(); - if(StringUtils.isNotBlank(deptIdss)){ - if(!deptIdss.contains(",")){ - if(deptIdss.equals(key)){ - roleMap.put(userList.get(j).getParentId(),userList.get(j).getSysType()); + if (!userList.isEmpty()) { + for (Power_Sys_DictVo dictVo : userList) { + if (StringUtils.isNoneBlank(dictVo.getSysType())) { + String deptIdss = dictVo.getDeptIds(); + if (StringUtils.isNotBlank(deptIdss)) { + if (!deptIdss.contains(",")) { + if (deptIdss.equals(key)) { + roleMap.put(dictVo.getParentId(), dictVo.getSysType()); } - }else{ + } else { String[] deptIdsss = deptIdss.split(","); - for(String deptId:deptIdsss){ - if(StringUtils.isNotBlank(deptId) && deptId.equals(key)){ - roleMap.put(userList.get(j).getParentId(),userList.get(j).getSysType()); + for (String deptId : deptIdsss) { + if (StringUtils.isNotBlank(deptId) && deptId.equals(key)) { + roleMap.put(dictVo.getParentId(), dictVo.getSysType()); } } } @@ -890,20 +881,19 @@ public class PowerServiceImpl implements PowerService { int twoLevel = 0; Map hospitalNameSet = new HashMap<>(); if(null != dicts && !dicts.isEmpty()){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){ - hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getHospitalName())) { + hospitalNameSet.put(dict.getDictId(), dict.getHospitalName()); } //用户集合 - if(null == dicts.get(i).getDictId()){ - userList.add(dicts.get(i)); + if (null == dict.getDictId()) { + userList.add(dict); } } } - if(null != hospitalNameSet && !hospitalNameSet.isEmpty()){ + if(!hospitalNameSet.isEmpty()){ for(Integer hosKey : hospitalNameSet.keySet()){ Map deptNameSet = new HashMap<>(); - Map poweSysNameSet = new HashMap<>(); Set deptIds = new TreeSet<>(); //医院层 id++; @@ -912,21 +902,21 @@ public class PowerServiceImpl implements PowerService { tree1.setId(id); tree1.setName(hospitalNameSet.get(hosKey)); treeList.add(tree1); - for (int i = 0; i < dicts.size(); i++) { + for (Power_Sys_DictVo dict : dicts) { //查询病案系统的科室 - if(StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getSysFlag().equals(sysFlag) && dicts.get(i).getParentId().equals(hosKey)){ - deptIds.add(dicts.get(i).getDictDeptId()); + if (StringUtils.isNotBlank(dict.getSysFlag()) && dict.getSysFlag().equals(sysFlag) && dict.getParentId().equals(hosKey)) { + deptIds.add(dict.getDictDeptId()); } } - if(null != deptIds && !deptIds.isEmpty()){ + if(!deptIds.isEmpty()){ for(Integer deptId : deptIds){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getDeptIds()) && dicts.get(i).getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dicts.get(i).getDeptName())){ - deptNameSet.put(dicts.get(i).getDeptIds(),dicts.get(i).getDeptName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getDeptIds()) && dict.getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dict.getDeptName())) { + deptNameSet.put(dict.getDeptIds(), dict.getDeptName()); } } } - if(null != deptNameSet && !deptNameSet.isEmpty()){ + if(!deptNameSet.isEmpty()){ for (String key : deptNameSet.keySet()) { //科室层 id++; @@ -938,20 +928,20 @@ public class PowerServiceImpl implements PowerService { treeList.add(tree2); Map roleMap = new HashMap<>(); //sysName 用户id，hospitalTel 手机号,dictArea用户名，parentId角色id，sysType角色名 - if (null != userList && !userList.isEmpty()) { - for (int j = 0; j < userList.size(); j++) { - if(StringUtils.isNoneBlank(userList.get(j).getDictArea())){ - String deptIdss = userList.get(j).getDeptIds(); - if(StringUtils.isNotBlank(deptIdss)){ - if(!deptIdss.contains(",")){ - if(deptIdss.equals(key)){ - roleMap.put(Integer.valueOf(userList.get(j).getSysName()),userList.get(j)); + if (!userList.isEmpty()) { + for (Power_Sys_DictVo dictVo : userList) { + if (StringUtils.isNoneBlank(dictVo.getDictArea())) { + String deptIdss = dictVo.getDeptIds(); + if (StringUtils.isNotBlank(deptIdss)) { + if (!deptIdss.contains(",")) { + if (deptIdss.equals(key)) { + roleMap.put(Integer.valueOf(dictVo.getSysName()), dictVo); } - }else{ + } else { String[] deptIdsss = deptIdss.split(","); - for(String deptId:deptIdsss){ - if(StringUtils.isNotBlank(deptId) && deptId.equals(key)){ - roleMap.put(Integer.valueOf(userList.get(j).getSysName()),userList.get(j)); + for (String deptId : deptIdsss) { + if (StringUtils.isNotBlank(deptId) && deptId.equals(key)) { + roleMap.put(Integer.valueOf(dictVo.getSysName()), dictVo); } } } @@ -1007,13 +997,13 @@ public class PowerServiceImpl implements PowerService { int twoLevel = 0; Map hospitalNameSet = new HashMap<>(); if(null != dicts && !dicts.isEmpty()){ - for (int i = 0; i < dicts.size(); i++) { - if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){ - hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName()); + for (Power_Sys_DictVo dict : dicts) { + if (StringUtils.isNotBlank(dict.getHospitalName())) { + hospitalNameSet.put(dict.getDictId(), dict.getHospitalName()); } } } - if(null != hospitalNameSet && !hospitalNameSet.isEmpty()){ + if(!hospitalNameSet.isEmpty()){ for(Integer hosKey : hospitalNameSet.keySet()){ Map deptNameSet = new HashMap<>(); Map poweSysNameSet = new HashMap<>(); @@ -1026,20 +1016,20 @@ public class PowerServiceImpl implements PowerService { tree1.setSelfId(hosKey); tree1.setName(hospitalNameSet.get(hosKey)); treeList.add(tree1); - for (int i = 0; i < dicts.size(); i++) { - if(dicts.get(i).getParentId().equals(hosKey)){ - String deptName = dicts.get(i).getDeptName(); - if(StringUtils.isNoneBlank(deptName)){ - deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName()); + for (Power_Sys_DictVo dict : dicts) { + if (dict.getParentId().equals(hosKey)) { + String deptName = dict.getDeptName(); + if (StringUtils.isNoneBlank(deptName)) { + deptNameSet.put(dict.getDeptId(), dict.getDeptName()); } } //添加权限系统 - if(dicts.get(i).getParentId() != null && StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getParentId().equals(hosKey) && "权限系统".equals(dicts.get(i).getSysType())){ - poweSysNameSet.put(dicts.get(i).getDictId(),dicts.get(i)); + if (dict.getParentId() != null && StringUtils.isNotBlank(dict.getSysFlag()) && dict.getParentId().equals(hosKey) && "权限系统".equals(dict.getSysType())) { + poweSysNameSet.put(dict.getDictId(), dict); } } //添加权限系统 - if(null != poweSysNameSet && !poweSysNameSet.isEmpty()){ + if(!poweSysNameSet.isEmpty()){ for (Integer key : poweSysNameSet.keySet()) { id++; twoLevel = id; @@ -1053,7 +1043,7 @@ public class PowerServiceImpl implements PowerService { treeList.add(tree20); } } - if(null != deptNameSet && !deptNameSet.isEmpty()){ + if(!deptNameSet.isEmpty()){ for (Integer key : deptNameSet.keySet()) { Map sysNameSet = new HashMap<>(); //科室层 @@ -1065,16 +1055,16 @@ public class PowerServiceImpl implements PowerService { tree2.setName(deptNameSet.get(key)); tree2.setSelfId(0-key); treeList.add(tree2); - for (int i = 0; i < dicts.size(); i++) { - if(dicts.get(i).getDictDeptId() != null && dicts.get(i).getDictDeptId().equals(key) - && dicts.get(i).getParentId() != null && dicts.get(i).getParentId().equals(hosKey)){ - String sysName = dicts.get(i).getSysName(); - if(StringUtils.isNoneBlank(sysName)){ - sysNameSet.put(dicts.get(i).getDictId(),sysName); + for (Power_Sys_DictVo dict : dicts) { + if (dict.getDictDeptId() != null && dict.getDictDeptId().equals(key) + && dict.getParentId() != null && dict.getParentId().equals(hosKey)) { + String sysName = dict.getSysName(); + if (StringUtils.isNoneBlank(sysName)) { + sysNameSet.put(dict.getDictId(), sysName); } } } - if(null != sysNameSet && !sysNameSet.isEmpty()){ + if(!sysNameSet.isEmpty()){ for (Integer dictId : sysNameSet.keySet()) { //系统层 id++; diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java index 9445fd1..799a8aa 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java @@ -91,25 +91,25 @@ public class Power_DeptServiceImpl implements Power_DeptService { //查询归属医院 powerDept.setDictId(powerUser1.getDictId()); } - List power_depts = powerDeptDao.findSomeByMore(powerDept); + List powerDeptList = powerDeptDao.findSomeByMore(powerDept); Set perms = powerUser1.getMenus(); - if(null != power_depts && !power_depts.isEmpty()){ - for (int i = 0; i < power_depts.size(); i++) { - Integer isUpdate = 0; - Integer isDelete = 0; - for(String menu : perms){ - if("/dept/update".equals(menu)){ + if(null != powerDeptList && !powerDeptList.isEmpty()){ + for (Power_DeptVo powerDeptTemp : powerDeptList) { + int isUpdate = 0; + int isDelete = 0; + for (String menu : perms) { + if ("/dept/update".equals(menu)) { isUpdate = 1; } - if("/dept/delete".equals(menu)){ + if ("/dept/delete".equals(menu)) { isDelete = 1; } } - power_depts.get(i).setIsUpdate(isUpdate); - power_depts.get(i).setIsDelete(isDelete); + powerDeptTemp.setIsUpdate(isUpdate); + powerDeptTemp.setIsDelete(isDelete); } } - return power_depts; + return powerDeptList; } @Override @@ -127,9 +127,9 @@ public class Power_DeptServiceImpl implements Power_DeptService { @Override public List selectByPrimaryKeys(String dept_ids) { - String[] dept_id = dept_ids.split(","); + String[] deptIdArr = dept_ids.split(","); Map map = new HashMap<>(); - map.put("list",dept_id); + map.put("list",deptIdArr); return powerDeptDao.selectByPrimaryKeys(map); } @@ -145,11 +145,11 @@ public class Power_DeptServiceImpl implements Power_DeptService { public void export(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception { List depts = this.findSomeByMore(powerDept,request); if(null != depts && !depts.isEmpty()){ - for (int i = 0; i < depts.size(); i++) { - if(depts.get(i).getEffective() == 1){ - depts.get(i).setEffectiveCn("是"); - }else{ - depts.get(i).setEffectiveCn("否"); + for (Power_DeptVo dept : depts) { + if (dept.getEffective() == 1) { + dept.setEffectiveCn("是"); + } else { + dept.setEffectiveCn("否"); } } } @@ -173,11 +173,11 @@ public class Power_DeptServiceImpl implements Power_DeptService { public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception { List depts = this.findSomeByMore(powerDept,request); if(null != depts && !depts.isEmpty()){ - for (int i = 0; i < depts.size(); i++) { - if(depts.get(i).getEffective() == 1){ - depts.get(i).setEffectiveCn("是"); - }else{ - depts.get(i).setEffectiveCn("否"); + for (Power_DeptVo dept : depts) { + if (dept.getEffective() == 1) { + dept.setEffectiveCn("是"); + } else { + dept.setEffectiveCn("否"); } } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_MenuServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_MenuServiceImpl.java index 9dd2a7e..aafa9ec 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_MenuServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_MenuServiceImpl.java @@ -28,8 +28,7 @@ public class Power_MenuServiceImpl implements Power_MenuService{ private Power_Sys_DictMapper sysDictMapper; @Override public List queryAllPowerMenu(String sysFlag,Integer roleId) { - List power_menus = powerMenuMapper.queryAllPowerMenu(sysFlag,roleId); - return power_menus; + return powerMenuMapper.queryAllPowerMenu(sysFlag,roleId); } /** diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_NoticeServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_NoticeServiceImpl.java index d488d75..a9c7d50 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_NoticeServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_NoticeServiceImpl.java @@ -1,11 +1,9 @@ package com.manage.service.ipml; import com.manage.dao.Power_NoticeMapper; -import com.manage.dao.Power_Sys_DictMapper; import com.manage.dao.Power_UserMapper; import com.manage.dao.Power_User_DictMapper; import com.manage.entity.Power_Notice; -import com.manage.entity.Power_Sys_Dict; import com.manage.entity.Power_User; import com.manage.service.webSocket.WsPool; import com.manage.vo.PowerTree; @@ -49,23 +47,6 @@ public class Power_NoticeServiceImpl{ @Autowired private Power_User_DictMapper userDictMapper; - /** - * @MethodName getNoticeTypeTree - * @Description: 获取通知类别树 - * @Param 无 - * @Returnt Msg - * @Author: 曾文和 - * @CreateDate: 2019-08-26 - * @UpdateUser: 曾文和 - * @UpdateDate: 2019-08-26 - * @UpdateRemark: 更新说明 - * @Version: 1.0 - */ - public List selectNoticeTypeList(Power_NoticeVo powerNotice){ - List power_notices = noticeMapper.selectNoticeTypeList(powerNotice); - return power_notices; - } - /** * @MethodName getNoticeTypeTree * @Description: 获取通知类别树 @@ -113,8 +94,7 @@ public class Power_NoticeServiceImpl{ * @Version: 1.0 */ public Power_Notice checkTypeSysFlagOrTypeSysName(String noticeTypeFlag,String noticeTypeName){ - Power_Notice powerNotice = noticeMapper.checkTypeSysFlagOrTypeSysName(noticeTypeFlag, noticeTypeName); - return powerNotice; + return noticeMapper.checkTypeSysFlagOrTypeSysName(noticeTypeFlag, noticeTypeName); } /** @@ -172,8 +152,8 @@ public class Power_NoticeServiceImpl{ if(StringUtils.isNotBlank(powerNotice.getNoticeReceive())){ String receice = powerNotice.getNoticeReceive(); Integer parentId = powerNotice.getParentId(); - Power_Notice power_notice = noticeMapper.selectByPrimaryKey(parentId); - String sysFlag = power_notice.getNoticeTypeFlag(); + Power_Notice powerNoticeTemp = noticeMapper.selectByPrimaryKey(parentId); + String sysFlag = powerNoticeTemp.getNoticeTypeFlag(); if(!"all".equals(receice)){ WsPool.sendMessageToAll(sysFlag+"_"+receice,title+STR_SPLIT+content+STR_SPLIT+powerNotice.getNoticeId()); }else{ @@ -270,8 +250,8 @@ public class Power_NoticeServiceImpl{ List userList = new ArrayList<>(); Power_NoticeVo noticeVo = new Power_NoticeVo(); noticeVo.setNoticeId(noticeTypeId); - List power_notices = noticeMapper.selectNoticeTypeList(noticeVo); - String noticeTypeFlag = power_notices.get(0).getNoticeTypeFlag(); + List powerNotices = noticeMapper.selectNoticeTypeList(noticeVo); + String noticeTypeFlag = powerNotices.get(0).getNoticeTypeFlag(); //系统管理员，全查 if(user.getRoleId() == 0){ //权限系统，全查 @@ -283,13 +263,13 @@ public class Power_NoticeServiceImpl{ } }else{ - Power_User_Dict power_user_dict = userDictMapper.selectDictIdByUserId(user.getUserId()); + Power_User_Dict powerUserDict = userDictMapper.selectDictIdByUserId(user.getUserId()); if("power".equals(noticeTypeFlag)){ //权限系统，全查该医院 - userList = userMapper.selectAllBySysId(power_user_dict.getDictId(),user.getUserName()); + userList = userMapper.selectAllBySysId(powerUserDict.getDictId(),user.getUserName()); }else{ //非权限系统，查该医院该系统用户 - userList = userMapper.selectUserListByNoticeTypeId(noticeTypeId,power_user_dict.getDictId()); + userList = userMapper.selectUserListByNoticeTypeId(noticeTypeId,powerUserDict.getDictId()); } } return userList; @@ -298,21 +278,21 @@ public class Power_NoticeServiceImpl{ public void export(Power_NoticeVo notice, String noticeIds,HttpServletResponse response,HttpServletRequest request) throws Exception { List noticeVos = new ArrayList<>(); Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - Listpower_notices = new ArrayList(); + List powerNotices = new ArrayList(); if(StringUtils.isNotBlank(noticeIds)){ //按选中id集合查 - power_notices = noticeMapper.selectAllByIds(noticeIds); + powerNotices = noticeMapper.selectAllByIds(noticeIds); }else{ //按搜索条件查 if(user.getRoleId() == 0){ - power_notices = this.noticeMapper.selectALlByPowerWithExport(null,null,notice); + powerNotices = this.noticeMapper.selectALlByPowerWithExport(null,null,notice); }else{ - power_notices = this.noticeMapper.selectALlByPowerWithExport(user.getRoleId(),user.getUserId(),notice); + powerNotices = this.noticeMapper.selectALlByPowerWithExport(user.getRoleId(),user.getUserId(),notice); } } - if(null != power_notices && !power_notices.isEmpty()){ - for (Power_NoticeVo powerNotice:power_notices){ + if(null != powerNotices && ! powerNotices.isEmpty()){ + for (Power_NoticeVo powerNotice: powerNotices){ Power_NoticeVo noticeVo1 = new Power_NoticeVo(); if(null != powerNotice.getEffective()){ BeanUtils.copyProperties(powerNotice,noticeVo1); @@ -374,9 +354,8 @@ public class Power_NoticeServiceImpl{ * @UpdateRemark: 更新说明 * @Version: 1.2.2 */ - public int getUnReadCount(Integer userId){ + public int getUnReadCount(){ //获取登陆者信息 - int unReadCount = noticeMapper.getUnReadCount(null); - return unReadCount; + return noticeMapper.getUnReadCount(null); } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java index 5cb2acd..8d66da5 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java @@ -32,7 +32,6 @@ public class Power_RoleServiceImpl implements Power_RoleService { @Override public int deleteByPrimaryKey(Integer roleId) { //将关联用户的角色id置空 - return powerRoleMapper.deleteByPrimaryKey(roleId); } @@ -82,25 +81,25 @@ public class Power_RoleServiceImpl implements Power_RoleService { @Override public List findSomeByMore(Power_RoleVo powerRole, HttpServletRequest request) { Power_UserVo powerUser1 =(Power_UserVo) request.getSession().getAttribute("CURRENT_USER"); - List power_roles = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId()); + List powerRoleList = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId()); Set perms = powerUser1.getMenus(); - if(null != power_roles && !power_roles.isEmpty()){ - for (int i = 0; i < power_roles.size(); i++) { - Integer isUpdate = 0; - Integer isDelete = 0; - for(String menu : perms){ - if("/role/update".equals(menu)){ + if(null != powerRoleList && !powerRoleList.isEmpty()){ + for (Power_RoleVo powerRoleTemp : powerRoleList) { + int isUpdate = 0; + int isDelete = 0; + for (String menu : perms) { + if ("/role/update".equals(menu)) { isUpdate = 1; } - if("/role/delete".equals(menu)){ + if ("/role/delete".equals(menu)) { isDelete = 1; } } - power_roles.get(i).setIsUpdate(isUpdate); - power_roles.get(i).setIsDelete(isDelete); + powerRoleTemp.setIsUpdate(isUpdate); + powerRoleTemp.setIsDelete(isDelete); } } - return power_roles; + return powerRoleList; } @Override @@ -114,22 +113,22 @@ public class Power_RoleServiceImpl implements Power_RoleService { Power_User powerUser1 =(Power_User) request.getSession().getAttribute("CURRENT_USER"); List roleList = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId()); if(null != roleList && !roleList.isEmpty()){ - for (int i = 0; i < roleList.size(); i++) { - if(roleList.get(i).getEffective() != null){ - if(roleList.get(i).getEffective() == 1){ - roleList.get(i).setEffectiveCn("是"); - }else{ - roleList.get(i).setEffectiveCn("否"); + for (Power_RoleVo power_roleVo : roleList) { + if (power_roleVo.getEffective() != null) { + if (power_roleVo.getEffective() == 1) { + power_roleVo.setEffectiveCn("是"); + } else { + power_roleVo.setEffectiveCn("否"); } - if(roleList.get(i).getShowRecord() == 1){ - roleList.get(i).setShowRecordCn("是"); - }else{ - roleList.get(i).setShowRecordCn("否"); + if (power_roleVo.getShowRecord() == 1) { + power_roleVo.setShowRecordCn("是"); + } else { + power_roleVo.setShowRecordCn("否"); } - if(roleList.get(i).getDownloadRecord() == 1){ - roleList.get(i).setDownloadRecordCn("是"); - }else{ - roleList.get(i).setDownloadRecordCn("否"); + if (power_roleVo.getDownloadRecord() == 1) { + power_roleVo.setDownloadRecordCn("是"); + } else { + power_roleVo.setDownloadRecordCn("否"); } } } @@ -148,12 +147,12 @@ public class Power_RoleServiceImpl implements Power_RoleService { Power_User powerUser1 =(Power_User) request.getSession().getAttribute("CURRENT_USER"); List roleList = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId()); if(null != roleList && !roleList.isEmpty()){ - for (int i = 0; i < roleList.size(); i++) { - if(roleList.get(i).getEffective() != null){ - if(roleList.get(i).getEffective() == 1){ - roleList.get(i).setEffectiveCn("是"); - }else{ - roleList.get(i).setEffectiveCn("否"); + for (Power_RoleVo power_roleVo : roleList) { + if (power_roleVo.getEffective() != null) { + if (power_roleVo.getEffective() == 1) { + power_roleVo.setEffectiveCn("是"); + } else { + power_roleVo.setEffectiveCn("否"); } } } @@ -176,8 +175,7 @@ public class Power_RoleServiceImpl implements Power_RoleService { @Override public List selectListByPower(HttpServletRequest request) { Power_User user =(Power_User) request.getSession().getAttribute("CURRENT_USER"); - List power_roles = powerRoleMapper.selectListByPower(user.getRoleId(),user.getUserId()); - return power_roles; + return powerRoleMapper.selectListByPower(user.getRoleId(),user.getUserId()); } @Override diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java index 0e9a76b..a7767c2 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_Sys_DictServiceImpl.java @@ -1,7 +1,6 @@ package com.manage.service.ipml; import com.manage.dao.Power_Sys_DictMapper; -import com.manage.entity.Power_Dept; import com.manage.entity.Power_Sys_Dict; import com.manage.entity.Power_User; import com.manage.service.Power_DeptService; @@ -14,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -97,15 +95,6 @@ public class Power_Sys_DictServiceImpl implements Power_Sys_DictService { return powerSysDictMapper.selectSysType(); } - @Override - public void export(HttpServletResponse response) throws Exception { - List powerSysDicts = this.selectList(); - String[] columnNames = { "归属ID", "科室ID","医院名称", "系统标识","系统名称","地区","医院电话","父级ID","系统分类","排序","状态","是否可编辑","创建时间", - "创建人","修改时间","修改人","备注" }; - String fileName = "dicts"; - /*ExportExcelWrapper exportExcelWrapper = new ExportExcelWrapper(); - exportExcelWrapper.exportExcel(fileName, fileName, columnNames, powerSysDicts, response, com.emr.util.ExportExcelUtil.EXCEL_FILE_2003);*/ - } @Override public List selectAll(String key) { @@ -147,28 +136,28 @@ public class Power_Sys_DictServiceImpl implements Power_Sys_DictService { List resultList = new ArrayList<>(depts.length); Collections.addAll(resultList,depts); List deptList = new ArrayList<>(); - for (int i = 0; i < deptBySysFlagList.size(); i++) { - Integer deptStr = deptBySysFlagList.get(i).getDeptId(); - if(null != deptStr){ + for (Power_Sys_Dict powerSysDictTemp : deptBySysFlagList) { + Integer deptStr = powerSysDictTemp.getDeptId(); + if (null != deptStr) { deptList.add(deptStr.toString()); } } resultList.removeAll(deptList); - if(null != resultList && !resultList.isEmpty()){ - for (int i = 0; i < resultList.size(); i++) { + if(!resultList.isEmpty()){ + for (String s : resultList) { Power_Sys_Dict dict = new Power_Sys_Dict(); - powerSysDict.setDeptId(Integer.valueOf(resultList.get(i))); - BeanUtils.copyProperties(powerSysDict,dict); + powerSysDict.setDeptId(Integer.valueOf(s)); + BeanUtils.copyProperties(powerSysDict, dict); list.add(dict); } } }else{ String[] depts = deptIds.split(","); - for (int i = 0; i < depts.length; i++) { - if(StringUtils.isNoneBlank(depts[i])){ + for (String dept : depts) { + if (StringUtils.isNoneBlank(dept)) { Power_Sys_Dict dict = new Power_Sys_Dict(); - powerSysDict.setDeptId(Integer.valueOf(depts[i])); - BeanUtils.copyProperties(powerSysDict,dict); + powerSysDict.setDeptId(Integer.valueOf(dept)); + BeanUtils.copyProperties(powerSysDict, dict); list.add(dict); } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java index 8064666..836554d 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java @@ -84,18 +84,18 @@ public class Power_UserServiceImpl implements Power_UserService { @Override public Power_UserVo selectByPrimaryKey(Integer userId) { - String power_depts = ""; + StringBuilder powerDepts = new StringBuilder(); Power_UserVo power_user = powerUserMapper.selectByPrimaryKey(userId); power_user.setUserPwd(MD5.JM(Base64.decode(power_user.getUserPwd()))); List power_depts1 = power_deptService.selectByPrimaryKeys(power_user.getDeptId()); for(int j=0;j menus = userDeptMenuMapper.validUserRoleMenu(userId,url); - if(null != menus && !menus.isEmpty()){ - return true; - }else{ - return false; - } + return null != menus && !menus.isEmpty(); } //登录的是角色0才显示所有用户信息，如果是角色-100则只显示该用户所在医院的所有用户信息， //如果是其它的则只显示该登录用户自己的用户信息 @@ -144,28 +139,25 @@ public class Power_UserServiceImpl implements Power_UserService { HttpSession session= request.getSession(); Power_UserVo powerUser1 =(Power_UserVo) session.getAttribute("CURRENT_USER"); Set perms = powerUser1.getMenus(); - if(null != powerUser1 && powerUser1.getRoleId()!=0){ + if(powerUser1.getRoleId()!=0){ powerUser.setUserId(powerUser1.getUserId()); powerUser.setRoleId(powerUser1.getRoleId()); } List someByMore = powerUserMapper.findSomeByMore(powerUser); - for(int i=0;i powerUsers = this.findSomeByMore(powerUser,request); if(null != powerUsers && !powerUsers.isEmpty()){ - for (int i = 0; i < powerUsers.size(); i++) { - if(null != powerUsers.get(i).getUserSex()){ - if(powerUsers.get(i).getUserSex() == 1){ - powerUsers.get(i).setSex("女"); - }else{ - powerUsers.get(i).setSex("男"); + for (Power_UserVo powerUser1 : powerUsers) { + if (null != powerUser1.getUserSex()) { + if (powerUser1.getUserSex() == 1) { + powerUser1.setSex("女"); + } else { + powerUser1.setSex("男"); } } - if(powerUsers.get(i).getEffective() == 1){ - powerUsers.get(i).setEffectiveCn("是"); - }else{ - powerUsers.get(i).setEffectiveCn("否"); + if (powerUser1.getEffective() == 1) { + powerUser1.setEffectiveCn("是"); + } else { + powerUser1.setEffectiveCn("否"); } } } @@ -219,18 +211,18 @@ public class Power_UserServiceImpl implements Power_UserService { public void export1(Power_UserVo powerUser,HttpServletRequest request,HttpServletResponse response) throws Exception { List powerUsers = this.findSomeByMore(powerUser,request); if(null != powerUsers && !powerUsers.isEmpty()){ - for (int i = 0; i < powerUsers.size(); i++) { - if(null != powerUsers.get(i).getUserSex()){ - if(powerUsers.get(i).getUserSex() == 1){ - powerUsers.get(i).setSex("女"); - }else{ - powerUsers.get(i).setSex("男"); + for (Power_UserVo powerUser1 : powerUsers) { + if (null != powerUser1.getUserSex()) { + if (powerUser1.getUserSex() == 1) { + powerUser1.setSex("女"); + } else { + powerUser1.setSex("男"); } } - if(powerUsers.get(i).getEffective() == 1){ - powerUsers.get(i).setEffectiveCn("是"); - }else{ - powerUsers.get(i).setEffectiveCn("否"); + if (powerUser1.getEffective() == 1) { + powerUser1.setEffectiveCn("是"); + } else { + powerUser1.setEffectiveCn("否"); } } } @@ -264,5 +256,4 @@ public class Power_UserServiceImpl implements Power_UserService { public Power_UserVo findPowerUserByUserNameAndRemark(Power_User powerUser) { return powerUserMapper.findPowerUserByUserNameAndRemark(powerUser); } - } diff --git a/power-service/src/main/java/com/manage/service/ipml/T_MenuServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/T_MenuServiceImpl.java index 58aa529..ee4d1bb 100644 --- a/power-service/src/main/java/com/manage/service/ipml/T_MenuServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/T_MenuServiceImpl.java @@ -17,7 +17,7 @@ public class T_MenuServiceImpl implements T_MenuService { @Autowired private T_MenuMapper t_menuMapper; - + @Override public T_Menu getRole() { return t_menuMapper.selectByPrimaryKey(1); } diff --git a/power-service/src/main/java/com/manage/service/webSocket/WebServer.java b/power-service/src/main/java/com/manage/service/webSocket/WebServer.java index e344f6b..f527bc0 100644 --- a/power-service/src/main/java/com/manage/service/webSocket/WebServer.java +++ b/power-service/src/main/java/com/manage/service/webSocket/WebServer.java @@ -14,17 +14,10 @@ public class WebServer extends WebSocketServer { super(new InetSocketAddress(port)); } - public WebServer(InetSocketAddress address) { - super(address); - } - @Override public void onOpen(WebSocket conn, ClientHandshake handshake) { // ws连接的时候触发的代码，onOpen中我们不做任何操作 } - public void sendMessage(String message) throws IOException { - this.session.getBasicRemote().sendText("2"); - } @Override public void onClose(WebSocket conn, int code, String reason, boolean remote) { @@ -62,19 +55,6 @@ public class WebServer extends WebSocketServer { WsPool.addUser(userName, conn); } -// public void start() { -// if( selectorthread != null ) -// throw new IllegalStateException( getClass().getName() + " can only be started once." ); -// new Thread( this ).start();; -// } - -// public static void main(String args[]){ -// WebSocketImpl.DEBUG = false; -// int port = 8887; // 端口 -// WsServer s = new WsServer(port); -// s.start(); -// } - @Override public void onStart() { } diff --git a/power-service/src/main/java/com/manage/service/webSocket/WsPool.java b/power-service/src/main/java/com/manage/service/webSocket/WsPool.java index 1d5222c..87b5395 100644 --- a/power-service/src/main/java/com/manage/service/webSocket/WsPool.java +++ b/power-service/src/main/java/com/manage/service/webSocket/WsPool.java @@ -8,16 +8,6 @@ import java.util.*; public class WsPool { private static final Map wsUserMap = new HashMap(); - /** - * 通过websocket连接获取其对应的用户 - * - * @param conn - * @return - */ - public static String getUserByWs(WebSocket conn) { - return wsUserMap.get(conn); - } - /** * 根据userName获取WebSocket,这是一个list,此处取第一个 * 因为有可能多个websocket对应一个userName（但一般是只有一个，因为在close方法中，我们将失效的websocket连接去除了） @@ -44,20 +34,6 @@ public class WsPool { wsUserMap.put(conn, userName); // 添加连接 } - /** - * 获取所有连接池中的用户，因为set是不允许重复的，所以可以得到无重复的user数组 - * - * @return - */ - public static Collection getOnlineUser() { - List setUsers = new ArrayList(); - Collection setUser = wsUserMap.values(); - for (String u : setUser) { - setUsers.add(u); - } - return setUsers; - } - /** * 移除连接池中的连接 * diff --git a/power-service/target/classes/com/manage/App.class b/power-service/target/classes/com/manage/App.class deleted file mode 100644 index a8ec112..0000000 Binary files a/power-service/target/classes/com/manage/App.class and /dev/null differ diff --git a/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelJudgeMethod.class b/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelJudgeMethod.class index 0940a36..0495984 100644 Binary files a/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelJudgeMethod.class and b/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelJudgeMethod.class differ diff --git a/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelUtil.class b/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelUtil.class index 6ce77f3..c70dc14 100644 Binary files a/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelUtil.class and b/power-service/target/classes/com/manage/service/ImportExcel/ImportExcelUtil.class differ diff --git a/power-service/target/classes/com/manage/service/Power_Sys_DictService.class b/power-service/target/classes/com/manage/service/Power_Sys_DictService.class index f62b0e2..0678948 100644 Binary files a/power-service/target/classes/com/manage/service/Power_Sys_DictService.class and b/power-service/target/classes/com/manage/service/Power_Sys_DictService.class differ diff --git a/power-service/target/classes/com/manage/service/cache/CacheManager.class b/power-service/target/classes/com/manage/service/cache/CacheManager.class index 8cd842e..3b4e1c7 100644 Binary files a/power-service/target/classes/com/manage/service/cache/CacheManager.class and b/power-service/target/classes/com/manage/service/cache/CacheManager.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/LogServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/LogServiceImpl.class index 64b5053..b44a182 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/LogServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/LogServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/PageServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/PageServiceImpl.class index 3a87d8e..a92363e 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/PageServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/PageServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/PowerServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/PowerServiceImpl.class index 109cae4..61073aa 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/PowerServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/PowerServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class index f0dcde3..05435cd 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/Power_MenuServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_MenuServiceImpl.class index 649a7e8..47aa728 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/Power_MenuServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_MenuServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/Power_NoticeServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_NoticeServiceImpl.class index 6bfe6c1..234db60 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/Power_NoticeServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_NoticeServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/Power_RoleServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_RoleServiceImpl.class index 22563b6..c4fabcd 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/Power_RoleServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_RoleServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/Power_Sys_DictServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_Sys_DictServiceImpl.class index 1216f1b..c00d998 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/Power_Sys_DictServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_Sys_DictServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class index 0967457..bc0182a 100644 Binary files a/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class differ diff --git a/power-service/target/classes/com/manage/service/webSocket/WebServer.class b/power-service/target/classes/com/manage/service/webSocket/WebServer.class index 2a59939..31b928e 100644 Binary files a/power-service/target/classes/com/manage/service/webSocket/WebServer.class and b/power-service/target/classes/com/manage/service/webSocket/WebServer.class differ diff --git a/power-service/target/classes/com/manage/service/webSocket/WsPool.class b/power-service/target/classes/com/manage/service/webSocket/WsPool.class index 1e8099f..87cbb46 100644 Binary files a/power-service/target/classes/com/manage/service/webSocket/WsPool.class and b/power-service/target/classes/com/manage/service/webSocket/WsPool.class differ diff --git a/power_web/pom.xml b/power_web/pom.xml deleted file mode 100644 index eebcea6..0000000 --- a/power_web/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - power - com.manage - 1.0-SNAPSHOT - - 4.0.0 - - power_web - war - - power_web Maven Webapp - - 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!

- -