完善优化代码(可能出错)

master
zengwh 5 years ago
parent 4e5f0d8148
commit 615b187779

@ -9,10 +9,8 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<modules>
<module>power-api</module>
<module>power-dao</module>
<module>power-service</module>
<module>power_web</module>
<module>power-admin</module>
<module>power-foundaton</module>
</modules>
@ -34,6 +32,7 @@
<mybatis.version>3.4.6</mybatis.version>
<mybatis.spring.version>1.3.2</mybatis.spring.version>
<mysql.version>5.1.32</mysql.version>
<slf4j.version>1.6.4</slf4j.version>
<jackson.version>2.9.4</jackson.version>
<druid.version>1.0.9</druid.version>
<httpclient.version>4.3.5</httpclient.version>
@ -90,6 +89,12 @@
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<!-- 日志处理 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- Mybatis -->
<dependency>
<groupId>org.mybatis</groupId>

@ -122,6 +122,11 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
<!--日志处理-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
</dependencies>
<build>
<finalName>power</finalName>

@ -8,6 +8,7 @@ import com.manage.entity.Power_User;
import com.manage.service.cache.CacheManager;
import com.manage.service.ImportExcel.ImportExcelUtil;
import com.manage.service.Power_DeptService;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.Msg;
import com.manage.util.PageHelper;
import com.manage.vo.ImportExcelEntity;
@ -31,7 +32,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.text.SimpleDateFormat;
import java.util.*;
@ -67,6 +67,7 @@ public class DeptController {
pageHelper.setRows(list);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
e.printStackTrace();
CacheManager.addExcCount("exc");
}
@ -87,21 +88,6 @@ public class DeptController {
return "deptDir/dept";
}
/**
* @Date 2020-01-02
* @Author zwh
* @Description
* */
@OptionalLog(module = "查看",methods = "部门管理页面")
@RequiresPermissions(value="/dept/bloodUI")
@RequestMapping("/bloodUI")
public String bloodUI(HttpServletRequest request, Model model){
Power_User powerUser1 =(Power_User) request.getSession().getAttribute("CURRENT_USER");
model.addAttribute("user",powerUser1);
CacheManager.addExcCount("noExc");
return "deptDir/blood";
}
/**
* @Date 2019-4-22
* @Author ly
@ -115,6 +101,7 @@ public class DeptController {
CacheManager.addExcCount("noExc");
return Msg.success().add("list",deptList);
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
@ -129,10 +116,11 @@ public class DeptController {
@ResponseBody
public Power_Dept selectDept(Integer deptId) {
try {
Power_Dept power_dept = powerDeptService.selectByPrimaryKey(deptId);
Power_Dept powerDept = powerDeptService.selectByPrimaryKey(deptId);
CacheManager.addExcCount("noExc");
return power_dept;
return powerDept;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -146,19 +134,13 @@ public class DeptController {
* */
@RequestMapping("/checkDeptName")
@ResponseBody
public Msg checkDeptName(String deptName,Integer dictId) {
try {
List<Power_Dept> power_dept = powerDeptService.checkDeptName(deptName,dictId);
if(power_dept != null && !power_dept.isEmpty()){
return Msg.fail("科室名已存在");
}else{
CacheManager.addExcCount("noExc");
return Msg.success();
}
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("验证失败,请联系系统管理员!");
public Msg checkDeptName(String deptName,Integer dictId) throws Exception{
List<Power_Dept> powerDept = powerDeptService.checkDeptName(deptName,dictId);
if(powerDept != null && !powerDept.isEmpty()){
return Msg.fail("科室名已存在");
}else{
CacheManager.addExcCount("noExc");
return Msg.success();
}
}
@ -177,8 +159,8 @@ public class DeptController {
Integer id = 1;
Integer parentId = null;
if(null != list && !list.isEmpty()){
for (int i = 0;i < list.size();i++){
hospitalMap.put(list.get(i).getDictId(),list.get(i).getHospitalName());
for (Power_DeptVo powerDeptVo : list) {
hospitalMap.put(powerDeptVo.getDictId(), powerDeptVo.getHospitalName());
}
for (Map.Entry<Integer, String> entry : hospitalMap.entrySet()) {
//医院层
@ -191,12 +173,12 @@ public class DeptController {
parentId = id;
id++;
//科室层
for (int i = 0;i < list.size();i++){
if(entry.getKey().equals(list.get(i).getDictId())){
for (Power_DeptVo powerDeptVo : list) {
if (entry.getKey().equals(powerDeptVo.getDictId())) {
PowerTree tree2 = new PowerTree();
tree2.setId(id);
tree2.setSelfId(list.get(i).getDeptId());
tree2.setName(list.get(i).getDeptName());
tree2.setSelfId(powerDeptVo.getDeptId());
tree2.setName(powerDeptVo.getDeptName());
tree2.setParentId(parentId);
treeList.add(tree2);
id++;
@ -209,6 +191,7 @@ public class DeptController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -223,22 +206,15 @@ public class DeptController {
@RequiresPermissions(value="/dept/add")
@RequestMapping("/add")
@ResponseBody
public Msg add(Power_Dept powerDept){
try {
List<Power_Dept> power_dept = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId());
if(null == power_dept || power_dept.isEmpty()){
powerDeptService.insertSelective(powerDept);
CacheManager.addExcCount("noExc");
return Msg.success();
}else{
return Msg.fail("科室名已存在!");
}
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("添加出错了,请联系系统管理员!");
public Msg add(Power_Dept powerDept) throws Exception{
List<Power_Dept> powerDeptList = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId());
if(null == powerDeptList || powerDeptList.isEmpty()){
powerDeptService.insertSelective(powerDept);
CacheManager.addExcCount("noExc");
return Msg.success();
}else{
return Msg.fail("科室名已存在!");
}
}
/**
* @Date 2019-4-25
@ -249,23 +225,15 @@ public class DeptController {
@RequiresPermissions(value="/dept/update")
@RequestMapping("/update")
@ResponseBody
public Msg update(Power_Dept powerDept,HttpServletRequest request){
try {
List<Power_Dept> power_dept = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId());
if(null != power_dept && !power_dept.isEmpty() && !power_dept.get(0).getDeptId().equals(powerDept.getDeptId())){
return Msg.fail("科室名已存在!");
}else{
powerDeptService.updateByPrimaryKeySelective(powerDept,request);
CacheManager.addExcCount("noExc");
return Msg.success();
}
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("修改出错了,请联系系统管理员!");
public Msg update(Power_Dept powerDept,HttpServletRequest request) throws Exception{
List<Power_Dept> powerDeptList = powerDeptService.checkDeptName(powerDept.getDeptName(),powerDept.getDictId());
if(null != powerDeptList && !powerDeptList.isEmpty() && !powerDeptList.get(0).getDeptId().equals(powerDept.getDeptId())){
return Msg.fail("科室名已存在!");
}else{
powerDeptService.updateByPrimaryKeySelective(powerDept,request);
CacheManager.addExcCount("noExc");
return Msg.success();
}
}
/**
* @Date 2019-4-25
@ -276,16 +244,10 @@ public class DeptController {
@RequiresPermissions(value="/dept/delete")
@RequestMapping("/delete")
@ResponseBody
public Msg delete(Integer deptId){
try {
CacheManager.addExcCount("noExc");
powerDeptService.deleteByPrimaryKey(deptId);
return Msg.success();
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
}
public Msg delete(Integer deptId) throws Exception{
CacheManager.addExcCount("noExc");
powerDeptService.deleteByPrimaryKey(deptId);
return Msg.success();
}
/**
* @Date 2019-4-29
@ -300,46 +262,11 @@ public class DeptController {
powerDeptService.export(powerDept,request,response);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
}
}
/**
* @Date 2019-4-29
* @Author ly
* @Description Excel
* */
@OptionalLog(module = "导出excel",methods = "部门管理")
@RequiresPermissions(value="/dept/exportBlood")
@RequestMapping("/exportBlood")
public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response){
try {
powerDeptService.exportBlood(powerDept,request,response);
CacheManager.addExcCount("noExc");
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
}
}
/**
* @Date 2019-4-22
* @Author ly
* @Description id
* */
@RequestMapping("/findById")
@ResponseBody
public List<Power_Dept>findById(String dept_ids){
try {
List<Power_Dept>deptList = powerDeptService.selectByPrimaryKeys(dept_ids);
CacheManager.addExcCount("noExc");
return deptList;
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
}
}
/**
* @Date 2019-08-06
@ -348,16 +275,10 @@ public class DeptController {
* */
@RequestMapping("/selectDeptByDictId")
@ResponseBody
public Msg selectDeptByDictId(Integer dictId){
try {
List<Power_DeptVo> 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<Power_DeptVo> depts = powerDeptService.selectDeptByDictId(dictId,null);
CacheManager.addExcCount("noExc");
return Msg.success().add("depts",depts);
}
/**
@ -370,7 +291,6 @@ public class DeptController {
@RequestMapping(value="/importExcel",method = {RequestMethod.POST})
@ResponseBody
public ResponseEntity<String> importExcel(HttpServletRequest request){
OutputStream os = null;
HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.setContentType(new MediaType("text","html", Charset.forName("UTF-8")));
try {
@ -409,17 +329,10 @@ public class DeptController {
}
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
//抛异常
return new ResponseEntity<String>(e.getMessage(), responseHeaders, HttpStatus.OK);
}finally {
if(os != null){
try {
os.close();
}catch (Exception e){
e.printStackTrace();
}
}
}
}
}

@ -0,0 +1,24 @@
package com.manage.controller;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
/**
* @ProjectName:
* @Description:
* @Param
* @Return
* @Author:
* @CreateDate: 2020/6/10 10:59
* @UpdateUser:
* @UpdateDate: 2020/6/10 10:59
* @UpdateRemark:
* @Version: 1.0
*/
public class ExceptionUtils {
public static String getExceptionStr(Exception e){
ByteArrayOutputStream baos = new ByteArrayOutputStream();
e.printStackTrace(new PrintStream(baos));
return baos.toString();
}
}

@ -2,6 +2,7 @@ package com.manage.controller;
import com.manage.service.cache.CacheManager;
import com.manage.service.ImportExcel.ImportExcelUtil;
import com.manage.util.ExceptionPrintUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.stereotype.Controller;
@ -42,6 +43,7 @@ public class ExportExcelController {
workbook.write(os);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
}finally {

@ -12,6 +12,7 @@ import com.manage.service.cache.CacheManager;
import com.manage.service.ipml.Power_NoticeServiceImpl;
import com.manage.service.webSocket.WsPool;
import com.manage.util.DateUtils;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.Msg;
import com.manage.vo.*;
import org.apache.commons.lang3.StringUtils;
@ -76,37 +77,31 @@ public class FontController {
*/
@RequestMapping(value = "getMenusByUserIdAndSysFlag",method = RequestMethod.GET)
@ResponseBody
public Msg getMenusByUserIdAndSysFlag(String userName,String sysFlag,Integer userId,Integer roleId,Integer sysId,Integer hospitalId){
try {
if(StringUtils.isNotBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId == null && hospitalId == null){
return Msg.fail("查询复杂,数据大,暂不支持只带sysFlag参数查询");
}
if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId != null && hospitalId == null){
return Msg.fail("查询复杂,数据大,暂不支持只带sysId参数查询");
}
if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId == null && hospitalId != null){
return Msg.fail("查询复杂,数据大,暂不支持只带hospitalId参数查询");
}
if(StringUtils.isNotBlank(userName)){
List<Power_User> 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<Power_User> 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<User_Dept_Menu> 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<User_Dept_Menu> 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<Power_Notice> 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<Power_Notice> 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<User> list = new ArrayList<>();
if(StringUtils.isNoneBlank(userName)){
List<Power_User> 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<User> list = new ArrayList<>();
if(StringUtils.isNoneBlank(userName)){
List<Power_User> users = userMapper.checkUserName(userName);
if(null != users && !users.isEmpty()){
Integer roleId = users.get(0).getRoleId();
if(roleId == 0){
list = userMapper.selectUserIdAndUserNameList(null);
}else{
list = userMapper.selectUserIdAndUserNameList(users.get(0).getUserId());
}
}else{
return Msg.fail("用户名不能为空");
}
CacheManager.addExcCount("noExc");
return Msg.success().add("userList",list);
}catch(Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
}else{
return Msg.fail("用户名不能为空");
}
CacheManager.addExcCount("noExc");
return Msg.success().add("userList",list);
}
/**
@ -260,26 +245,21 @@ public class FontController {
*/
@RequestMapping(value = "checkToken",method = RequestMethod.POST)
@ResponseBody
public Msg checkToken(String token){
try {
if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ) {
token = MD5.JM(Base64.decode(token));
Cache cache = CacheManager.getCacheInfo(token);
if (cache == null) {
return Msg.fail("token已过期或不存在");
}
//更新过期时间
Power_UserVo user = (Power_UserVo) cache.getValue();
String date = String.valueOf(DateUtils.getDate());
CacheManager.putCache(token,new Cache(date,user,TOKEN_EXPIRE_TIME));
}else{
return Msg.fail("token不能为空");
public Msg checkToken(String token) throws Exception{
if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ) {
token = MD5.JM(Base64.decode(token));
Cache cache = CacheManager.getCacheInfo(token);
if (cache == null) {
return Msg.fail("token已过期或不存在");
}
return Msg.success();
}catch(Exception e){
e.printStackTrace();
return Msg.fail(e.getMessage());
//更新过期时间
Power_UserVo user = (Power_UserVo) cache.getValue();
String date = String.valueOf(DateUtils.getDate());
CacheManager.putCache(token,new Cache(date,user,TOKEN_EXPIRE_TIME));
}else{
return Msg.fail("token不能为空");
}
return Msg.success();
}
/**
@ -297,55 +277,49 @@ public class FontController {
*/
@RequestMapping(value = "getUserByToken",method = RequestMethod.POST)
@ResponseBody
public Msg getMenuListByToken(String token,String sysFlag){
try {
if(StringUtils.isBlank(token)){
return Msg.fail("token不能为空!");
}
if(StringUtils.isBlank(sysFlag)){
return Msg.fail("sysFlag不能为空!");
}
token = MD5.JM(Base64.decode(token));
Cache cacheInfo = CacheManager.getCacheInfo(token);
Power_UserVo user = (Power_UserVo) cacheInfo.getValue();
if(null != user){
List<User_Dept_Menu> menuList = user.getMenuList();
List<User_Dept_Menu> list = new ArrayList<>();
Set<String> 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<User_Dept_Menu> menuList = user.getMenuList();
List<User_Dept_Menu> list = new ArrayList<>();
Set<String> menus = new TreeSet<>();
if(null != menuList && !menuList.isEmpty()){
for (int i = 0; i < menuList.size(); i++) {
String menuSysFlag = menuList.get(i).getSysFlag();
if(StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)){
list.add(menuList.get(i));
if(StringUtils.isNotBlank(menuList.get(i).getMethod())){
menus.add(menuList.get(i).getMenuUrl());
}
}
}
user.setMenuList(list);
user.setMenus(menus);
UserVo userVo = new UserVo();
BeanUtils.copyProperties(user,userVo);
//查询用户集合
List<User> 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<User> userList = new ArrayList<>();
Integer roleId = userVo.getRoleId();
if(roleId == 0){
userList = userMapper.selectUserIdAndUserNameList(null);
}else{
return Msg.fail("token已失效");
userList = userMapper.selectUserIdAndUserNameList(userVo.getUserId());
}
}catch(Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
//设置用户集合
userVo.setUserList(userList);
CacheManager.addExcCount("noExc");
return Msg.success().add("user",userVo);
}else{
return Msg.fail("token已失效");
}
}
@ -364,34 +338,28 @@ public class FontController {
*/
@RequestMapping(value = "getMenuByToken",method = RequestMethod.POST)
@ResponseBody
public Msg getMenuByToken(String token,String sysFlag){
try {
if(StringUtils.isBlank(token)){
return Msg.fail("token不能为空!");
}
if(StringUtils.isBlank(sysFlag)){
return Msg.fail("sysFlag不能为空!");
}
token = MD5.JM(Base64.decode(token));
Cache cacheInfo = CacheManager.getCacheInfo(token);
Power_UserVo user = (Power_UserVo) cacheInfo.getValue();
List<User_Dept_Menu> menuList = user.getMenuList();
List<User_Dept_Menu> 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<User_Dept_Menu> menuList = user.getMenuList();
List<User_Dept_Menu> list = new ArrayList<>();
if(null != menuList && !menuList.isEmpty()){
for (int i = 0; i < menuList.size(); i++) {
String menuSysFlag = menuList.get(i).getSysFlag();
if(StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)){
list.add(menuList.get(i));
}
}
CacheManager.addExcCount("noExc");
return Msg.success().add("list",list);
}catch(Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
}
CacheManager.addExcCount("noExc");
return Msg.success().add("list",list);
}
/**
@ -409,68 +377,63 @@ public class FontController {
*/
@RequestMapping(value = "getToken",method = RequestMethod.POST)
@ResponseBody
public Msg getToken(String userName,String password){
try {
if(StringUtils.isBlank(userName)){
return Msg.fail("用户名不能为空");
}
if(StringUtils.isBlank(password)){
return Msg.fail("密码不能为空");
}
Power_User user = new Power_User();
user.setUserName(userName);
user.setRemark(password);
Power_UserVo userVo = userService.findPowerUserByUserNameAndRemark(user);
if(null == userVo){
return Msg.fail("用户名或密码不正确");
}
String date = String.valueOf(DateUtils.getDate());
String token = Base64.encode(MD5.KL(date));
public Msg getToken(String userName,String password) throws Exception{
if(StringUtils.isBlank(userName)){
return Msg.fail("用户名不能为空");
}
if(StringUtils.isBlank(password)){
return Msg.fail("密码不能为空");
}
Power_User user = new Power_User();
user.setUserName(userName);
user.setRemark(password);
Power_UserVo userVo = userService.findPowerUserByUserNameAndRemark(user);
if(null == userVo){
return Msg.fail("用户名或密码不正确");
}
String date = String.valueOf(DateUtils.getDate());
String token = Base64.encode(MD5.KL(date));
List<Power_Menu> list = null;
List<User_Dept_Menu> menuList = new ArrayList<>();
Set<String> 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<Power_Menu> list = null;
List<User_Dept_Menu> menuList = new ArrayList<>();
Set<String> menus = new TreeSet<>();
if (userVo.getRoleId().equals(0) || userVo.getRoleId().equals(-100)) {
list = powerMenuService.queryAllPowerMenu(null,userVo.getRoleId());
} else {
list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(),null);
}
if(null != list && !list.isEmpty()){
for (Power_Menu powerMenu : list) {
User_Dept_Menu deptMenu = new User_Dept_Menu();
String menuUrl = powerMenu.getMenuUrl();
if (StringUtils.isNotBlank(menuUrl)) {
BeanUtils.copyProperties(powerMenu, deptMenu);
deptMenu.setMethodParent(powerMenu.getParentId());
menuList.add(deptMenu);
}
if (StringUtils.isNotBlank(powerMenu.getMethod())) {
menus.add(powerMenu.getMenuUrl());
}
}
userVo.setMenuList(menuList);
userVo.setMenus(menus);
}
userVo.setMenuList(menuList);
userVo.setMenus(menus);
//设置科室
StringBuilder power_depts = new StringBuilder();
List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId());
for(int j=0;j<power_depts1.size();j++){
if(j<power_depts1.size()-1){
power_depts.append(power_depts1.get(j).getDeptName()+",");
}else{
power_depts.append(power_depts1.get(j).getDeptName());
}
//设置科室
StringBuilder powerDepts = new StringBuilder();
List<Power_Dept> powerDeptList = power_deptService.selectByPrimaryKeys(userVo.getDeptId());
for(int j = 0;j < powerDeptList.size();j++){
if(j<powerDeptList.size()-1){
powerDepts.append(powerDeptList.get(j).getDeptName()).append(",");
}else{
powerDepts.append(powerDeptList.get(j).getDeptName());
}
userVo.setRemark(power_depts.toString());
//移除缓存
CacheManager.removeCacheByObject(userVo);
CacheManager.putCache(date,new Cache(date,userVo,TOKEN_EXPIRE_TIME));
return Msg.success().add("token",token);
}catch(Exception e){
e.printStackTrace();
return Msg.fail(e.getMessage());
}
userVo.setRemark(powerDepts.toString());
//移除缓存
CacheManager.removeCacheByObject(userVo);
CacheManager.putCache(date,new Cache(date,userVo,TOKEN_EXPIRE_TIME));
return Msg.success().add("token",token);
}
/**
@ -488,23 +451,17 @@ public class FontController {
*/
@RequestMapping("notice/getUnReadCount")
@ResponseBody
public Msg getUnReadCount(Integer userId){
try {
if(null == userId){
return Msg.fail("用户id不能为空");
}
Power_UserVo userVo = userMapper.selectByPrimaryKey(userId);
if(null == userVo){
return Msg.fail("用户id不存在");
}
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(Integer userId) throws Exception{
if(null == userId){
return Msg.fail("用户id不能为空");
}
Power_UserVo userVo = userMapper.selectByPrimaryKey(userId);
if(null == userVo){
return Msg.fail("用户id不存在");
}
int unReadCount = noticeService.getUnReadCount(userId);
CacheManager.addExcCount("noExc");
return Msg.success().add("unReadCount",unReadCount);
}
/**
@ -521,22 +478,16 @@ public class FontController {
*/
@RequestMapping("checkUserName")
@ResponseBody
public Msg checkUserName(String userName){
try {
if(StringUtils.isBlank(userName)){
return Msg.fail("工号不能为空!");
}
//查询用户
List<Power_User> 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<Power_User> user = userMapper.checkUserName(userName);
if(null == user || user.isEmpty()){
return Msg.fail("该工号不存在!");
}
return Msg.success().add("user",user);
}
/**
@ -567,6 +518,7 @@ public class FontController {
}
}
}catch (Exception e){
ExceptionPrintUtil.printException(e);
e.printStackTrace();
}
}

@ -0,0 +1,71 @@
package com.manage.controller;
/**
* @ProjectName:
* @Description:
* @Param
* @Return
* @Author:
* @CreateDate: 2020/5/15 16:14
* @UpdateUser:
* @UpdateDate: 2020/5/15 16:14
* @UpdateRemark:
* @Version: 1.0
*/
import com.alibaba.fastjson.support.spring.FastJsonJsonView;
import com.manage.util.ExceptionPrintUtil;
import org.apache.log4j.Logger;
import org.springframework.validation.BindException;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import java.util.HashMap;
import java.util.Map;
@ControllerAdvice
public class GlobalExceptionHandler {
private static Logger log = Logger.getLogger("errorMsg");
@ExceptionHandler(value = Exception.class)//指定拦截的异常
public ModelAndView errorHandler(Exception e) {
return returnMv(e, "服务器出错了,请联系系统管理员");
}
@ExceptionHandler(value = RuntimeException.class)//指定拦截的异常
public ModelAndView runtimeHandler(Exception e) {
return returnMv(e, "服务器出错了,请联系系统管理员");
}
@ExceptionHandler(BindException.class)
@ResponseBody
public Map<String, Object> bindErrHandler(BindException e) {
Map<String,Object> map = new HashMap<String, Object>(3) {{
put("code", "500");
put("msg", "参数有误");
BindingResult bindingResult = e.getBindingResult();
put("fieldErrors", new HashMap<String, String>(bindingResult.getErrorCount()) {{
bindingResult.getFieldErrors().forEach(fieldError -> put(fieldError.getField(), fieldError.getDefaultMessage()));
}});
}};
log.error(map.toString());
return map;
}
private ModelAndView returnMv(Exception e, String msg) {
ModelAndView mv = new ModelAndView();
/* 使用FastJson提供的FastJsonJsonView视图返回不需要捕获异常 */
FastJsonJsonView view = new FastJsonJsonView();
Map<String, Object> 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;
}
}

@ -6,6 +6,7 @@ package com.manage.controller; /**
import com.manage.annotation.OptionalLog;
import com.manage.entity.Power_Log;
import com.manage.service.LogService;
import com.manage.util.ExceptionPrintUtil;
import org.apache.commons.lang3.CharUtils;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
@ -60,9 +61,8 @@ public class LogAopAction {
Method method = null;
try {
method = target.getClass().getMethod(methodName, parameterTypes);
} catch (NoSuchMethodException e1) {
e1.printStackTrace();
} catch (SecurityException e1) {
} catch (NoSuchMethodException | SecurityException e1) {
ExceptionPrintUtil.printException(e1);
e1.printStackTrace();
}
if (null != method) {
@ -77,13 +77,13 @@ public class LogAopAction {
Map<String,String[]> newmap = new HashMap<String,String[]>();
for(Map.Entry<String, String[]> 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<values.length;i++){
String value = values[i];
value = new String(value.getBytes("iso8859-1"),request.getCharacterEncoding());
@ -95,7 +95,7 @@ public class LogAopAction {
}
//对象字段转数据库字段
public static String propertyToField(String property) {
private static String propertyToField(String property) {
if (StringUtils.isEmpty(property)) {
return "";
}
@ -104,14 +104,14 @@ public class LogAopAction {
}
char[] chars = property.toCharArray();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < chars.length; i++) {
char c = chars[i];
if (i == 0) {
sb.append(StringUtils.lowerCase(CharUtils.toString(c)));
} else {
if (CharUtils.isAsciiAlphaUpper(c)) {
sb.append("_" + StringUtils.lowerCase(CharUtils.toString(c)));
sb.append("_").append(StringUtils.lowerCase(CharUtils.toString(c)));
} else {
sb.append(c);
}
@ -180,6 +180,7 @@ public class LogAopAction {
// 添加到数据库
logService.insert(logBo);
} catch (Exception e) {
ExceptionPrintUtil.printException(e);
e.printStackTrace();
throw new RuntimeException();
}

@ -92,16 +92,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 +109,16 @@ public class LoginController {
user.setMenus(menus);
//设置科室
StringBuilder power_depts = new StringBuilder();
List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId());
for(int j=0;j<power_depts1.size();j++){
if(j<power_depts1.size()-1){
power_depts.append(power_depts1.get(j).getDeptName()+",");
StringBuilder powerDepts = new StringBuilder();
List<Power_Dept> powerDeptList = power_deptService.selectByPrimaryKeys(user.getDeptId());
for(int j=0;j<powerDeptList.size();j++){
if(j<powerDeptList.size()-1){
powerDepts.append(powerDeptList.get(j).getDeptName()).append(",");
}else{
power_depts.append(power_depts1.get(j).getDeptName());
powerDepts.append(powerDeptList.get(j).getDeptName());
}
}
user.setRemark(power_depts.toString());
user.setRemark(powerDepts.toString());
//设置进缓存
CacheManager.putCache(date,new Cache(date,user,TOKEN_EXPIRE_TIME));
@ -145,6 +145,7 @@ public class LoginController {
request.setAttribute("msg", "用户名或密码不正确");
}
}catch (Exception e){
ExceptionPrintUtil.printException(e);
e.printStackTrace();
CacheManager.addExcCount("exc");
}

@ -12,6 +12,7 @@ import com.manage.service.cache.Cache;
import com.manage.service.cache.CacheManager;
import com.manage.service.ipml.PageServiceImpl;
import com.manage.service.ipml.Power_NoticeServiceImpl;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.Msg;
import com.manage.vo.Echarts;
import com.manage.vo.Power_UserVo;
@ -59,19 +60,18 @@ public class PageController {
private LogService logService;
@Value("${TOKEN_EXPIRE_TIME}")
private long TOKEN_EXPIRE_TIME;
@Autowired
private Power_MenuService powerMenuService;
@RequestMapping(value = "logout")
public String logout(HttpSession session,String token){
try {
session.invalidate();
token = MD5.JM(Base64.decode(token));
Cache cache = CacheManager.getCacheInfo(token);
if(cache != null){
//CacheManager.removeCacheByObject((Power_UserVo)cache.getValue());
}
/*if(cache != null){
CacheManager.removeCacheByObject((Power_UserVo)cache.getValue());
}*/
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
e.printStackTrace();
CacheManager.addExcCount("exc");
}
@ -79,7 +79,6 @@ public class PageController {
}
@RequestMapping(value = "index")
public String index(Model model,HttpServletRequest request){
Power_UserVo user =(Power_UserVo)request.getSession().getAttribute("CURRENT_USER");
model.addAttribute("WEBSOCKET_URLHEAD",WEBSOCKET_URLHEAD);
model.addAttribute("STR_SPLIT",STR_SPLIT);
CacheManager.addExcCount("noExc");
@ -121,25 +120,26 @@ public class PageController {
log.setLogTitle("登录");
log.setLogContent("用户登录成功");
log.setCreater(powerUser.getUserName());
logService.insert(log);
//修改该通知为已读
if(null != noticeId && noticeId != -1){
try {
//查询系统权限
List<Power_Sys_Dict> sysList = new ArrayList<>();
try {
logService.insert(log);
//修改该通知为已读
if(null != noticeId && noticeId != -1){
powerNoticeService.updateNoticeReadFlag(noticeId);
CacheManager.addExcCount("noExc");
}catch (Exception e){
e.printStackTrace();
CacheManager.addExcCount("exc");
}
}
//查询当前用户
Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER");
//查询系统权限
List<Power_Sys_Dict> sysList = new ArrayList<>();
if(user.getRoleId() == 0){
sysList = sysDictMapper.selectSysFlagsByUserId(null,null);
}else{
sysList = sysDictMapper.selectSysFlagsByUserId(user.getUserId(),user.getRoleId());
//查询当前用户
Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER");
if(user.getRoleId() == 0){
sysList = sysDictMapper.selectSysFlagsByUserId(null,null);
}else{
sysList = sysDictMapper.selectSysFlagsByUserId(user.getUserId(),user.getRoleId());
}
}catch (Exception e){
ExceptionPrintUtil.printException(e);
e.printStackTrace();
CacheManager.addExcCount("exc");
}
int power = 0;
int emr_medical_record = 0;
@ -181,26 +181,26 @@ public class PageController {
}
}
}
for (int i = 0; i < sysList.size(); i++) {
String sysFlag = sysList.get(i).getSysFlag();
if(StringUtils.isNotBlank(sysFlag)){
if("power".equals(sysFlag)){
for (Power_Sys_Dict powerSysDict : sysList) {
String sysFlag = powerSysDict.getSysFlag();
if (StringUtils.isNotBlank(sysFlag)) {
if ("power".equals(sysFlag)) {
power = 1;
continue;
}
if("emr_medical_record".equals(sysFlag)){
if ("emr_medical_record".equals(sysFlag)) {
emr_medical_record = 1;
continue;
}
if("emr_record".equals(sysFlag)){
if ("emr_record".equals(sysFlag)) {
emr_record = 1;
continue;
}
if("emr_apply_copy".equals(sysFlag)){
if ("emr_apply_copy".equals(sysFlag)) {
emr_apply_copy = 1;
continue;
}
if("emr_files".equals(sysFlag)){
if ("emr_files".equals(sysFlag)) {
emr_files = 1;
continue;
}
@ -252,15 +252,12 @@ public class PageController {
try {
//无异常
Integer noExc = CacheManager.getExcCount("noExc");
String valueArr1[] = {noExc.toString()};
String[] valueArr1 = {noExc.toString()};
Echarts echarts1 = new Echarts("无异常",null,valueArr1);
//异常
Integer exc = CacheManager.getExcCount("exc");
if(null == exc){
exc = 0;
}
String valueArr2[] = {exc.toString()};
String[] valueArr2 = {exc.toString()};
Echarts echarts2 = new Echarts("异常",null,valueArr2);
//锁定
@ -268,7 +265,7 @@ public class PageController {
if(null == effectiveCount){
effectiveCount = 0;
}
String valueArr3[] = {effectiveCount.toString()};
String[] valueArr3 = {effectiveCount.toString()};
Echarts echarts3 = new Echarts("锁定",null,valueArr3);
list.add(echarts1);

@ -68,9 +68,7 @@ public class PermissionsController {
Method method = null;
try {
method = target.getClass().getMethod(methodName, parameterTypes);
} catch (NoSuchMethodException e1) {
e1.printStackTrace();
} catch (SecurityException e1) {
} catch (NoSuchMethodException | SecurityException e1) {
e1.printStackTrace();
}
@ -85,7 +83,7 @@ public class PermissionsController {
if (user.getRoleId() == 0 && user.getRoleId() != -100) {
object = pjp.proceed();
}else{
Boolean flag = false;
boolean flag = false;
Set<String> menus = user.getMenus();
if (null != menus && !menus.isEmpty()) {
for (String menuUrl : menus) {

@ -5,6 +5,7 @@ import com.manage.annotation.RequiresPermissions;
import com.manage.dao.Power_LogMapper;
import com.manage.service.cache.CacheManager;
import com.manage.service.LogService;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.ExportExcelUtil;
import com.manage.util.Msg;
import com.manage.util.PageHelper;
@ -13,7 +14,6 @@ import com.manage.vo.Power_UserVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@ -61,7 +61,7 @@ public class Power_LogController {
@OptionalLog(module = "查看",methods = "日志管理页面")
@RequiresPermissions("/otherManage/backupDatabase")
@RequestMapping("backupDatabase")
public String backupDatabase(Model model){
public String backupDatabase(){
CacheManager.addExcCount("noExc");
return "otherManage/backupDatabase";
}
@ -91,7 +91,7 @@ public class Power_LogController {
if(null != logs && !logs.isEmpty()){
Set<String> menus = user.getMenus();
if(null != menus && !menus.isEmpty()){
Integer deleteOper = 0;
int deleteOper = 0;
for(String menu : menus){
if(StringUtils.isNotBlank(menu)){
if("/otherManage/deleteLogById".equals(menu)){
@ -107,6 +107,7 @@ public class Power_LogController {
pageHelper.setRows(logs);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -130,16 +131,10 @@ public class Power_LogController {
@RequiresPermissions("/otherManage/deleteLogById")
@RequestMapping("deleteLogById/{logId}")
@ResponseBody
public Msg deleteLogById(@PathVariable("logId")Integer logId){
try{
logService.deleteLogById(logId);
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("删除失败,请联系超管!");
}
public Msg deleteLogById(@PathVariable("logId")Integer logId) throws Exception{
logService.deleteLogById(logId);
CacheManager.addExcCount("noExc");
return Msg.success();
}
/**
@ -158,27 +153,21 @@ public class Power_LogController {
@RequestMapping("deleteLogByIds/{ids}")
@RequiresPermissions("/otherManage/deleteLogByIds")
@ResponseBody
public Msg deleteLogByIds(@PathVariable("ids")String ids){
try{
String[] idList = ids.split(",");
StringBuilder str = new StringBuilder();
for (int i = 0; i < idList.length; i++) {
if(StringUtils.isNoneBlank(idList[i])){
if(i != idList.length - 1){
str.append(idList[i] + ",");
}else{
str.append(idList[i]);
}
public Msg deleteLogByIds(@PathVariable("ids")String ids) throws Exception{
String[] idList = ids.split(",");
StringBuilder str = new StringBuilder();
for (int i = 0; i < idList.length; i++) {
if(StringUtils.isNoneBlank(idList[i])){
if(i != idList.length - 1){
str.append(idList[i]).append(",");
}else{
str.append(idList[i]);
}
}
logService.deleteLogByIds(str.toString());
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("删除失败,请联系超管!");
}
logService.deleteLogByIds(str.toString());
CacheManager.addExcCount("noExc");
return Msg.success();
}
/**
@ -216,6 +205,7 @@ public class Power_LogController {
exportExcelUtil.expordExcel(tableThNames,fieldCns,logs,fileName,response);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
}

@ -1,22 +1,17 @@
package com.manage.controller;
import com.manage.entity.Power_Menu;
import com.manage.entity.Power_Menu_User;
import com.manage.entity.Power_User;
import com.manage.service.cache.CacheManager;
import com.manage.service.Power_MenuService;
import com.manage.util.ActionScopeUtils;
import com.manage.util.Constant;
import com.manage.util.Msg;
import com.manage.vo.Power_UserVo;
import com.manage.vo.User_Dept_Menu;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.List;
/**
@ -46,22 +41,16 @@ public class Power_MenuController {
@RequestMapping("indexMenu")
@ResponseBody
public Msg indexMenu() {
try {
Power_UserVo user = (Power_UserVo) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER);
List<Power_Menu> list = null;
if(user.getRoleId().equals(0) || user.getRoleId().equals(-100)){
list = powerMenuService.queryAllPowerMenu("power",user.getRoleId());
} else{
list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),"power");
}
CacheManager.addExcCount("noExc");
return Msg.success().add("listPower", list);
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
public Msg indexMenu() throws Exception{
Power_UserVo user = (Power_UserVo) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER);
List<Power_Menu> list = null;
if(user.getRoleId().equals(0) || user.getRoleId().equals(-100)){
list = powerMenuService.queryAllPowerMenu("power",user.getRoleId());
} else{
list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),"power");
}
CacheManager.addExcCount("noExc");
return Msg.success().add("listPower", list);
/*
Power_User user = (Power_User) ActionScopeUtils.getSessionAttribute( Constant.CURRENT_USER);

@ -8,6 +8,7 @@ import com.manage.entity.Power_Menu;
import com.manage.service.cache.CacheManager;
import com.manage.service.PowerService;
import com.manage.service.Power_MenuService;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.Msg;
import com.manage.vo.Power_Sys_DictVo;
import org.apache.commons.lang3.StringUtils;
@ -45,6 +46,7 @@ public class Power_MenuManageController {
CacheManager.addExcCount("noExc");
return JSON.toJSONString(dicts);
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -55,19 +57,21 @@ public class Power_MenuManageController {
@RequestMapping(value = "getMenuList",produces = {"text/json;charset=UTF-8"})
@ResponseBody
public String getMenuList(){
List<Power_Menu> menus = new ArrayList<>();
Power_Menu menu = new Power_Menu();
menu.setMenuId(0);
menu.setMenuName("菜单列表");
menus.add(menu);
List<Power_Menu> menus1 = null;
try {
List<Power_Menu> menus = new ArrayList<>();
Power_Menu menu = new Power_Menu();
menu.setMenuId(0);
menu.setMenuName("菜单列表");
menus.add(menu);
List<Power_Menu> menus1 = menuService.selectAll(null,null,null);
menus1 = menuService.selectAll(null,null,null);
menus.addAll(menus1);
ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(menus);
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -76,42 +80,30 @@ public class Power_MenuManageController {
@RequestMapping(value = "checkMenuName")
@ResponseBody
public Msg checkMenuName(String sysFlag,String menuName){
try {
List<Power_Menu> 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<Power_Menu> 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<Power_Menu> 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<Power_Menu> menus = new ArrayList<>();
if(StringUtils.isNotBlank(method)){
menus = menuService.checkMethodByParentId(parentId, null,method);
}else{
menus = menuService.checkMethodByParentId(parentId, methodName,null);
}
CacheManager.addExcCount("noExc");
if(null != menus && !menus.isEmpty()){
return Msg.fail();
}else{
return Msg.success();
}
}
@ -119,141 +111,129 @@ public class Power_MenuManageController {
@RequiresPermissions(value="/menu/update")
@RequestMapping(value="update",method = RequestMethod.POST)
@ResponseBody
public Msg addMenu(Power_Menu menu,String sysName){
public Msg addMenu(Power_Menu menu,String sysName) throws Exception{
if(StringUtils.isNotBlank(menu.getMenuUrl())){
if(!menu.getMenuUrl().contains("/") && !"#".equals(menu.getMenuUrl())){
return Msg.fail("菜单地址必须包含斜杠/,建目录必须为单个字符#");
}
}
try {
List<Power_Menu> 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<Power_Menu> 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<Power_Menu> checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null);
List<Power_Menu> 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<Power_Menu> checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null);
List<Power_Menu> 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<Power_Menu> checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null);
List<Power_Menu> 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<Power_Menu> checkMethodNames = menuService.checkMethodByParentId(menu.getParentId(), menu.getMenuName(),null);
List<Power_Menu> 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();
}
}

@ -7,6 +7,7 @@ import com.manage.entity.Power_Notice;
import com.manage.entity.Power_User;
import com.manage.service.cache.CacheManager;
import com.manage.service.ipml.Power_NoticeServiceImpl;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.Msg;
import com.manage.util.PageHelper;
import com.manage.vo.*;
@ -31,8 +32,13 @@ public class Power_NoticeController {
@OptionalLog(module = "查看",methods = "通知管理页面")
@RequestMapping(value = "pageUI")
public String notice(HttpServletRequest request, Model model){
noticeService.loadSys(request,model);
model.addAttribute("user",(Power_User)request.getSession().getAttribute("CURRENT_USER"));
try {
noticeService.loadSys(request,model);
} catch (Exception e) {
ExceptionPrintUtil.printException(e);
e.printStackTrace();
}
model.addAttribute("user",request.getSession().getAttribute("CURRENT_USER"));
CacheManager.addExcCount("noExc");
return "/noticeDir/noticePage";
}
@ -42,7 +48,7 @@ public class Power_NoticeController {
public PageHelper<Power_NoticeVo> selectAll(Power_NoticeVo notice, HttpServletRequest request) {
PageHelper<Power_NoticeVo>pageHelper = new PageHelper<Power_NoticeVo>();
Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
List<Power_NoticeVo>power_notices = new ArrayList<Power_NoticeVo>();
List<Power_NoticeVo> powerNotices = new ArrayList<Power_NoticeVo>();
List<Power_NoticeVo> getTatal = new ArrayList<Power_NoticeVo>();
try {
/*if(user.getRoleId() == 0){
@ -52,45 +58,24 @@ public class Power_NoticeController {
}*/
if(user.getRoleId() == 0){
getTatal = this.noticeMapper.getTotal(null,null,notice);
power_notices = this.noticeMapper.selectALlByPower(null,null,notice);
powerNotices = this.noticeMapper.selectALlByPower(null,null,notice);
}else{
getTatal = this.noticeMapper.getTotal(user.getRoleId(),user.getUserId(),notice);
power_notices = this.noticeMapper.selectALlByPower(user.getRoleId(),user.getUserId(),notice);
powerNotices = this.noticeMapper.selectALlByPower(user.getRoleId(),user.getUserId(),notice);
}
pageHelper.setTotal(getTatal.size());
//查询当前页实体对象
pageHelper.setRows(power_notices);
pageHelper.setRows(powerNotices);
CacheManager.addExcCount("noExc");
return pageHelper;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
}
}
public List<Power_Notice> putChildren(List<Power_Notice> 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<Power_Notice> res2 = new ArrayList<>();
if(user.getRoleId() == -100 || user.getRoleId() == 0){
res2 = this.noticeMapper.selectNoticeListByParentId(notice,null);
}else{
res2 = this.noticeMapper.selectNoticeListByParentId(notice,user.getUserId());
}
if (res2.size() > 0) {
res2 = putChildren(res2,notice,user);
}
mod2.setChildren(res2);
}
}
return moduleList;
}
@RequestMapping(value = "getNoticeTypeTree",produces = {"text/json;charset=UTF-8"})
@ResponseBody
public String getNoticeTypeTree(){
@ -99,6 +84,7 @@ public class Power_NoticeController {
CacheManager.addExcCount("noExc");
return JSON.toJSONString(treeList);
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -107,110 +93,80 @@ public class Power_NoticeController {
@RequestMapping(value = "checkTypeSysFlagOrTypeSysName")
@ResponseBody
public Msg checkTypeSysFlag(String noticeTypeFlag,String noticeTypeName){
try {
if(StringUtils.isNoneBlank(noticeTypeFlag) || StringUtils.isNotBlank(noticeTypeName)) {
Power_Notice powerNotice = noticeService.checkTypeSysFlagOrTypeSysName(noticeTypeFlag, noticeTypeName);
CacheManager.addExcCount("noExc");
if (null != powerNotice) {
return Msg.fail();
} else {
return Msg.success();
}
}else{
return Msg.fail("查询出错,请联系系统管理员!");
public Msg checkTypeSysFlag(String noticeTypeFlag,String noticeTypeName) throws Exception{
if(StringUtils.isNoneBlank(noticeTypeFlag) || StringUtils.isNotBlank(noticeTypeName)) {
Power_Notice powerNotice = noticeService.checkTypeSysFlagOrTypeSysName(noticeTypeFlag, noticeTypeName);
CacheManager.addExcCount("noExc");
if (null != powerNotice) {
return Msg.fail();
} else {
return Msg.success();
}
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
}else{
return Msg.fail("查询出错,请联系系统管理员!");
}
}
@RequestMapping(value = "update")
@ResponseBody
public Msg udpate(Power_Notice powerNotice,HttpServletRequest request){
try {
//保存类别
if(StringUtils.isNotBlank(powerNotice.getNoticeTypeFlag())){
//验证用户名
Power_Notice typeNotice = noticeService.checkTypeSysFlagOrTypeSysName(powerNotice.getNoticeTypeFlag(), null);
Power_Notice nameNotice = noticeService.checkTypeSysFlagOrTypeSysName(null,powerNotice.getNoticeTypeName());
//添加类别
if (null == powerNotice.getNoticeId()) {
if(null != typeNotice){
return Msg.fail("类别标志已存在!");
}
if(null != nameNotice){
return Msg.fail("类别名称已存在!");
}
noticeService.update(powerNotice,request);
} else {
//修改类别
if(null != typeNotice && !typeNotice.getNoticeId().equals(powerNotice.getNoticeId())){
return Msg.fail("类别标志已存在!");
}
if(null != nameNotice && !nameNotice.getNoticeId().equals(powerNotice.getNoticeId())){
return Msg.fail("类别名称已存在!");
}
noticeService.update(powerNotice,request);
public Msg udpate(Power_Notice powerNotice,HttpServletRequest request) throws Exception{
//保存类别
if(StringUtils.isNotBlank(powerNotice.getNoticeTypeFlag())){
//验证用户名
Power_Notice typeNotice = noticeService.checkTypeSysFlagOrTypeSysName(powerNotice.getNoticeTypeFlag(), null);
Power_Notice nameNotice = noticeService.checkTypeSysFlagOrTypeSysName(null,powerNotice.getNoticeTypeName());
//添加类别
if (null == powerNotice.getNoticeId()) {
if(null != typeNotice){
return Msg.fail("类别标志已存在!");
}
if(null != nameNotice){
return Msg.fail("类别名称已存在!");
}
noticeService.update(powerNotice,request);
} else {
//修改类别
if(null != typeNotice && !typeNotice.getNoticeId().equals(powerNotice.getNoticeId())){
return Msg.fail("类别标志已存在!");
}
if(null != nameNotice && !nameNotice.getNoticeId().equals(powerNotice.getNoticeId())){
return Msg.fail("类别名称已存在!");
}
}else{
//保存通知
noticeService.update(powerNotice,request);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){
e.printStackTrace();
CacheManager.addExcCount("exc");
return Msg.fail("查询出错,请联系系统管理员!");
}else{
//保存通知
noticeService.update(powerNotice,request);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}
@OptionalLog(module = "删除",methods = "通知管理",fieldName = "noticeContent",fieldName1="noticeTypeName",tableName = "power_notice")
@RequestMapping(value = "delete")
@ResponseBody
public Msg delete(Integer noticeId){
try {
noticeService.delete(noticeId);
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
}
public Msg delete(Integer noticeId) throws Exception{
noticeService.delete(noticeId);
CacheManager.addExcCount("noExc");
return Msg.success();
}
/************************************************通知操作***************************************************/
@RequestMapping(value = "getUserNameListByNoticeTypeId")
@ResponseBody
public Msg getUserNameListByNoticeTypeId(Integer noticeTypeId, HttpServletRequest request){
try {
List<Power_UserVo> 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<Power_UserVo> userList = noticeService.getUserNameListByNoticeTypeId(noticeTypeId, request);
CacheManager.addExcCount("noExc");
return Msg.success().add("userList",userList);
}
@RequestMapping(value = "selectNoticeByNoticeId")
@ResponseBody
public Msg selectNoticeByNoticeId(Integer noticeId){
try {
Power_Notice powerNotice = noticeMapper.selectByPrimaryKey(noticeId);
CacheManager.addExcCount("noExc");
return Msg.success().add("powerNotice",powerNotice);
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("查询出错,请联系系统管理员!");
}
public Msg selectNoticeByNoticeId(Integer noticeId) throws Exception{
Power_Notice powerNotice = noticeMapper.selectByPrimaryKey(noticeId);
CacheManager.addExcCount("noExc");
return Msg.success().add("powerNotice",powerNotice);
}
@OptionalLog(module = "导出excel",methods = "通知管理")
@ -221,6 +177,7 @@ public class Power_NoticeController {
noticeService.export(powerNoticeVo,noticeIds,response,request);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
@ -229,16 +186,10 @@ public class Power_NoticeController {
@RequestMapping(value = "updateNoticeReadFlag")
@ResponseBody
public Msg updateNoticeReadFlag(Integer noticeId){
try {
noticeService.updateNoticeReadFlag(noticeId);
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("修改出错了,请联系系统管理员!");
}
public Msg updateNoticeReadFlag(Integer noticeId) throws Exception{
noticeService.updateNoticeReadFlag(noticeId);
CacheManager.addExcCount("noExc");
return Msg.success();
}
/**
@ -255,22 +206,16 @@ public class Power_NoticeController {
*/
@RequestMapping("getUnReadCount")
@ResponseBody
public Msg getUnReadCount(HttpServletRequest request){
try {
//获取登录者信息
Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER");
Integer userId = null;
//系统管理员userId为null,非系统管理员传入userId
if(user.getRoleId() != 0){
userId = user.getRoleId();
}
int unReadCount = noticeService.getUnReadCount(userId);
CacheManager.addExcCount("noExc");
return Msg.success().add("unReadCount",unReadCount);
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail(e.getMessage());
public Msg getUnReadCount(HttpServletRequest request) throws Exception{
//获取登录者信息
Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER");
Integer userId = null;
//系统管理员userId为null,非系统管理员传入userId
if(user.getRoleId() != 0){
userId = user.getRoleId();
}
int unReadCount = noticeService.getUnReadCount(userId);
CacheManager.addExcCount("noExc");
return Msg.success().add("unReadCount",unReadCount);
}
}

@ -7,6 +7,7 @@ import com.manage.entity.Power_User;
import com.manage.service.cache.CacheManager;
import com.manage.service.Power_DeptService;
import com.manage.service.Power_Sys_DictService;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.Msg;
import com.manage.util.PageHelper;
import com.manage.vo.Power_DeptVo;
@ -62,10 +63,11 @@ public class Power_Sys_DictController {
@ResponseBody
public List<Power_Sys_Dict> selectHosList(HttpServletRequest request){
try {
List<Power_Sys_Dict> power_sys_dicts = powerSysDictService.selectHosList(request);
List<Power_Sys_Dict> powerSysDicts = powerSysDictService.selectHosList(request);
CacheManager.addExcCount("noExc");
return power_sys_dicts;
return powerSysDicts;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -76,10 +78,11 @@ public class Power_Sys_DictController {
@ResponseBody
public List<Power_Sys_Dict> selectList(){
try {
List<Power_Sys_Dict> power_sys_dicts = powerSysDictService.selectList();
List<Power_Sys_Dict> powerSysDicts = powerSysDictService.selectList();
CacheManager.addExcCount("noExc");
return power_sys_dicts;
return powerSysDicts;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -90,10 +93,11 @@ public class Power_Sys_DictController {
@ResponseBody
public Power_Sys_Dict selectDict(Integer dictId){
try {
Power_Sys_Dict power_sys_dict = powerSysDictService.selectByPrimaryKey(dictId);
Power_Sys_Dict powerSysDict = powerSysDictService.selectByPrimaryKey(dictId);
CacheManager.addExcCount("noExc");
return power_sys_dict;
return powerSysDict;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -101,202 +105,163 @@ public class Power_Sys_DictController {
}
@RequestMapping("/checkHospitalName")
@ResponseBody
public Msg checkHospitalName(String hospitalName){
try {
Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(hospitalName);
CacheManager.addExcCount("noExc");
if(dictVo != null){
return Msg.fail("医院名称已存在");
}else{
return Msg.success();
}
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("验证失败,请联系系统管理员");
public Msg checkHospitalName(String hospitalName) throws Exception{
Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(hospitalName);
CacheManager.addExcCount("noExc");
if(dictVo != null){
return Msg.fail("医院名称已存在");
}else{
return Msg.success();
}
}
@RequiresPermissions(value="/dict/add")
@RequestMapping("/add")
@ResponseBody
public Msg add(Power_Sys_DictVo powerSysDict, HttpServletRequest request){
try {
if(powerSysDict.getDictId() == null){
//添加医院
if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){
Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName());
if(dictVo != null){
return Msg.fail("医院名称不能重复!");
}
powerSysDictService.insertSelective(powerSysDict,request);
Integer dictId = powerSysDict.getDictId();
CacheManager.addExcCount("noExc");
return Msg.success().add("dictId",dictId);
}else{
//添加系统
String deptIds = powerSysDict.getDeptIds();
if(StringUtils.isBlank(deptIds)){
deptIds = "-999";
public Msg add(Power_Sys_DictVo powerSysDict, HttpServletRequest request) throws Exception{
if(powerSysDict.getDictId() == null){
//添加医院
if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){
Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName());
if(dictVo != null){
return Msg.fail("医院名称不能重复!");
}
powerSysDictService.insertSelective(powerSysDict,request);
Integer dictId = powerSysDict.getDictId();
CacheManager.addExcCount("noExc");
return Msg.success().add("dictId",dictId);
}else{
//添加系统
String deptIds = powerSysDict.getDeptIds();
if(StringUtils.isBlank(deptIds)){
deptIds = "-999";
}
if(!deptIds.contains(",")){
List<Power_Sys_Dict> deptBySysFlagList = sysDictMapper.selectDeptIdByParentIdAndSysFlag(powerSysDict.getParentId(), powerSysDict.getSysFlag(),deptIds);
if(null != deptBySysFlagList && !deptBySysFlagList.isEmpty()){
return Msg.fail("系统标识已存在!");
}
if(!deptIds.contains(",")){
List<Power_Sys_Dict> deptBySysFlagList = sysDictMapper.selectDeptIdByParentIdAndSysFlag(powerSysDict.getParentId(), powerSysDict.getSysFlag(),deptIds);
if(null != deptBySysFlagList && !deptBySysFlagList.isEmpty()){
return Msg.fail("系统标识已存在!");
}
}
/*List<Power_Sys_Dict> dicts = powerSysDictService.checkSysFlagOrSysNameByDeptIds(powerSysDict.getSysFlag(), powerSysDict.getSysName(), deptIds);
if(null != dicts && !dicts.isEmpty()) {
if (StringUtils.isNoneBlank(powerSysDict.getSysFlag())) {
return Msg.fail("系统标识已存在!");
} else {
return Msg.fail("系统名称已存在!");
}
/*List<Power_Sys_Dict> 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<Power_Sys_Dict> 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<Power_Sys_Dict> 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<Power_Sys_Dict> 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<Power_Sys_Dict> 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<Power_Sys_DictVo> selectType(){
try {
List<Power_Sys_DictVo> power_sys_dictVos = powerSysDictService.selectSysType();
List<Power_Sys_DictVo> powerSysDictVos = powerSysDictService.selectSysType();
CacheManager.addExcCount("noExc");
return power_sys_dictVos;
return powerSysDictVos;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
}
}
@RequestMapping("/export")
public void download(HttpServletResponse response){
try {
powerSysDictService.export(response);
CacheManager.addExcCount("noExc");
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
}
}
@RequestMapping("/getHospitalByParentId")
@ResponseBody
public Msg getHospitalByParentId(Integer dictId){
try {
Power_Sys_DictVo powerSysExsit = powerSysDictService.getHospitalByParentId(dictId, "权限系统");
CacheManager.addExcCount("noExc");
if(null != powerSysExsit){
return Msg.fail();
}else{
return Msg.success();
}
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("查询失败,请联系系统管理员!");
public Msg getHospitalByParentId(Integer dictId) throws Exception{
Power_Sys_DictVo powerSysExsit = powerSysDictService.getHospitalByParentId(dictId, "权限系统");
CacheManager.addExcCount("noExc");
if(null != powerSysExsit){
return Msg.fail();
}else{
return Msg.success();
}
}
@ -324,7 +289,7 @@ public class Power_Sys_DictController {
dict = hospital;
model.addAttribute("dict",dict);
}
if(level != 0 && selfId >= 0 || selfId == -100){
if(selfId >= 0 || selfId == -100){
//权限系统是否存在,不存在才加载
Power_Sys_DictVo powerSysExsit = powerSysDictService.getHospitalByParentId(selfId, "权限系统");
if(null == powerSysExsit && level != 2 || "权限系统".equals(hospital.getSysType())){
@ -338,9 +303,7 @@ public class Power_Sys_DictController {
sysTypes.add("科研系统");
sysTypes.add("其它");
model.addAttribute("sysTypes",sysTypes);
if(hospital != null){
selfId = hospital.getHospitalId();
}
selfId = hospital.getHospitalId();
List<Power_DeptVo> depts = deptService.selectDeptByDictId(selfId,dict.getSysFlag());
model.addAttribute("depts",depts);
}
@ -359,6 +322,7 @@ public class Power_Sys_DictController {
model.addAttribute("deptId",deptId);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
}
@ -367,26 +331,20 @@ public class Power_Sys_DictController {
@RequestMapping("/checkSysFlagOrSysNameByDeptId")
@ResponseBody
public Msg checkSysFlagOrSysNameByDeptId(String sysFlag,String sysName,String deptIds){
try {
if(StringUtils.isBlank(deptIds)){
deptIds = "-999";
}
List<Power_Sys_Dict> 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<Power_Sys_Dict> 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();
}
}
}

@ -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<Power_Menu> menus = powerService.getMenuBySysIdAndRoleIdPowerTree(sysFlag,roleId);
ObjectMapper mapper = new ObjectMapper();
@ -106,6 +108,7 @@ public class RoleAndUserPowerController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -134,6 +137,7 @@ public class RoleAndUserPowerController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -183,6 +187,7 @@ public class RoleAndUserPowerController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -205,21 +210,15 @@ public class RoleAndUserPowerController {
@RequiresPermissions(value="/menuPower/addRoleMenu")
@RequestMapping("/addRoleMenu")
@ResponseBody
public Msg addRoleMenu(Integer roleId,String sysFlag,String menus){
try {
//医院管理员不需要保存
if(roleId != -100){
powerService.addRoleMenu(roleId,sysFlag,menus);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}catch(Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("保存失败,请联系系统管理员!");
public Msg addRoleMenu(Integer roleId,String sysFlag,String menus) throws Exception{
//医院管理员不需要保存
if(roleId != -100){
powerService.addRoleMenu(roleId,sysFlag,menus);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}
/**************************************用户菜单权限操作************************************************/
/***********************用户菜单权限操作******************************/
/**
* @ProjectName: userPowerList
* @Description:
@ -263,6 +262,7 @@ public class RoleAndUserPowerController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -291,6 +291,7 @@ public class RoleAndUserPowerController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -319,6 +320,7 @@ public class RoleAndUserPowerController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -341,20 +343,14 @@ public class RoleAndUserPowerController {
@RequiresPermissions(value="/menuPower/addUserMenu")
@RequestMapping("addUserMenu")
@ResponseBody
public Msg addUserMenu(Integer userId, String sysFlag, String menus){
try {
Power_UserVo user = userService.selectByPrimaryKey(userId);
//医院管理员不需要保存
if(user.getRoleId() != -100){
powerService.addUserMenu(userId,sysFlag,menus);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}catch(Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("保存失败,请联系系统管理员!");
public Msg addUserMenu(Integer userId, String sysFlag, String menus) throws Exception{
Power_UserVo user = userService.selectByPrimaryKey(userId);
//医院管理员不需要保存
if(user.getRoleId() != -100){
powerService.addUserMenu(userId,sysFlag,menus);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}
/******************************************归属管理操作*********************************************************/
/**
@ -379,6 +375,7 @@ public class RoleAndUserPowerController {
CacheManager.addExcCount("noExc");
return json;
}catch(Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;

@ -7,6 +7,7 @@ import com.manage.entity.Power_User;
import com.manage.service.cache.CacheManager;
import com.manage.service.Power_RoleService;
import com.manage.service.ImportExcel.ImportExcelUtil;
import com.manage.util.ExceptionPrintUtil;
import com.manage.util.Msg;
import com.manage.util.PageHelper;
import com.manage.vo.ImportExcelEntity;
@ -66,6 +67,7 @@ public class RoleController {
pageHelper.setRows(list);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
}
@ -83,18 +85,6 @@ public class RoleController {
CacheManager.addExcCount("noExc");
return "roleDir/role";
}
/**
* @Date 2019-4-25
* @Author ly
* @Description
* */
@OptionalLog(module = "查看",methods = "角色管理页面")
@RequiresPermissions(value="/role/pageUINotDown")
@RequestMapping("/pageUINotDown")
public String pageUINotDown(){
CacheManager.addExcCount("noExc");
return "roleDir/roleNotDown";
}
/**
* @Date 2019-08-02
@ -103,19 +93,13 @@ public class RoleController {
* */
@RequestMapping("/checkRoleName")
@ResponseBody
public Msg checkRoleName(String roleName){
try {
Power_Role role = powerRoleService.checkRoleName(roleName);
CacheManager.addExcCount("noExc");
if(null != role){
return Msg.fail("角色名已存在!");
}else{
return Msg.success();
}
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("验证角色名出错了,请联系系统管理员!");
public Msg checkRoleName(String roleName) throws Exception{
Power_Role role = powerRoleService.checkRoleName(roleName);
CacheManager.addExcCount("noExc");
if(null != role){
return Msg.fail("角色名已存在!");
}else{
return Msg.success();
}
}
@ -129,20 +113,14 @@ public class RoleController {
@RequiresPermissions(value="/role/add")
@RequestMapping("/add")
@ResponseBody
public Msg add(Power_Role powerRole){
try {
Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName());
if(null != role){
return Msg.fail("角色名不能重复!");
}else{
powerRoleService.insertSelective(powerRole);
}
CacheManager.addExcCount("noExc");
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();;
return Msg.fail("新增失败,请联系系统管理员!");
public Msg add(Power_Role powerRole) throws Exception{
Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName());
if(null != role){
return Msg.fail("角色名不能重复!");
}else{
powerRoleService.insertSelective(powerRole);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}
@ -155,20 +133,14 @@ public class RoleController {
@RequiresPermissions(value="/role/update")
@RequestMapping("/update")
@ResponseBody
public Msg update(Power_Role powerRole,HttpServletRequest request){
try {
Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName());
if(null != role && !role.getRoleId().equals(powerRole.getRoleId())){
return Msg.fail("角色名不能重复!");
}else{
powerRoleService.updateByPrimaryKeySelective(powerRole,request);
}
CacheManager.addExcCount("noExc");
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail("更新失败,请联系系统管理员!");
public Msg update(Power_Role powerRole,HttpServletRequest request) throws Exception{
Power_Role role = powerRoleService.checkRoleName(powerRole.getRoleName());
if(null != role && !role.getRoleId().equals(powerRole.getRoleId())){
return Msg.fail("角色名不能重复!");
}else{
powerRoleService.updateByPrimaryKeySelective(powerRole,request);
}
CacheManager.addExcCount("noExc");
return Msg.success();
}
/**
@ -180,16 +152,10 @@ public class RoleController {
@RequiresPermissions(value="/role/delete")
@RequestMapping("/delete")
@ResponseBody
public Msg delete(Integer roleId){
try {
powerRoleService.deleteByPrimaryKey(roleId);
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
}
public Msg delete(Integer roleId) throws Exception{
powerRoleService.deleteByPrimaryKey(roleId);
CacheManager.addExcCount("noExc");
return Msg.success();
}
/**
* @Date 2019-4-25
@ -204,6 +170,7 @@ public class RoleController {
CacheManager.addExcCount("noExc");
return powerRole;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -222,27 +189,12 @@ public class RoleController {
powerRoleService.export(powerRole,response,request);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
}
}
/**
* @Date 2019-4-25
* @Author ly
* @Description Excel
* */
@OptionalLog(module = "导出excel",methods = "角色管理")
@RequiresPermissions(value="/role/export")
@RequestMapping("/exportNotDown")
public void exportNotDown(Power_RoleVo powerRole, HttpServletResponse response, HttpServletRequest request){
try {
powerRoleService.exportNotDown(powerRole,response,request);
CacheManager.addExcCount("noExc");
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
}
}
/**
* @Date 2019-4-30
* @Author ly
@ -252,10 +204,11 @@ public class RoleController {
@ResponseBody
public List<Power_RoleVo> selectList(HttpServletRequest request){
try {
List<Power_RoleVo> power_roles = powerRoleService.selectListByPower(request);
List<Power_RoleVo> powerRoles = powerRoleService.selectListByPower(request);
CacheManager.addExcCount("noExc");
return power_roles;
return powerRoles;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -272,7 +225,6 @@ public class RoleController {
@RequestMapping(value="/importExcel",method = {RequestMethod.POST})
@ResponseBody
public ResponseEntity<String> importExcel(HttpServletRequest request){
OutputStream os = null;
HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.setContentType(new MediaType("text","html",Charset.forName("UTF-8")));
try {
@ -310,79 +262,10 @@ public class RoleController {
return new ResponseEntity<String>(msgStr, responseHeaders, HttpStatus.OK);
}
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
//抛异常
return new ResponseEntity<String>(e.getMessage(), responseHeaders, HttpStatus.OK);
}finally {
if(os != null){
try {
os.close();
}catch (Exception e){
e.printStackTrace();
}
}
}
}
/**
* @Date 2019-10-11
* @Author zengwh
* @Description excel
* */
@OptionalLog(module = "导入excel",methods = "角色管理")
@RequiresPermissions(value="/role/importExcel")
@RequestMapping(value="/importExcelNotDown",method = {RequestMethod.POST})
@ResponseBody
public ResponseEntity<String> importExcelNotDown(HttpServletRequest request){
OutputStream os = null;
HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.setContentType(new MediaType("text","html",Charset.forName("UTF-8")));
try {
//读取文件
MultipartResolver resolver = new CommonsMultipartResolver(request.getSession().getServletContext());
MultipartHttpServletRequest multipartRequest = resolver.resolveMultipart(request);
MultipartFile multipartFile = multipartRequest.getFile("upfile");
//属性名
String[] fieldNames = {"roleName","remark","effective"};
//判断集中类中的方法名
String[] judgeMethods = {"judgeRoleName","judgeRemark","convertEffective"};
//导入excel的操作
Power_Role role = new Power_Role();
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER");
role.setCreater(user.getUserName());
role.setUpdater(user.getUserName());
role.setCreateDate(fmt.format(new Date()));
role.setUpdateDate(fmt.format(new Date()));
//实例化
ImportExcelUtil.newInstance("power_RoleMapper",role, Power_Role.class);
//导入excel的操作
ImportExcelEntity excelEntity = ImportExcelUtil.fileImport(multipartFile,fieldNames, judgeMethods);
CacheManager.addExcCount("noExc");
if(excelEntity.getSuccessCount() == 0 && excelEntity.getWrongCount() == 0){
//无数据
return new ResponseEntity<String>("无数据!", responseHeaders, HttpStatus.OK);
}
if(excelEntity.getWrongCount() == 0){
//成功
return new ResponseEntity<String>(null, responseHeaders, HttpStatus.OK);
}else{
//有出错数据
String msgStr = excelEntity.getWorkBookKey()+"@已成功导入"+excelEntity.getSuccessCount()+"条,失败"+excelEntity.getWrongCount()+"条,随后将导出错误记录!";
return new ResponseEntity<String>(msgStr, responseHeaders, HttpStatus.OK);
}
}catch (Exception e){
CacheManager.addExcCount("exc");
//抛异常
return new ResponseEntity<String>(e.getMessage(), responseHeaders, HttpStatus.OK);
}finally {
if(os != null){
try {
os.close();
}catch (Exception e){
e.printStackTrace();
}
}
}
}
}

@ -29,16 +29,9 @@ public class T_MenuController {
*/
@RequestMapping(value="/infoById/{id}",method=RequestMethod.GET)
@ResponseBody
public Msg getinfoById(@PathVariable("id")Integer id){
try {
T_Menu obj=new T_Menu();
obj=t_menuService.getRole();
CacheManager.addExcCount("noExc");
return Msg.success().add("obj", obj);
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
}
public Msg getinfoById() throws Exception{
T_Menu obj = t_menuService.getRole();
CacheManager.addExcCount("noExc");
return Msg.success().add("obj", obj);
}
}

@ -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<Power_DeptVo> 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<Power_DeptVo> 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<Power_DeptVo> 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<Power_User> 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<Power_User> 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<Power_User> 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<Power_User> 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<Power_User> 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<Power_User> user = powerUserService.checkUserName(powerUser.getUserName());
if(null != user && !user.isEmpty() && !user.get(0).getUserId().equals(powerUser.getUserId())){
return Msg.fail("用户名已存在!");
}else{
powerUserService.updateByPrimaryKeySelective(powerUser,request);
CacheManager.addExcCount("noExc");
return Msg.success();
}
}
@ -210,20 +161,15 @@ public class UserController {
@RequiresPermissions(value="/user/resetPassword")
@RequestMapping("/resetPassword")
@ResponseBody
public Msg update(Integer userId){
try {
ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request =attr.getRequest();
Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId);
powerUser.setUserPwd(Base64.encode(MD5.KL("000000")));
powerUserService.updateByPrimaryKeySelective(powerUser,request);
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
}
public Msg update(Integer userId) throws Exception{
ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
assert attr != null;
HttpServletRequest request =attr.getRequest();
Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId);
powerUser.setUserPwd(Base64.encode(MD5.KL("000000")));
powerUserService.updateByPrimaryKeySelective(powerUser,request);
CacheManager.addExcCount("noExc");
return Msg.success();
}
@RequestMapping("/selectUser")
@ResponseBody
@ -233,6 +179,7 @@ public class UserController {
CacheManager.addExcCount("noExc");
return powerUser;
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -246,6 +193,7 @@ public class UserController {
model.addAttribute("user",userVo);
CacheManager.addExcCount("noExc");
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
e.printStackTrace();
}
@ -255,16 +203,10 @@ public class UserController {
@OptionalLog(module = "修改密码",methods = "用户管理")
@RequestMapping(value = "/updatePassword")
@ResponseBody
public Msg updatePassword(String userPwd){
try {
boolean result = powerUserService.updatePassword(userPwd);
CacheManager.addExcCount("noExc");
return Msg.success().add("result",result);
}catch (Exception e){
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
}
public Msg updatePassword(String userPwd) throws Exception{
boolean result = powerUserService.updatePassword(userPwd);
CacheManager.addExcCount("noExc");
return Msg.success().add("result",result);
}
/**
@ -277,7 +219,6 @@ public class UserController {
@RequestMapping(value="/importExcel",method = {RequestMethod.POST})
@ResponseBody
public ResponseEntity<String> 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<String>(msgStr, responseHeaders, HttpStatus.OK);
}
}catch (Exception e){
ExceptionPrintUtil.printException(e);
CacheManager.addExcCount("exc");
//抛异常
return new ResponseEntity<String>(e.getMessage(), responseHeaders, HttpStatus.OK);
}finally {
if(os != null){
try {
os.close();
}catch (Exception e){
e.printStackTrace();
}
}
}
}
}

@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Properties;
public class LoginInterceptor implements HandlerInterceptor {
public class LoginInterceptor implements HandlerInterceptor {
@Value("${TOKEN_EXPIRE_TIME}")
private long TOKEN_EXPIRE_TIME;
@Autowired
@ -43,7 +43,7 @@ public class LoginInterceptor implements HandlerInterceptor {
if(!"/getSessionRemainingTime".equals(parentUrl)){
request.getSession().setAttribute(request.getSession().getId(),System.currentTimeMillis());
}
if (excludes(parentUrl, Constant.RELEASE_REQUEST,request)) {
if (excludes(parentUrl, Constant.RELEASE_REQUEST)) {
response.setHeader("Access-Control-Allow-Origin","*");
return true;
}else{
@ -76,7 +76,7 @@ public class LoginInterceptor implements HandlerInterceptor {
}
private boolean excludes(String url,String key,HttpServletRequest request){
private boolean excludes(String url,String key){
Properties props = new Properties();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {

@ -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<PowerTree> getRolePowerTree();
}

@ -9,7 +9,7 @@ TOKEN_EXPIRE_TIME = 3600000
##################################################服务器ip##########################################################
#通用服务器IP与通用服务器端口
SERVER_IP = 192.168.1.101
SERVER_IP = 192.168.1.3
SERVER_PORT = 8081
#power权限系统ip

@ -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

@ -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);
}
}

@ -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<Result>() {});
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";
}
}
}

@ -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" %>
<html>
<head>
<title>部门管理</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- 引入 Bootstrap -->
<link rel="stylesheet" href="${path}/static/css/comm.css">
<link rel="stylesheet" href="${path}/static/zTree_v3-master/css/zTreeStyle/zTreeStyle.css">
<style type="text/css">
/*页头*/
.panel-heading{
padding: 0 16px;
}
hr{
margin:0;
}
.form-group{
margin-left:15px;
}
/*模态框表单*/
.formDiv{
width:100%;
height:30px;
margin-top:10px;
}
.control-label{
width:30%;
text-align: right;
padding-top:2px;
}
.input{
width:50%;
float:left;
}
/*按钮组*/
.btns{
text-align: right;
margin-bottom: 5px;
}
/*模态框*/
.modal-header{
text-align: center;
}
.modal-title{
font-weight: bold;
}
.modelBtns{
text-align: center;
}
.modelBtn{
width: 74px;
margin-left: 38px;
margin-bottom: 16px;
}
.operBtns{
margin-left:10px;
}
.tableDiv{
margin-left:14px;
}
.shortInput{
width:80px;
}
.warningLabel{
margin-left:102px;
}
.warningDiv{
margin-left: 134px;
margin-top: -20px;
}
</style>
</head>
<body>
<div style="width: 100%">
<input type="hidden" id="roleId" value="${user.roleId}">
<input type="hidden" id="checks">
<input type="hidden" id="userNames">
<div class="row">
<div class="col-md-12">
<div class="panel-heading"><h4>基本管理/部门管理</h4></div>
<hr>
<form class="form-inline" style="margin-top: 5px;" role="form">
<div class="">
<div class="form-group">
<label for="dept_name">部门名</label>
<input type="text" class="form-control input-sm" id="dept_name" maxlength="16"/>
</div>
<c:if test="${user.roleId == 0}">
<div class="form-group">
<label for="dict_id">所属医院</label>
<div class=" form-group form-inline">
<select class=" form-control input-sm" id="dict_id">
<option value="">全部</option>
</select>
</div>
</div>
</c:if>
<div class="form-group">
<label for="effective">是否有效</label>
<div class=" form-group form-inline">
<select class="form-control input-sm" id="effective">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
</div>
<div class="form-group">
<label for="creater">创建人</label>
<input type="text" class="form-control input-sm" id="creater" maxlength="16"/>
</div>
<div class="form-group">
<button type="button" style="margin-left:20px" id="queryBtn" class="btn btn-info btn-sm">查询</button>
</div>
</div>
</form>
</div>
</div>
<div class="btns">
<pm:myPermissions permissions="/dept/add">
<button type="button" onclick="add()" class="btn btn-warning btn-sm">增加</button>
</pm:myPermissions>
<pm:myPermissions permissions="/dept/importExcel">
<button type="button" class="btn btn-success btn-sm" onclick="importBtn()">导入Excel</button>
</pm:myPermissions>
<pm:myPermissions permissions="/dept/export">
<button type="button" class="btn btn-primary btn-sm" onclick="exportExcel()">导出Excel</button>
</pm:myPermissions>
</div>
<div class="tableDiv">
<table id="bootstrapTable" class="table text-nowrap table-bordered"></table>
</div>
</div>
<!-- 模态框Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">角色信息</h4>
</div>
<div class="modal-body" style="height:auto">
<form id="updateaddform">
<div class="formDiv">
<label class="control-label left">部门名:</label>
<input type="hidden" id="re_deptId" name="deptId">
<input type="text" class="form-control input input-sm" id="re_deptName" name="deptName" maxlength="15">
</div>
<div class="formDiv">
<label for="re_effective" class="control-label left">有效否:</label>
<select class="form-control input input-sm shortInput" id="re_effective" name="effective">
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="formDiv">
<label for="re_effective" class="control-label left">所属医院:</label>
<select class="form-control input input-sm" id="re_dictId" name="dictId"></select>
</div>
<div class="formDiv">
<label for="re_remark" class="control-label left">备注:</label>
<textarea id="re_remark" class="form-control input input-sm" name="remark" maxlength="50"></textarea>
</div>
</form>
</div>
<div class="modelBtns">
<button type="button" class="btn btn-primary btn-sm modelBtn" id="btn_submit">提交</button>
<button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<!-- 模态框Modal1 导入-->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel1">导入信息</h4>
</div>
<div class="modal-body" style="height:240px">
<form method="POST" enctype="multipart/form-data"
id="form1">
<div class="formDiv">
<label class="control-label left">下载模板:</label>
<input class="btn btn-primary btn-sm" onclick="window.open('${path }/static/template/部门列表导入模板.xls');" type="button" value="下载模板">
</div>
<div class="formDiv">
<label for="re_effective" class="control-label left">选择文件:</label>
<input id="upfile" type="file" name="upfile" calss="layui-btn">
</div>
<div class="modelBtns">
<input class="btn btn-primary btn-sm" type="button" value="批量导入Excel数据"
onclick="importExcel('/dept/importExcel','部门')">
</div>
<div class="formDiv">
<label class="warningLabel">友情提醒:</label>
<div class="warningDiv">
<span style="color: red"></br>1、部门名不能为空,不能重复,内容最多16个字。</span></br>
<span style="color: red">2、是否有效不能为空,内容最多9个字。</span></br>
<span style="color: red">3、备注可为空,内容最多50个字。</span></br>
<span style="color: red">4、值包含逗号必须单元格设置为文本类型。</span></br>
</div>
</div>
</form>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<script>
$(function () {
$(".modal-dialog").draggable();//为模态对话框添加拖拽
})
</script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
<script src="${path}/static/js/blood.js"></script>
<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
</body>
</html>

@ -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" %>
<html>
<head>
<title>归属管理(医院、系统)</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- 引入 Bootstrap -->
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css">
<link rel="stylesheet" href="${path}/static/css/bootstrap-select.min.css">
<link rel="stylesheet" href="${path}/static/css/bootstrapValidator.min.css">
<link rel="stylesheet" href="${path}/static/css/fileinput.min.css">
<link rel="stylesheet" href="${path}/static/zTree_v3-master/css/zTreeStyle/zTreeStyle.css">
</head>
<body>
<div class="container" style="width: 100%">
<div class="row clearfix">
<div class="col-md-12 column">
<div class="panel-body" style="padding-bottom:0px;">
<div class="panel panel-default">
<div class="panel-heading">基本管理/科室管理</div>
<form class="form-inline " style="margin-top: 15px;margin-left: 30px;padding-bottom: 15px" role="form">
<div class="row">
<div class="form-group">
<label for="deptId">所属科室</label>
<div class=" form-group form-inline">
<select class=" form-control" id="deptId">
<option value="">全部</option>
</select>
</div>
</div>
<div class="form-group">
<label for="dictId">归属ID</label>
<input type="text" class="form-control" id="dictId"/>
</div>
<div class="form-group">
<label for="hospitalName">医院名称</label>
<input type="text" class="form-control" id="hospitalName"/>
</div>
<div class="form-group">
<label for="sysFlag">系统标识</label>
<input type="text" class="form-control" id="sysFlag"/>
</div>
<div class="form-group">
<label for="sysName">系统名称</label>
<input type="text" class="form-control" id="sysName"/>
</div>
<div class="form-group">
<label for="parentId">父节点</label>
<div class=" form-group form-inline">
<div>
<input id="txtTreeSelect" type="text" onclick="showMenu(); return false;"
class="form-control" placeholder="父节点"
id="parentId" name="parentId"
data-id=""
readonly="readonly"
/>
</div>
<div id="menuContent" class="menuContent" style="display: none;background: #f9f9f9;
position: absolute;z-index: 10">
<ul id="treeDemo" class="ztree" style="margin-top: 0; width: 178px;">
</ul>
</div>
</div>
</div>
<div class="form-group">
<label for="dictStatus">状态</label>
<div class=" form-group form-inline">
<select class=" form-control" id="dictStatus">
<option value="">全部</option>
<option value="1">启用</option>
<option value="0">未启用</option>
</select>
</div>
</div>
<div class="form-group">
<button type="button" style="margin-left:20px" id="queryBtn" class="btn btn-info">查询</button>
<!-- <button type="button" style="margin-left:20px" id="addBtn" class="btn btn-primary">新增</button>-->
</div>
</div>
</form>
</div>
</div>
<div class="form-group">
<button onclick="add()" class="btn btn-warning">增加</button>
<button class="btn btn-success" id="btn_import">导入Excel</button>
<a href="${path}/dict/export" class="btn btn-primary" id="btn_download">导出Excel</a>
<input type="file" id="file" style="display: none">
<div id="toolbar"></div>
<table id="bootstrapTable" class="table table-condensed"></table>
</div>
</div>
</div>
</div>
<!-- 模态框Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel"></h4>
</div>
<div class="modal-body">
<form id="updateaddform">
<h4 class="modal-title">医院信息</h4>
<div class="form-group">
<label for="re_hospitalName" class="control-label">医院名称:</label>
<input type="hidden" id="re_dictId">
<input type="text" class="form-control" id="re_hospitalName" name="re_hospitalName">
</div>
<div class="form-group">
<label for="re_dictArea" class="control-label">医院地区:</label>
<input type="text" class="form-control" id="re_dictArea">
</div>
<div class="form-group">
<label for="re_hospitalTel" class="control-label">医院电话:</label>
<input type="text" class="form-control" id="re_hospitalTel">
</div>
<h4 class="modal-title">系统信息</h4>
<div class="form-group">
<label for="re_sysFlag" class="control-label">系统标识:</label>
<input type="text" class="form-control" id="re_sysFlag" name="re_sysFlag">
</div>
<div class="form-group">
<label for="re_sysName" class="control-label">系统名称:</label>
<input type="text" class="form-control" id="re_sysName" name="re_sysName">
</div>
<div class="form-group">
<label for="re_sysType" class="control-label">系统分类:</label>
<select class="form-control" id="re_sysType" name="re_sysType">
</select>
</div>
<div class="form-group">
<label for="re_deptId" class="control-label">所属科室:</label>
<select class="form-control" id="re_deptId" name="re_deptId">
<option value="">全部</option>
</select>
</div>
<div class="form-group">
<label for="txtTreeSelect1" class="control-label">父节点:</label>
<div class=" form-group form-inline">
<div>
<input id="txtTreeSelect1" type="text" onclick="showMenu1(); return false;"
class="form-control" placeholder="父节点"
id="parentId1" name="parentId1"
data-id=""
readonly="readonly"
/>
</div>
<div id="menuContent1" class="menuContent" style="display: none;background: #f9f9f9;
position:static;z-index:10">
<ul id="treeDemo1" class="ztree" style="margin-top: 0; width: 178px;">
</ul>
</div>
</div>
</div>
<div class="form-group">
<label for="re_sort" class="control-label">排序:</label>
<input type="text" class="form-control" id="re_sort" name="re_sort">
</div>
<div class="form-group">
<label for="re_dictStatus" class="control-label">状态:</label>
<select class="form-control" id="re_dictStatus" name="re_dictStatus">
<option value="1">启用</option>
<option value="0">未启用</option>
</select>
</div>
<div class="form-group">
<label for="re_dictEdit" class="control-label">可编辑否:</label>
<select class="form-control" id="re_dictEdit" name="re_dictEdit">
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="form-group">
<label for="re_remark" class="control-label">备注:</label>
<textarea id="re_remark" class="form-control" name="re_remark"></textarea>
</div>
</form>
</div>
<div class="modal-footer">
<span id="returnMessage" class="glyphicon"> </span>
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="btn_submit">提交更改</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<script src="${path}/static/bootstrap-3.3.7/bower_components/jquery/dist/jquery.min.js"></script>
<script src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.js"></script>
<script src="${path}/static/js/bootstrap-select.min.js"></script>
<script src="${path}/static/js/bootstrapValidator.min.js"></script>
<script src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="${path}/static/js/fileinput.min.js"></script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
<script src="${path}/static/js/dict.js"></script>
</body>
</html>

@ -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);
}
}
%>
<html>
<head>
<title>嘉时软件</title>
<!--导入CSS -->
<link rel="stylesheet" href="${path}/static/css/login.css">
<script>
var path = "${path}";
</script>
</head>
<body style="background:url('${path}/static/img/login/bg.png')">
<!--头部-->
<div class="login_head">
<!--头部文字-->
<div class="head_left left">
<div class="head_left_span">
<span>嘉时&nbsp;&nbsp;&nbsp;广东省脐带血造血干细胞库档案管理系统</span></div>
</div>
<!--右边logon-->
<div class="head_right left">
<img src="${path}/static/img/login/blood.jpg">
</div>
</div>
<!--中间-->
<div class="login_content">
<div class="content_left left">
<div class="image1" style="background:url('${path}/static/img/login/图.png') no-repeat">
</div>
</div>
<div class="content_login left">
<form method="post" action="${path}/login">
<div class="login_div" style="background:url('${path}/static/img/login/登录框.png') no-repeat">
<div class="login_title">
<h3 style="text-align: center">账号登录</h3>
</div>
<div class="inputDiv">
<input type="text" id="userName" name="userName" class="form-control uname left" placeholder="用户名" required value="<%=userName%>"/>
</div>
<div class="inputDiv">
<input type="password" id="userPwd" name="userPwd" class="form-control pword m-b" placeholder="密码" required value="<%=password%>" autocomplete="new-password"/>
</div>
<div class="inputDiv">
<label><input type="checkbox" name="rememberMe" id="rememberMe" value="yes" style="vertical-align:middle; margin-top:0;" <%=checked%>>记住密码</label>
</div>
<%--<a href="#" id="forgetPwd" style="float: right;">忘记密码了?</a>--%>
<div class="inputDiv">
<button class="btn btn-success btn-block">登录</button>
<p class="text-danger">${msg}</p>
</div>
</div>
</form>
</div>
</div>
<!--尾部-->
<div class="login_foot">
<div class="span_div"><span>技术支持:厦门嘉时软件科技有限公司</span></div>
</div>
<script type="text/javascript" src="${path}/static/js/login.js"></script>
</body>
</html>

@ -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);
}
}
%>
<html>
<head>
<title>嘉时软件</title>
<!--导入CSS -->
<link rel="stylesheet" href="${path}/static/css/login.css">
<script>
var path = "${path}";
</script>
</head>
<body style="background:url('${path}/static/img/login/bg.png')">
<!--头部-->
<div class="login_head">
<!--头部文字-->
<div class="head_left left">
<div class="head_left_span">
<span>嘉时&nbsp;&nbsp;&nbsp;病历无纸化归档管理系统</span>
</div>
</div>
<!--右边logon-->
<div class="head_right left">
<%--<img src="${path}/static/img/login/yingde.png">--%>
</div>
</div>
<!--中间-->
<div class="login_content">
<div class="content_left left">
<div class="image1" style="background:url('${path}/static/img/login/图.png') no-repeat">
</div>
</div>
<div class="content_login left">
<form method="post" action="${path}/login">
<div class="login_div" style="background:url('${path}/static/img/login/登录框.png') no-repeat">
<div class="login_title">
<h3 style="text-align: center">账号登录</h3>
</div>
<div class="inputDiv">
<input type="text" id="userName" name="userName" class="form-control uname left" placeholder="用户名" required value="<%=userName%>"/>
</div>
<div class="inputDiv">
<input type="password" id="userPwd" name="userPwd" class="form-control pword m-b" placeholder="密码" required value="<%=password%>" autocomplete="new-password"/>
</div>
<div class="inputDiv">
<label><input type="checkbox" name="rememberMe" id="rememberMe" value="yes" style="vertical-align:middle; margin-top:0;" <%=checked%>>记住密码</label>
</div>
<%--<a href="#" id="forgetPwd" style="float: right;">忘记密码了?</a>--%>
<div class="inputDiv">
<button class="btn btn-success btn-block">登录</button>
<p class="text-danger">${msg}</p>
</div>
</div>
</form>
</div>
</div>
<!--尾部-->
<div class="login_foot">
<div class="span_div"><span>技术支持:厦门嘉时软件科技有限公司</span></div>
</div>
<script type="text/javascript" src="${path}/static/js/login.js"></script>
</body>
</html>

@ -73,11 +73,10 @@
}
/**查询按钮组*/
.btnsDiv {
width: 100%;
height: 32px;
.btns{
text-align: right;
padding-top: 5px;
margin-top: 5px;
margin-right: 15px;
}
/**表格div*/
@ -98,7 +97,7 @@
<label class="labelDiv">日志主题:</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="logTitle">
<input type="text" class="form-control input-sm" id="logTitle" maxlength="50">
</div>
</div>
<div class="searchInput left">
@ -106,7 +105,7 @@
<label class="labelDiv">日志内容:</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="logContent">
<input type="text" class="form-control input-sm" id="logContent" maxlength="500">
</div>
</div>
<div class="searchInput left">
@ -114,7 +113,7 @@
<label class="labelDiv">操作人:</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="creater">
<input type="text" class="form-control input-sm" id="creater" maxlength="8">
</div>
</div>
<div class="dateSearchDiv left">
@ -122,17 +121,17 @@
<label class="labelDiv">操作时间:</label>
</div>
<div class="dateSearchInput left">
<input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间">
<input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间" maxlength="10" autocomplete="off">
</div>
<div class="dateSearchInput left">
<input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间">
<input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间" maxlength="10" autocomplete="off">
</div>
</div>
<div class="left">
<button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
</div>
</div>
<div class="btnsDiv">
<div class="btns">
<pm:myPermissions permissions="/otherManage/exportExcel">
<button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i class="fa fa-reply"></i>导出
</button>

@ -1,210 +0,0 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jspf/common.jspf" %>
<%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %>
<html>
<head>
<title>角色管理</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- 引入 Bootstrap -->
<link rel="stylesheet" href="${path}/static/css/comm.css">
<link rel="stylesheet" href="${path}/static/zTree_v3-master/css/zTreeStyle/zTreeStyle.css">
<style type="text/css">
/*页头*/
.panel-heading{
padding: 0 16px;
}
hr{
margin:0;
}
.form-group{
margin-left:15px;
}
/*模态框表单*/
.formDiv{
width:100%;
height:30px;
margin-top:10px;
}
.control-label{
width:30%;
text-align: right;
padding-top:2px;
}
.input{
width:50%;
float:left;
}
/*按钮组*/
.btns{
text-align: right;
margin-bottom: 5px;
}
/*模态框*/
.modal-header{
text-align: center;
}
.modal-title{
font-weight: bold;
}
.modelBtns{
text-align: center;
}
.modelBtn{
width: 74px;
margin-left: 38px;
margin-bottom: 16px;
}
.tableDiv{
margin-left:14px;
}
.shortInput{
width:80px;
}
.warningLabel{
margin-left:102px;
}
.warningDiv{
margin-left: 134px;
margin-top: -20px;
}
.operBtns{
margin-left:5px;
}
</style>
</head>
<body>
<div style="width: 100%">
<input type="hidden" id="checks">
<input type="hidden" id="userNames">
<div class="row">
<div class="col-md-12">
<div class="panel-heading"><h4>基本管理/角色管理</h4></div>
<hr>
<form class="form-inline" style="margin-top: 5px;margin-bottom: 0px;" role="form">
<div class="">
<div class="form-group">
<label>角色名:</label>
<input type="text" class="form-control input-sm" id="role_name" maxlength="16"/>
</div>
<div class="form-group">
<label for="effective">是否有效</label>
<div class=" form-group form-inline">
<select class=" form-control input-sm" id="effective">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
</div>
<div class="form-group">
<label for="creater">创建人</label>
<input type="text" class="form-control input-sm" id="creater" maxlength="16"/>
</div>
<div class="form-group">
<button type="button" style="margin-left:20px" id="queryBtn" class="btn btn-info btn-sm">查询</button>
</div>
</div>
</form>
</div>
</div>
<div class="btns">
<pm:myPermissions permissions="/role/add">
<button type="button" onclick="add()" class="btn btn-warning btn-sm">增加</button>
</pm:myPermissions>
<pm:myPermissions permissions="/r ole/importExcel">
<button type="button" class="btn btn-success btn-sm" onclick="importBtn()">导入Excel</button>
</pm:myPermissions>
<pm:myPermissions permissions="/role/export">
<button type="button" class="btn btn-primary btn-sm" onclick="exportExcel()">导出Excel</button>
</pm:myPermissions>
</div>
<div class="tableDiv">
<table id="bootstrapTable" class="table text-nowrap table-bordered"></table>
</div>
</div>
<!-- 模态框Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">角色信息</h4>
</div>
<div class="modal-body" style="height:auto">
<form id="updateaddform">
<div class="formDiv">
<label class="control-label left">角色名:</label>
<input type="hidden" id="re_roleId" name="roleId">
<input type="text" class="form-control input input-sm" id="re_roleName" name="roleName" maxlength="15">
</div>
<div class="formDiv">
<label for="re_effective" class="control-label left">有效否:</label>
<select class="form-control input input-sm shortInput" id="re_effective" name="effective">
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="formDiv">
<label for="re_remark" class="control-label left">备注:</label>
<textarea id="re_remark" class="form-control input input-sm" name="remark" maxlength="50"></textarea>
</div>
</form>
</div>
<div class="modelBtns">
<button type="button" class="btn btn-primary btn-sm modelBtn" id="btn_submit">提交</button>
<button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<!-- 模态框Modal1 导入-->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel1">导入信息</h4>
</div>
<div class="modal-body" style="height:240px">
<form method="POST" enctype="multipart/form-data"
id="form1">
<div class="formDiv">
<label class="control-label left">下载模板:</label>
<input class="btn btn-primary btn-sm" onclick="window.open('${path }/static/template/角色列表导入模板无下载.xls');" type="button" value="下载模板">
</div>
<div class="formDiv">
<label for="re_effective" class="control-label left">选择文件:</label>
<input id="upfile" type="file" name="upfile" calss="layui-btn">
</div>
<div class="modelBtns">
<input class="btn btn-primary btn-sm" type="button" value="批量导入Excel数据"
onclick="importExcel('/role/importExcelNotDown','角色')">
</div>
<div class="formDiv">
<label class="warningLabel">友情提醒:</label>
<div class="warningDiv">
<span style="color: red"></br>1、角色名不能为空,不能重复,内容最多16个字。</span></br>
<span style="color: red">2、备注可为空,内容最多50个字。</span></br>
<span style="color: red">3、是否有效不能为空,内容最多9个字。</span></br>
<span style="color: red">4、值包含逗号必须单元格设置为文本类型。</span></br>
</div>
</div>
</form>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<script>
$(function () {
$(".modal-dialog").draggable();//为模态对话框添加拖拽
})
</script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
<script src="${path}/static/js/roleNotDown.js?t=2"></script>
<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
</body>
</html>

@ -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" %>
<html>
<head>
<title>用户管理</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- 引入 Bootstrap -->
<link rel="stylesheet" href="${path}/static/css/comm.css">
<link rel="stylesheet" href="${path}/static/zTree_v3-master/css/zTreeStyle/zTreeStyle.css">
<link href="${path}/static/select2/select2.css" rel="stylesheet">
<script src="${path}/static/select2/select.js"></script>
<style type="text/css">
/*页头*/
.panel-heading{
padding: 0 16px;
}
hr{
margin:0;
}
.form-group{
margin-left:15px;
}
/*模态框表单*/
.formDiv{
width:100%;
height:30px;
}
.searchDiv{
margin-bottom:0px!important;
}
.control-label{
width:30%;
text-align: right;
padding-top:2px;
}
.input{
width:50%;
float:left;
}
/*按钮组*/
.btns{
margin-top:5px;
text-align: right;
margin-bottom: 5px;
}
/*模态框*/
.modal-header{
text-align: center;
}
.modal-title{
font-weight: bold;
}
.modelBtns{
text-align: center;
}
.modelBtn{
width: 74px;
margin-left: 38px;
margin-bottom: 16px;
}
.operBtns{
margin-left:10px;
}
.tableDiv{
margin-left:14px;
}
.shortInput{
width:80px;
}
.sexInput{
width:70px;
}
.warningLabel{
margin-left:102px;
}
.warningDiv{
margin-left: 134px;
margin-top: -20px;
}
.hidden-xs{
max-width: 250px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.form-group{
padding-top: 5px;
}
/*.dropdown {
width:50%!important;
}*/
</style>
</head>
<body>
<div style="width: 100%">
<input type="hidden" id="checks">
<input type="hidden" id="userNames">
<div class="row">
<div class="col-md-12">
<div class="panel-heading"><h4>基本管理/用户管理</h4></div>
<hr>
<form class="form-inline searchDiv" role="form">
<div class="">
<div class="form-group">
<label for="user_name">账号:</label>
<input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
</div>
<div class="form-group">
<label for="user_email">邮箱地址:</label>
<input type="text" class="form-control input-sm" id="user_email" maxlength="25"/>
</div>
<div class="form-group">
<label>所属角色:</label>
<div class=" form-group form-inline">
<select class=" form-control input-sm" style="width:106px" id="roleId">
<option value="">全部</option>
</select>
</div>
</div>
<div class="form-group">
<label for="dept_id">所属部门:</label>
<div class=" form-group form-inline">
<select class="form-control input-sm" style="width:106px" id="dept_id">
<option value="">全部</option>
</select>
</div>
</div>
<div class="form-group">
<label for="effective">是否有效:</label>
<div class=" form-group form-inline">
<select class=" form-control input-sm" id="effective">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
</div>
<div class="form-group">
<button type="button" id="queryBtn" class="btn btn-primary btn-sm form-group">查询</button>
</div>
</div>
</form>
</div>
</div>
<div class="btns">
<pm:myPermissions permissions="/user/resetPassword">
<button type="button" onclick="resetPassword()" class="btn btn-info btn-sm">重置密码</button>
</pm:myPermissions>
<pm:myPermissions permissions="/user/add">
<button type="button" onclick="add()" class="btn btn-warning btn-sm">增加</button>
</pm:myPermissions>
<pm:myPermissions permissions="/user/importExcel">
<button type="button" class="btn btn-success btn-sm" onclick="importBtn()">导入Excel</button>
</pm:myPermissions>
<pm:myPermissions permissions="/user/export">
<button type="button" class="btn btn-primary btn-sm" onclick="exportExcel()">导出Excel</button>
</pm:myPermissions>
</div>
<div class="tableDiv">
<table id="bootstrapTable" class="table text-nowrap table-bordered"></table>
</div>
</div>
<!-- 模态框Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">用户信息</h4>
</div>
<div class="modal-body" style="height:auto">
<form id="updateaddform">
<div class="formDiv">
<label class="control-label left">账号:</label>
<input type="hidden" id="userId" name="userId">
<input type="text" class="form-control input input-sm" id="re_userName" name="userName" maxlength="15">
</div>
<div class="formDiv" id="passwordDiv">
<label class="control-label left">密码:</label>
<input type="password" class="form-control input input-sm" readonly onfocus="this.removeAttribute('readonly');" id="re_userPwd" name="userPwd" maxlength="15" autocomplete="new-password">
</div>
<div class="formDiv">
<label class="control-label left">姓名:</label>
<input type="text" class="form-control input input-sm" id="name" name="name" maxlength="15">
</div>
<div class="formDiv">
<label class="control-label left">性别:</label>
<select class="form-control input input-sm sexInput" id="re_userSex" name="userSex">
<option value="1" selected="selected">女</option>
<option value="0">男</option>
</select>
</div>
<div class="formDiv">
<label class="control-label left">年龄:</label>
<input type="number" class="form-control input input-sm sexInput" id="re_userAge" name="userAge" oninput="if(value.length>3)value=value.slice(0,3)">
</div>
<div class="formDiv">
<label class="control-label left">移动电话:</label>
<input type="text" class="form-control input input-sm" id="re_userTel" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
</div>
<div class="formDiv">
<label class="control-label left">邮箱地址:</label>
<input type="text" class="form-control input input-sm" id="re_userEmail" name="userEmail" maxlength="25">
</div>
<div class="formDiv">
<label class="control-label left">职位:</label>
<input type="text" class="form-control input input-sm" id="re_userPosition" name="userPosition" maxlength="25">
</div>
<div class="formDiv">
<label class="control-label left">所属部门:</label>
<div style="width:100%">
<select class="selectpicker" multiple id="deptId" name="deptId" style="max-height:400px!important;overflow:scroll;" data-live-search="true" data-actions-box="true">
<c:forEach items="${depts}" var="dept">
<option value="${dept.deptId}" <c:if test="${deptId == dept.deptId}">selected</c:if>>${dept.deptName}</option>
</c:forEach>
</select>
<%-- <input id="txtTreeSelect1" type="text" onclick="showMenu1(); return false;"
class="form-control input-sm input" placeholder="所属科室"
name="parentId1"
data-id=""
readonly="readonly"
/>
<input type="hidden" id="deptIds" name="deptId">--%>
</div>
</div>
<%--<div id="menuContent1" class="menuContent" style="display:none;background: #f9f9f9;
position:static;z-index:10;width:288px;margin-left:170px">
<ul id="treeDemo" class="ztree" style="margin-top: 0; width: 178px;">
</ul>
</div>--%>
<div class="formDiv">
<label class="control-label left">所属角色:</label>
<select class="form-control input input-sm" id="re_roleId" name="roleId">
</select>
</div>
<div class="formDiv">
<label class="control-label left">有效否:</label>
<select class="form-control input input-sm shortInput" id="re_effective" name="effective">
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="formDiv">
<label class="control-label left">备注:</label>
<textarea id="re_remark" class="form-control input input-sm" name="remark" maxlength="50"></textarea>
</div>
</form>
</div>
<div class="modelBtns">
<button type="button" class="btn btn-primary btn-sm modelBtn" id="btn_submit">提交</button>
<button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<!-- 模态框Modal1 导入-->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel1">导入信息</h4>
</div>
<div class="modal-body" style="height:380px">
<form method="POST" enctype="multipart/form-data"
id="form1">
<div class="formDiv">
<label class="control-label left">下载模板:</label>
<input class="btn btn-primary btn-sm" onclick="window.open('${path }/static/template/用户列表导入模板(脐血库).xls');" type="button" value="下载模板">
</div>
<div class="formDiv">
<label for="re_effective" class="control-label left">选择文件:</label>
<input id="upfile" type="file" name="upfile" calss="layui-btn">
</div>
<div class="modelBtns">
<input class="btn btn-primary btn-sm" type="button" value="批量导入Excel数据"
onclick="importExcel('/user/importExcel','用户')">
</div>
<div class="formDiv">
<label class="warningLabel">友情提醒:</label>
<div class="warningDiv">
<span style="color: red"></br>1、用户名不能为空,不能重复,内容最多16个字</span></br>
<span style="color: red">2、密码不能为空,内容最多20个字</span></br>
<span style="color: red">3、性别不能为空,内容最多9个字</span></br>
<span style="color: red">4、年龄必须为正整数0-150,可为空,内容最多3个字</span></br>
<span style="color: red">5、手机号可为空,内容最多11个字</span></br>
<span style="color: red">6、邮箱可为空,内容最多25个字</span></br>
<span style="color: red">7、角色名不能为空</span></br>
<span style="color: red">8、部门名不能为空,可多个,"@"符号隔开。</span></br>
<span style="color: red">9、是否有效不能为空,内容最多9个字</span></br>
<span style="color: red">10、备注可为空,内容最多50个字</span></br>
<span style="color: red">11、值包含逗号必须单元格设置为文本类型。</span></br>
</div>
</div>
</form>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<script>
$(function () {
$(".modal-dialog").draggable();//为模态对话框添加拖拽
$("#dept_id").select2()
})
</script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
<script src="${path}/static/js/user1.js?t=1"></script>
<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
</body>
</html>

@ -46,14 +46,13 @@
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<!--<filter>
<filter-name>startFilter</filter-name>
<filter-class>com.manage.controller.webSocket.StartFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>startFilter</filter-name>
<url-pattern>/</url-pattern>
</filter-mapping>-->
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>power.root</param-value>
</context-param>
<listener>
<listener-class>org.springframework.web.util.WebAppRootListener</listener-class>
</listener>
<!-- springMVC的前端控制器拦截所有的请求 -->
<servlet>
<servlet-name>dispatcherServlet</servlet-name>

@ -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 += '<button type="button" onclick="edit('+row.deptId+')" class="btn btn-info operBtns btn-sm" >编辑</button>';
}
if(row.isDelete == 1){
editanddrop += '<button type="button" onclick="drop('+row.deptId+')" class="btn btn-danger operBtns btn-sm">删除</button>';
}
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<rows.length;i++)
{
checks += rows[i].deptId + ","
}
$("#checks").val(checks);
},
//全不选
onUncheckAll: function (rows) {
$("#checks").val("");
}
});
//初始化表单验证
//formValidator();
});
/*//回跳表格页码
function backToPage(){
var pageSize=$('#bootstrapTable').bootstrapTable('getOptions').pageSize;
var rows=$('#bootstrapTable').bootstrapTable("getOptions").totalRows;
if((pageSize*(pageNumber-1)) == (rows-1) && pageNumber != 1){
pageNumber -= 1;
refresh();
}
$('#bootstrapTable').bootstrapTable('selectPage', pageNumber);
}*/
//先销毁modal
/*$('#myModal').on('hidden.bs.modal', function() {
$("#updateaddform").data('bootstrapValidator').destroy();
$('#updateaddform').data('bootstrapValidator', null);
formValidator();
});
//form验证规则
function formValidator() {
//表单校验
form = $('#updateaddform');
form.bootstrapValidator({
message: '输入值不合法',
feedbackIcons: {
valid: 'glyphicon glyphicon-ok',
invalid: 'glyphicon glyphicon-remove',
validating: 'glyphicon glyphicon-refresh'
},
fields: {
re_deptName: {
message: '部门名不合法',
validators: {
notEmpty: {
message: '角色名不能为空'
},
stringLength: {
min: 2,
max: 32,
message: '请输入2到32个字符'
},
regexp: {
regexp: /^[a-zA-Z0-9_\. \u4e00-\u9fa5 ]+$/,
message: '角色名只能由字母、数字、点、下划线和汉字组成 '
}
}
}
,re_dictId: {
validators: {
}
},re_effective: {
validators: {
}
},re_remark: {
validators: {
}
},
}
});
}*/
//加载
function loadDict(){
$.ajax({
type: "GET",
url:path+ "/dict/selectHosList",
dataType: "json",
success: function(data){
if(data != null){
var html = '';
$.each(data, function(commentIndex, comment){
html += '<option value="'+comment['dictId']+'">' + comment['hospitalName']
+ '</option>';
});
$('#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();
});

@ -1,293 +0,0 @@
/**
* Created by ly on 2019/4/25.
*/
var pageNumber = 1;
var form = '';
$(function(){
$('#myModal').modal('hide');
//先销毁表格
$('#bootstrapTable').bootstrapTable({
//表格高度
height: getHeight(),
method : 'get',
url : path+ "/role/pageList",//请求路径
striped : true, //是否显示行间隔色
pageNumber : 1, //初始化加载第一页
pagination : true,//是否分页
sidePagination : 'server',//server:服务器端分页|client前端分页
pageSize : 10,//单页记录数
pageList : [ 5, 10, 20, 30 ],//可选择单页记录数
cache: false,
paginationPreText : '上一页',
paginationNextText : '下一页',
queryParams : function(params) {//上传服务器的参数
var temp = {//如果是在服务器端实现分页limit、offset这两个参数是必须的
limit : params.limit, // 每页显示数量
offset : params.offset, // SQL语句起始索引
page : (params.offset / params.limit) + 1, //当前页码
roleId:$("#role_id").val(),
roleName:$("#role_name").val(),
effective : $("#effective option:selected").val(),
creater:$("#creater").val(),
};
return temp;
},
columns : [{
checkbox:true
},
{
title:'序号',
field:'no',
formatter: function (value, row, index) {
//获取每页显示的数量
var pageSize = $('#bootstrapTable').bootstrapTable('getOptions').pageSize;
//获取当前是第几页
if(pageNumber == 1){
pageNumber = $('#bootstrapTable').bootstrapTable('getOptions').pageNumber;
}
//返回序号注意index是从0开始的所以要加上1
return pageSize * (pageNumber - 1) + index + 1;
}
},
{
title:'角色名',
field:'roleName',
},
{
title:'备注',
field:'remark',
formatter:function (value,row,index) {
if(value ==null){
return "";
}else{
return value;
}
}
},
{
title:'是否有效',
field:'effective',
formatter: function (value, row, index) {
if(value ==1){
return '是'
}else if(value ==0){
return '否'
}
}
},
{
title:'创建时间',
field:'createDate',
},
{
title:'创建人',
field:'creater',
},
{
title:'操作',
field:'roleId', formatter: function(value,row,index){
var editanddrop = '';
if(row.isUpdate == 1){
editanddrop += '<button type="button" onclick="edit('+row.roleId+')" class="btn btn-info operBtns btn-sm" >编辑</button>';
}
if(row.isDelete == 1){
editanddrop += '<button type="button" onclick="drop('+row.roleId+')" class="btn btn-danger operBtns btn-sm">删除</button>';
}
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<rows.length;i++)
{
checks += rows[i].roleId + ","
}
$("#checks").val(checks);
},
//全不选
onUncheckAll: function (rows) {
$("#checks").val("");
}
});
});
//验证角色名不能重复
$("#re_roleName").blur(function(){
var roleName = $("#re_roleName").val();
var roleId = $("#re_roleId").val();
if(roleId == '' && roleName != ''){
$.ajax({
type:'get',
url:path+'/role/checkRoleName',
data:{roleName:roleName},
dataType:'json',
success:function(data){
if(data.code == 200){
toastr.warning(data.msg);
$("#re_roleName").val("");
$("#re_roleName").focus();
}
}
})
}
})
//编辑框回显
function edit(id){
$("#myModalLabel").text("编辑");
$.ajax({
type: "post",
url:path+ "/role/selectRole",
data:{
roleId:id
},
dataType:"json",
success: function(data){
$("#re_roleId").val(data.roleId);
$("#re_roleName").val(data.roleName);
$("#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 + "/role/delete",
data: {
roleId: 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')
}
//提交更改
$('#btn_submit').click(function () {
//获取档案管理系统的权限复选框是否选中
var roleName = $("#re_roleName").val();
if(roleName != ''){
var roleId = $("#re_roleId").val();
var url = '';
if(roleId == ''){
url = path+"/role/add";
}else{
url = path+"/role/update";
}
$.ajax({
type: "post",
url:url,
data:$("#updateaddform").serialize(),
dataType:"json",
success: function(data){
if("success"==data.msg){
toastr.success('保存成功!');
$('#myModal').modal('hide');
backToPage();
}else{
toastr.warning(data.msg);
}
}
})
}else{
toastr.warning("角色名不能为空!");
}
})
//初始化模态框
function initable(){
$("#updateaddform")[0].reset();
$("#re_roleId").val("");
}
//搜索
$('#queryBtn').click(function () {
$("#checks").val("");
refresh();
})
//获取table的高度
function getHeight() {
return $(window).height() * 0.8;
}
//刷新表格
function refresh() {
$('#bootstrapTable').bootstrapTable('refresh',{
url : path+'/role/pageList'
})
}
//清空
function clearForm(){
$("#updateaddform")[0].reset();
}
//导出excel功能
function exportExcel(){
var checks = $("#checks").val();
if(checks != '') {
checks = checks.substring(0, checks.length - 1);
var url = path+"/role/exportNotDown?roleName="+$("#role_name").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
window.location.href = url;
}else{
Common.confirm({
title: "提示",
message: "没有选中,您确定要按搜索栏条件导出?",
operate: function (reselt) {
if (reselt) {
var url = path + "/role/exportNotDown?roleName=" + $("#role_name").val() + "&effective=" + $("#effective").val() + "&creater=" + $("#creater").val() + "&checks=" + checks;
window.open(url);
}
}
})
}
}
//监听关闭模态框刷新事件
$('#myModal1').on('hide.bs.modal', function () {
window.location.reload();
});

@ -1,632 +0,0 @@
var pageNumber=1;
var form = '';
$(function(){
$('#myModal').modal('hide');
loadDept();
loadRole();
//先销毁表格
$('#bootstrapTable').bootstrapTable({
//表格高度
height: getHeight(),
method : 'get',
url :path+ "/user/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, //当前页码
userName:$("#user_name").val(),
userEmail:$("#user_email").val(),
searchRoleId:$("#roleId").val(),
deptId : $("#dept_id option:selected").val(),
effective : $("#effective option:selected").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:'userName',
},
{
title:'姓名',
field:'name',
},
{
title:'性别',
field:'userSex',
formatter: function (value, row, index) {
if(value ==1){
return '女'
}else if(value ==0){
return '男'
}
}
},
{
title:'年龄',
field:'userAge',
},
{
title:'移动电话',
field:'userTel',
},
{
title:'邮箱地址',
field:'userEmail',
},
{
title:'用户职位',
field:'userPosition',
},
{
title:'所属角色',
field:'roleName',
},
{
title:'所属部门',
field:'powerDepts',
formatter:paramsMatter,
},
{
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:'userId', formatter: function(value,row,index){
var editanddrop = '';
if(row.isUpdate == 1){
editanddrop += '<button type="button" onclick="edit('+row.userId+')" class="btn btn-info operBtns btn-sm" >编辑</button>';
}
if(row.isDelete == 1){
editanddrop += '<button type="button" onclick="drop('+row.userId+')" class="btn btn-danger operBtns btn-sm">删除</button>';
}
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<rows.length;i++)
{
checks += rows[i].userId + ","
userNames += rows[i].userName + ","
}
$("#checks").val(checks);
$("#userNames").val(userNames);
},
//全不选
onUncheckAll: function (rows) {
$("#checks").val("");
$("#userNames").val("");
}
});
});
//格式化科室列
function paramsMatter(value, row, index) {
value = '<p class="hidden-xs" title="'+value+'">'+value+'</p>'
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 += '<option value="'+comment['roleId']+'">' + comment['roleName']
+ '</option>';
});
$('#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 += '<option value="'+data.extend.list[i].deptId+'">' + data.extend.list[i].deptName
+ '</option>';
}
$('#dept_id').append(html);
}
});
}
//搜索
$('#queryBtn').click(function () {
$("#checks").val("");
refresh();
})
//编辑框回显
function edit(id){
$("#re_userName").prop("readOnly",true);
$("#passwordDiv").hide();
$("#myModalLabel").text("编辑");
$.ajax({
type: "post",
url: path+"/user/selectUser",
data:{
userId:id
},
dataType:"json",
success: function(data){
$("#userId").val(data.userId);
$("#re_userName").val(data.userName);
$("#name").val(data.name);
var deptIds = data.deptId;
var deptArr = deptIds.split(",");
$('#deptId').selectpicker('val', deptArr);
if(data.userSex == 1){
$("#re_userSex").val("1");
}else{
$("#re_userSex").val("0");
}
$("#re_userAge").val(data.userAge);
$("#re_userTel").val(data.userTel);
$("#re_userEmail").val(data.userEmail);
$("#re_userPosition").val(data.userPosition);
$("#txtTreeSelect1").val(data.powerDepts);
$("#deptIds").val(data.deptId);
$("#re_roleId").find("option[value='"+data.roleId+"']").attr("selected",true);
$("#re_effective").find("option[value='"+data.effective+"']").attr("selected",true);
$("#re_remark").val(data.remark);
/*loadTree();
var deptIds = data.deptId;
if(deptIds != ''){
var deptIdSplit =deptIds.split(",");
for (var i = 0;i < deptIdSplit.length;i++){
if(deptIdSplit[i] != ''){
//选中节点
treeSelectNode(deptIdSplit[i]);
}
}
}*/
}
});
$('#myModal').modal('show');
}
//删除
function drop(id) {
Common.confirm({
title: "提示",
message: "确定是否删除这条记录",
operate: function (reselt) {
if (reselt) {
$.ajax({
type: "post",
url: path + "/user/delete",
data: {
userId: id
},
async: false,
success: function (data) {
if ("success" == data.msg) {
toastr.success("删除成功!");
$("#checks").val("");
$("#userNames").val("");
backToPage();
} else {
toastr.error(data.msg);
}
},
error: function () {
window.confirm("删除失败");
}
})
}
}
})
}
//新增框
function add() {
$("#re_userName").prop("readOnly",false);
clearForm();
$("#userId").val("");
$("#deptIds").val("");
$('.selectpicker').selectpicker('val','1');
$('#myModal').modal('show');
$("#passwordDiv").show();
}
//清空
function clearForm(){
$("#updateaddform")[0].reset();
//loadTree();
$("#deptIds").val("");
}
//提交更改
$('#btn_submit').click(function () {
var reUserTel = $("#re_userTel").val();
if(reUserTel != ''){
if(!reUserTel.match(/^1[34578]\d{9}$/)){
toastr.warning("移动电话格式不正确!");
$("#re_userTel").val("");
$("#re_userTel").focus();
return false;
}
}
var reUserEmail = $("#re_userEmail").val();
if(reUserEmail != ''){
if(!reUserEmail.match(/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/)){
toastr.warning("邮箱地址格式不正确!");
$("#re_userEmail").val("");
$("#re_userEmail").focus();
return false;
}
}
var userName = $("#re_userName").val();
var userPwd = $("#re_userPwd").val();
var deptIds = $("#deptIds").val();
var roleId = $("#re_roleId").val();
if(userName != ''){
if(userPwd != '' || $("#userId").val() != ''){
if(userPwd.length >= 6 || $("#userId").val() != ''){
if(deptIds != ''){
if(roleId != ''){
saveForm();
}else{
toastr.warning("所属角色不能为空,如未显示角色请到角色管理添加角色!");
}
}else{
toastr.warning("所属科室不能为空!");
}
}else{
toastr.warning("密码长度不能少于6位!");
}
}else{
toastr.warning("密码不能为空!");
}
}else{
toastr.warning("用户名不能为空!");
}
})
function saveForm(){
var userId = $("#userId").val();
if(userId != ''){
$.ajax({
type: "post",
url:path+ "/user/update",
data:$("#updateaddform").serialize(),
dataType:"json",
success: function(data){
if("success"==data.msg){
toastr.success("修改成功!");
$('#myModal').modal('hide');
backToPage();
}else{
toastr.warning(data.msg);
}
}
})
}else if(userId == ''){
$.ajax({
type: "post",
url:path+ "/user/add",
data:$("#updateaddform").serialize(),
dataType:"json",
success: function(data){
if("success"==data.msg){
toastr.success("添加成功!");
setTimeout(function(){
window.location.reload();
},500)
}else{
toastr.warning(data.msg);
}
}
})
}
}
//获取table的高度
function getHeight() {
return $(window).height() - 190;
}
//刷新表格
function refresh() {
$('#bootstrapTable').bootstrapTable('refresh',{
url : path+'/user/pageList'
})
}
//重置密码
function resetPassword(){
var checks = $("#checks").val();
var userNames = $("#userNames").val();
if(checks != ''){
var ids = checks.split(",");
var userName = userNames.split(",");
if(ids.length == 2){
Common.confirm({
title: "提示",
message: '确定是否重置用户名'+userName[0]+'的密码为000000',
operate: function (reselt) {
if (reselt) {
$.ajax({
type: 'post',
url: path + '/user/resetPassword',
data: {userId: ids[0]},
dataType: 'json',
success: function (data) {
if (data.code == 100) {
toastr.success("重置成功!");
$("#checks").val("");
$("#userNames").val("");
backToPage();
} else {
toastr.error("重置失败,请联系系统管理员!")
}
}
})
}
}
})
}else{
toastr.warning("以防重置密码误选择,只允许一次重置一个!")
}
}else{
toastr.warning("请至少选中一条记录!")
}
}
//导出excel功能
function exportExcel(){
var checks = $("#checks").val();
if(checks != '') {
checks = checks.substring(0, checks.length - 1);
var url = path+"/user/export1?checks="+checks;
window.location.href = url;
}else{
Common.confirm({
title: "提示",
message: "没有选中,您确定要按搜索栏条件导出?",
operate: function (reselt) {
if (reselt) {
var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val();
window.location.href = url;
}
}
})
/* if(confirm('?')) {
var url = path+"/user/export?userName="+$("#user_name").val()+"&userEmail="+$("#user_email").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&checks="+checks;
window.location.href = url;
}*/
}
}
/**树操作*/
/*var setting = {
view: {
showIcon: true,//设置 zTree 是否显示节点的图标。默认值true
showLine: true//设置 zTree 是否显示节点之间的连线。默认值true
},
data: {
simpleData: {
chkStyle: "checkbox",
enable: true,
idKey: "id",
pIdKey: "parentId"
}
},
check:{
enable:true
},
callback: {
onCheck:onCheck
}
};
function onCheck(e, treeId, treeNode) {
var treeObj=$.fn.zTree.getZTreeObj("treeDemo"),
nodes=treeObj.getCheckedNodes(true);
var deptIds = '';
var deptNames = '';
//父节点必须一样
var parentId = new Array();
for (var i = 0; i < nodes.length; i++) {
if(nodes[i].level == 0){
var id = nodes[i].id;
parentId.push(id);
}
if(nodes[i].level == 1){
var deptId = nodes[i].selfId;
deptIds += deptId + ",";
deptNames += nodes[i].name + ",";
}
}
if(parentId.length > 1) {
toastr.warning("科室必须全部属于同一医院!");
treeObj.checkNode(treeNode,false,true);
}else{
if(deptIds != ''){
deptIds = deptIds.substring(0,deptIds.length-1);
deptNames = deptNames.substring(0,deptNames.length-1);
}
$("#txtTreeSelect1").val(deptNames);
$("#deptIds").val(deptIds);
}
}
var zNodes = [];
function loadTree() {
$.ajax({
type: "GET",
url: path + "/dept/selectDeptTreeByUserId",
dataType: "json",
async: false,
success: function (data) {
$.fn.zTree.init($("#treeDemo"), setting, data);
zTree = $.fn.zTree.getZTreeObj("treeDemo");
var nodes = zTree.getNodes();
for (var i = 0; i < nodes.length; i++) { //设置节点展开
zTree.expandNode(nodes[i], true, false, true);
}
}
});
}
//加载树
$(function(){
$("#re_userName").val("");
$("#updateaddform")[0].reset();
loadTree();
})
//选中节点 selfId
function treeSelectNode(selfId){
var zTree = $.fn.zTree.getZTreeObj("treeDemo");
var node = zTree.getNodeByParam("selfId",selfId);
if(node != null){
zTree.checkNode(node, true, true);
}
}*/
//监听关闭模态框刷新事件
$('#myModal1').on('hide.bs.modal', function () {
window.location.reload();
});

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>power</artifactId>
<groupId>com.manage</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>power-api</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>
<!-- 指定maven编译的jdk版本,如果不指定,maven3默认用jdk 1.5 maven2默认用jdk1.3 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<!-- 一般而言target与source是保持一致的但是有时候为了让程序能在其他版本的jdk中运行(对于低版本目标jdk源代码中不能使用低版本jdk中不支持的语法)会存在target不同于source的情况 -->
<source>1.8</source> <!-- 源代码使用的JDK版本 -->
<target>1.8</target> <!-- 需要生成的目标class文件的编译版本 -->
<encoding>UTF-8</encoding><!-- 字符集编码 -->
<verbose>true</verbose>
<showWarnings>true</showWarnings>
<fork>true</fork><!-- 要使compilerVersion标签生效还需要将fork设为true用于明确表示编译版本配置的可用 -->
<executable><!-- path-to-javac --></executable><!-- 使用指定的javac命令例如<executable>${JAVA_1_4_HOME}/bin/javac</executable> -->
<compilerVersion>1.3</compilerVersion><!-- 指定插件将使用的编译器的版本 -->
<meminitial>128m</meminitial><!-- 编译器使用的初始内存 -->
<maxmem>512m</maxmem><!-- 编译器使用的最大内存 -->
<!-- <compilerArgument>-verbose -bootclasspath ${java.home}\lib\rt.jar</compilerArgument> 这个选项用来传递编译器自身不包含但是却支持的参数选项 -->
</configuration>
</plugin>
</plugins>
<finalName>power-api</finalName>
</build>
</project>

@ -46,6 +46,11 @@
<artifactId>bcprov-jdk14</artifactId>
<scope>compile</scope>
</dependency>
<!--日志处理-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<!--系统使用率导包开始-->
<!--<dependency> &lt;!&ndash;工具类 小数格式化 可以改为其他&ndash;&gt;
<groupId>cn.hutool</groupId>

@ -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();
}
}
}

@ -26,20 +26,18 @@ public class ExportExcelUtil {
private String fileName;
private HSSFWorkbook workBook = null;
public List<String> getFieldName(String tableThNames){
private List<String> getFieldName(String tableThNames){
String[] names = tableThNames.split(",");
List<String> fieldName = new ArrayList<>();
if (names != null) {
for (int i = 0; i < names.length; i++) {
if (StringUtils.isNoneBlank(names[i])) {
fieldName.add(names[i]);
}
for (String name : names) {
if (StringUtils.isNoneBlank(name)) {
fieldName.add(name);
}
}
return fieldName;
}
public List<List<String>> getFieldData(String fieldCns, Collection list){
private List<List<String>> getFieldData(String fieldCns, Collection list){
List<List<String>> fieldData = new ArrayList<List<String>>();
String[] fieldList = fieldCns.split(",");
Object[] objects = list.toArray();
@ -69,7 +67,7 @@ public class ExportExcelUtil {
workBook.write(os);
os.close();
}
public HSSFWorkbook createWorkbook() {
private HSSFWorkbook createWorkbook() {
workBook = new HSSFWorkbook();
int rows = fieldData.size();
int sheetNum = 0;
@ -141,12 +139,12 @@ public class ExportExcelUtil {
return workBook;
}
public static String fieldToProperty(String field) {
private static String fieldToProperty(String field) {
if (null == field) {
return "";
}
char[] chars = field.toCharArray();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < chars.length; i++) {
char c = chars[i];
if (c == '_') {
@ -162,7 +160,7 @@ public class ExportExcelUtil {
return sb.toString();
}
public static String getFieldValueByFieldName(String fieldName, Object object) {
private static String getFieldValueByFieldName(String fieldName, Object object) {
try {
Class<?> clazz = object.getClass();
for (; clazz != Object.class; clazz = clazz.getSuperclass()) {

@ -311,20 +311,20 @@ public class ImportExcelJudgeMethod {
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> power_dept = deptMapper.checkDeptName(values[i], userDict.getDictId());
if(power_dept != null && !power_dept.isEmpty()){
deptIds.append(power_dept.get(0).getDeptId()+",");
}else{
return "\""+head+"\"其中有不存在,";
for (String value1 : values) {
if (StringUtils.isNotBlank(value1)) {
List<Power_Dept> power_dept = deptMapper.checkDeptName(value1, userDict.getDictId());
if (power_dept != null && !power_dept.isEmpty()) {
deptIds.append(power_dept.get(0).getDeptId()).append(",");
} else {
return "\"" + head + "\"其中有不存在,";
}
}
}
}else{
List<Power_Dept> power_dept = deptMapper.checkDeptName(value, userDict.getDictId());
if(power_dept != null && !power_dept.isEmpty()){
deptIds.append( power_dept.get(0).getDeptId()+",");
deptIds.append(power_dept.get(0).getDeptId()).append(",");
}else{
return "\""+head+"\"不存在,";
}

@ -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);
}
}
@ -219,7 +219,7 @@ public class ImportExcelUtil {
}
}catch (Exception e){
e.printStackTrace();
wrongStr.append("\""+head+"\"格式不正确,");
wrongStr.append("\"").append(head).append("\"格式不正确,");
}
return wrongStr;
}
@ -227,7 +227,7 @@ public class ImportExcelUtil {
/**
*
* */
public static void removeRow(Sheet sheet, int rowIndex) {
private static void removeRow(Sheet sheet, int rowIndex) {
int lastRowNum=sheet.getLastRowNum();
if(rowIndex>=0&&rowIndex<lastRowNum) {
sheet.shiftRows(rowIndex + 1, lastRowNum, -1);//将行号为rowIndex+1一直到行号为lastRowNum的单元格全部上移一行以便删除rowIndex行
@ -243,7 +243,7 @@ public class ImportExcelUtil {
/**
*
* */
public static String getCellValue(Cell cell) {
private static String getCellValue(Cell cell) {
String cellValue = "";
if (cell == null) {
return cellValue;
@ -295,8 +295,7 @@ public class ImportExcelUtil {
private static final Map<String, Workbook> workBookMap = new HashMap<>();
//通过key获取工作簿
public static Workbook getWorkBookMapByKey(String workBookKey){
Workbook workbook = workBookMap.get(workBookKey);
return workbook;
return workBookMap.get(workBookKey);
}
public static void copy(Object source, Object dest) throws Exception {

@ -40,13 +40,6 @@ public interface Power_Sys_DictService {
* */
List<Power_Sys_DictVo>selectSysType();
/**
* @Date 2019-4-25
* @Author ly
* @Description Excel
* */
void export(HttpServletResponse response)throws Exception;
/**@Date 2019-04-28
* @Author zengwh
*

@ -68,13 +68,6 @@ public interface Power_UserService {
* */
void export(Power_UserVo powerUser,HttpServletRequest request,HttpServletResponse response)throws Exception;
/**
* @Date 2019-4-25
* @Author ly
* @Description Excel
* */
void export1(Power_UserVo powerUser,HttpServletRequest request,HttpServletResponse response)throws Exception;
/**
* @Date 2019-5-14
* @Author ljx

@ -93,7 +93,7 @@ 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 {
@ -101,6 +101,7 @@ public class LogServiceImpl implements LogService {
} catch (UnknownHostException e) {
e.printStackTrace();
}
assert inet != null;
ipAddress= inet.getHostAddress();
}
}

@ -58,11 +58,11 @@ public class PageServiceImpl {
//最大登录数集合
List<Integer> maxCountList = new ArrayList<>();
//记录有数据开始标识
Boolean startFlag = false;
boolean startFlag = false;
//定义前一天的登录数量
Integer beforeLoginCount = 0;
int beforeLoginCount = 0;
//定义最大登录数量
Integer maxCount = 0;
int maxCount = 0;
for (int i = 0; i < dateList.size(); i++) {
//获取当天登录次数缓存
HashMap<String, Integer> map = CacheManager.getCurrentDayCount(dateList.get(i));
@ -134,7 +134,7 @@ public class PageServiceImpl {
//最大登录数集合
List<Integer> maxCountList = new ArrayList<>();
//记录有数据开始标识
Boolean startFlag = false;
boolean startFlag = false;
//定义统计登录数量
Integer maxCount = 0;
for (int i = 0; i < dateList.size(); i++) {
@ -172,16 +172,14 @@ public class PageServiceImpl {
}
public int getEcharts4() throws Exception{
SigarUtils s = new SigarUtils();
s.initSigar();
int cpuCount = cpu();
return cpuCount;
SigarUtils.initSigar();
return cpu();
}
private static int cpu() throws SigarException {
Sigar sigar = new Sigar();
CpuInfo infos[] = sigar.getCpuInfoList();
CpuPerc cpuList[] = null;
CpuInfo[] infos = sigar.getCpuInfoList();
CpuPerc[] cpuList = null;
cpuList = sigar.getCpuPercList();
double combined = 0;
for (int i = 0; i < infos.length; i++) {// 不管是单块CPU还是多CPU都适用
@ -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("</TD>");
String substring = buffer.substring(0, i);
String substring1 = substring.substring(substring.length() - 4, substring.length());
Float f = Float.valueOf(substring1);
float f = Float.parseFloat(substring1);
temperature = Math.round(f);
}catch (Exception e){
e.printStackTrace();
@ -223,9 +222,8 @@ public class PageServiceImpl {
public List<String> getEcharts6() throws Exception{
List<String> 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;

@ -110,7 +110,7 @@ public class PowerServiceImpl implements PowerService {
}
}
}
if(null != hosList && !hosList.isEmpty()){
if(!hosList.isEmpty()){
//组织树
int id = 1;
int oneLevelId = 0;
@ -126,7 +126,7 @@ public class PowerServiceImpl implements PowerService {
id++;
//获取该医院不重复角色
Map<Integer,Power_UserAndRoleTree> 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 +135,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 +147,7 @@ public class PowerServiceImpl implements PowerService {
treeList.add(tree2);
id++;
//第三级角色
if(null != roleListByHosId && !roleListByHosId.isEmpty()){
if(!roleListByHosId.isEmpty()){
//属于该医院的权限系统下有有该角色
for (Map.Entry<Integer, Power_UserAndRoleTree> entry : roleListByHosId.entrySet()) {
if(entry.getValue().getParentId().equals(hos.getSelfId())){
@ -167,12 +167,12 @@ public class PowerServiceImpl implements PowerService {
//取系统和角色
Map<String,Power_UserAndRoleTree> sysListByHosDeptId = new HashMap<>();
List<Power_UserAndRoleTree> tempRoleList = new ArrayList<>();
if(null != deptList && !deptList.isEmpty()) {
if(!deptList.isEmpty()) {
for (Power_UserAndRoleTree dept : deptList) {
if (dept.getParentId().equals(hos.getSelfId())) {
Set<String> 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,7 +181,7 @@ public class PowerServiceImpl implements PowerService {
}
}
//给角色设置系统权限
if (null != roleList && !roleList.isEmpty()) {
if (!roleList.isEmpty()) {
for (Power_UserAndRoleTree role : roleList) {
StringBuilder sysFlagStr = new StringBuilder();
String deptId = role.getDeptId();
@ -189,9 +189,9 @@ public class PowerServiceImpl implements PowerService {
//单一科室
if (!deptId.contains(",")) {
if (deptId.equals(dept.getDeptId())) {
if(null != sysFlagSet && !sysFlagSet.isEmpty()){
if(!sysFlagSet.isEmpty()){
for(String sysFlag:sysFlagSet){
sysFlagStr.append(sysFlag + ",");
sysFlagStr.append(sysFlag).append(",");
}
}
if(StringUtils.isNotBlank(sysFlagStr)){
@ -206,9 +206,9 @@ 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.append(sysFlag + ",");
sysFlagStr.append(sysFlag).append(",");
}
}
if(StringUtils.isNotBlank(sysFlagStr)){
@ -226,7 +226,7 @@ public class PowerServiceImpl implements PowerService {
}
}
//第三级系统
if (null != sysListByHosDeptId && !sysListByHosDeptId.isEmpty()) {
if (!sysListByHosDeptId.isEmpty()) {
for (Map.Entry<String,Power_UserAndRoleTree> sys : sysListByHosDeptId.entrySet()) {
if(sys.getValue().getParentId().equals(hos.getSelfId())){
Power_UserAndRoleTree tree5 = new Power_UserAndRoleTree();
@ -239,7 +239,7 @@ public class PowerServiceImpl implements PowerService {
id++;
//第四级角色
Map<Integer,Power_UserAndRoleTree> roleListBySys = new HashMap<>();
if (null != roleList && !roleList.isEmpty()) {
if (!roleList.isEmpty()) {
for (Power_UserAndRoleTree role : tempRoleList) {
String sysFlag = role.getSysFlag();
if(StringUtils.isNotBlank(sysFlag)){
@ -254,7 +254,7 @@ public class PowerServiceImpl implements PowerService {
}
}
}
if(null != roleListBySys && !roleListBySys.isEmpty()){
if(!roleListBySys.isEmpty()){
for (Map.Entry<Integer,Power_UserAndRoleTree> roleBySys:roleListBySys.entrySet()) {
Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree();
BeanUtils.copyProperties(roleBySys.getValue(), tree6);
@ -299,10 +299,10 @@ public class PowerServiceImpl implements PowerService {
//否则按角色菜单表该角色的权限选中
List<Power_Role_Menu> 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 +404,7 @@ public class PowerServiceImpl implements PowerService {
}
}
}
if(null != hosList && !hosList.isEmpty()){
if(!hosList.isEmpty()){
//组织树
int id = 1;
int oneLevelId = 0;
@ -420,7 +420,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 +429,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 +462,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 +475,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 +485,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)){
@ -626,10 +626,10 @@ public class PowerServiceImpl implements PowerService {
List<Power_User_Menu> 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;
}
}
@ -664,30 +664,29 @@ public class PowerServiceImpl implements PowerService {
userMenuMapper.deleteByPrimaryKey(userPowers.get(i).getUserMenuId());
}
}*/
Power_User power_user = userMapper.selectByPrimaryKey(userId);
Power_User powerUser = userMapper.selectByPrimaryKey(userId);
//查询该用户对应的角色菜单权限
List<Power_Role_Menu> rolePowers = roleMenuMapper.selectRoleMenuPower(sysFlag, power_user.getRoleId());
List<Power_Role_Menu> rolePowers = roleMenuMapper.selectRoleMenuPower(sysFlag, powerUser.getRoleId());
if(null != rolePowers && !rolePowers.isEmpty()){
if(StringUtils.isBlank(menus)){
//全取消
List<Power_User_Menu> 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<String> roles = new ArrayList<>();
List<String> 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);
List<String> users = Arrays.asList(menu);
//新增部分
Collection<String> inserts=new ArrayList<String>(users);
inserts.removeAll(roles);
if(null != inserts && !inserts.isEmpty()){
if(!inserts.isEmpty()){
//新增flag为1
List<Power_User_Menu> list = new ArrayList<>();
for (String insertMenu : inserts) {
@ -700,7 +699,7 @@ public class PowerServiceImpl implements PowerService {
//删除部分
Collection<String> deletes=new ArrayList<String>(roles);
deletes.removeAll(users);
if(null != deletes && !deletes.isEmpty()){
if(!deletes.isEmpty()){
List<Power_User_Menu> list = new ArrayList<>();
for(String deleteMenu : deletes){
if(StringUtils.isNotBlank(deleteMenu)){
@ -772,17 +771,17 @@ public class PowerServiceImpl implements PowerService {
int twoLevel = 0;
Map<Integer,String> 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<String,String> deptNameSet = new HashMap<>();
Map<Integer,Power_Sys_DictVo> poweSysNameSet = new HashMap<>();
@ -794,21 +793,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) && 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<Integer,Power_Sys_DictVo> sysNameSet = new HashMap<>();
//科室层
@ -820,20 +819,20 @@ public class PowerServiceImpl implements PowerService {
tree2.setName(deptNameSet.get(key));
treeList.add(tree2);
Map<Integer,String> 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,17 +889,17 @@ public class PowerServiceImpl implements PowerService {
int twoLevel = 0;
Map<Integer,String> 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<String,String> deptNameSet = new HashMap<>();
Map<Integer,Power_Sys_DictVo> poweSysNameSet = new HashMap<>();
@ -912,21 +911,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 +937,20 @@ public class PowerServiceImpl implements PowerService {
treeList.add(tree2);
Map<Integer,Power_Sys_DictVo> roleMap = new HashMap<>();
//sysName 用户idhospitalTel 手机号,dictArea用户名parentId角色idsysType角色名
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 +1006,13 @@ public class PowerServiceImpl implements PowerService {
int twoLevel = 0;
Map<Integer,String> 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<Integer,String> deptNameSet = new HashMap<>();
Map<Integer,Power_Sys_DictVo> poweSysNameSet = new HashMap<>();
@ -1026,20 +1025,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).getDictId().equals(hosKey)){
String deptName = dicts.get(i).getDeptName();
if(StringUtils.isNoneBlank(deptName)){
deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName());
for (Power_Sys_DictVo dict : dicts) {
if (dict.getDictId().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 +1052,7 @@ public class PowerServiceImpl implements PowerService {
treeList.add(tree20);
}
}
if(null != deptNameSet && !deptNameSet.isEmpty()){
if(!deptNameSet.isEmpty()){
for (Integer key : deptNameSet.keySet()) {
Map<Integer,String> sysNameSet = new HashMap<>();
//科室层
@ -1065,16 +1064,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++;

@ -37,8 +37,8 @@ public class Power_DeptServiceImpl implements Power_DeptService {
Power_User_DictMapper powerUserDictMapper;
@Override
public int deleteByPrimaryKey(Integer dept_id) {
return powerDeptDao.deleteByPrimaryKey(dept_id);
public int deleteByPrimaryKey(Integer deptId) {
return powerDeptDao.deleteByPrimaryKey(deptId);
}
@Override
@ -49,6 +49,7 @@ public class Power_DeptServiceImpl implements Power_DeptService {
//取得当前登录账号
//取得当前登录账号
ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
assert attr != null;
HttpServletRequest request =attr.getRequest();
HttpSession session= request.getSession();
Power_User powerUser1 =(Power_User) session.getAttribute("CURRENT_USER");
@ -64,8 +65,8 @@ public class Power_DeptServiceImpl implements Power_DeptService {
}
@Override
public Power_Dept selectByPrimaryKey(Integer dept_id) {
return powerDeptDao.selectByPrimaryKey(dept_id);
public Power_Dept selectByPrimaryKey(Integer deptId) {
return powerDeptDao.selectByPrimaryKey(deptId);
}
@Override
@ -91,25 +92,25 @@ public class Power_DeptServiceImpl implements Power_DeptService {
//查询归属医院
powerDept.setDictId(powerUser1.getDictId());
}
List<Power_DeptVo> power_depts = powerDeptDao.findSomeByMore(powerDept);
List<Power_DeptVo> powerDepts = powerDeptDao.findSomeByMore(powerDept);
Set<String> 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 != powerDepts && !powerDepts.isEmpty()){
for (Power_DeptVo powerDeptTemp : powerDepts) {
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 powerDepts;
}
@Override
@ -126,10 +127,10 @@ public class Power_DeptServiceImpl implements Power_DeptService {
}
@Override
public List<Power_Dept> selectByPrimaryKeys(String dept_ids) {
String[] dept_id = dept_ids.split(",");
public List<Power_Dept> selectByPrimaryKeys(String deptIds) {
String[] deptIdArr = deptIds.split(",");
Map<String,Object> map = new HashMap<>();
map.put("list",dept_id);
map.put("list",deptIdArr);
return powerDeptDao.selectByPrimaryKeys(map);
}
@ -145,11 +146,11 @@ public class Power_DeptServiceImpl implements Power_DeptService {
public void export(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception {
List<Power_DeptVo> 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 +174,11 @@ public class Power_DeptServiceImpl implements Power_DeptService {
public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response) throws Exception {
List<Power_DeptVo> 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("否");
}
}
}

@ -28,8 +28,7 @@ public class Power_MenuServiceImpl implements Power_MenuService{
private Power_Sys_DictMapper sysDictMapper;
@Override
public List<Power_Menu> queryAllPowerMenu(String sysFlag,Integer roleId) {
List<Power_Menu> power_menus = powerMenuMapper.queryAllPowerMenu(sysFlag,roleId);
return power_menus;
return powerMenuMapper.queryAllPowerMenu(sysFlag,roleId);
}
/**

@ -49,23 +49,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<Power_Notice> selectNoticeTypeList(Power_NoticeVo powerNotice){
List<Power_Notice> power_notices = noticeMapper.selectNoticeTypeList(powerNotice);
return power_notices;
}
/**
* @MethodName getNoticeTypeTree
* @Description:
@ -113,8 +96,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);
}
/**
@ -155,7 +137,7 @@ public class Power_NoticeServiceImpl{
noticeMapper.simpleInsert(simpleInsert);
simpleInsert.forEach(vos ->{
//发送通知
sendRecive(vos,user,vos.getNoticeTitle(),vos.getNoticeContent());
sendRecive(vos,vos.getNoticeTitle(),vos.getNoticeContent());
});
}
}else{
@ -163,17 +145,17 @@ public class Power_NoticeServiceImpl{
noticeMapper.updateByPrimaryKeySelective(powerNotice);
//修改发送通知 已读
if(1 == powerNotice.getReadFlag()){
sendRecive(powerNotice,user,"'"+powerNotice.getNoticeTitle()+"'主题修改",powerNotice.getNoticeContent());
sendRecive(powerNotice,"'"+powerNotice.getNoticeTitle()+"'主题修改",powerNotice.getNoticeContent());
}
}
}
private void sendRecive(Power_Notice powerNotice,Power_User user,String title,String content){
private void sendRecive(Power_Notice powerNotice,String title,String content){
//单个人
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 +252,8 @@ public class Power_NoticeServiceImpl{
List<Power_UserVo> userList = new ArrayList<>();
Power_NoticeVo noticeVo = new Power_NoticeVo();
noticeVo.setNoticeId(noticeTypeId);
List<Power_Notice> power_notices = noticeMapper.selectNoticeTypeList(noticeVo);
String noticeTypeFlag = power_notices.get(0).getNoticeTypeFlag();
List<Power_Notice> powerNotices = noticeMapper.selectNoticeTypeList(noticeVo);
String noticeTypeFlag = powerNotices.get(0).getNoticeTypeFlag();
//系统管理员,全查
if(user.getRoleId() == 0){
//权限系统,全查
@ -283,13 +265,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 +280,21 @@ public class Power_NoticeServiceImpl{
public void export(Power_NoticeVo notice, String noticeIds,HttpServletResponse response,HttpServletRequest request) throws Exception {
List<Power_NoticeVo> noticeVos = new ArrayList<>();
Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
List<Power_NoticeVo>power_notices = new ArrayList<Power_NoticeVo>();
List<Power_NoticeVo> powerNotices = new ArrayList<Power_NoticeVo>();
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);
@ -376,7 +358,6 @@ public class Power_NoticeServiceImpl{
*/
public int getUnReadCount(Integer userId){
//获取登陆者信息
int unReadCount = noticeMapper.getUnReadCount(null);
return unReadCount;
return noticeMapper.getUnReadCount(userId);
}
}

@ -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<Power_RoleVo> findSomeByMore(Power_RoleVo powerRole, HttpServletRequest request) {
Power_UserVo powerUser1 =(Power_UserVo) request.getSession().getAttribute("CURRENT_USER");
List<Power_RoleVo> power_roles = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId());
List<Power_RoleVo> powerRoles = powerRoleMapper.findSomeByMore(powerRole, powerUser1.getRoleId(),powerUser1.getUserId());
Set<String> 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 != powerRoles && !powerRoles.isEmpty()){
for (Power_RoleVo powerRoleTemp : powerRoles) {
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 powerRoles;
}
@Override
@ -114,22 +113,22 @@ public class Power_RoleServiceImpl implements Power_RoleService {
Power_User powerUser1 =(Power_User) request.getSession().getAttribute("CURRENT_USER");
List<Power_RoleVo> 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 powerRoleVo : roleList) {
if (powerRoleVo.getEffective() != null) {
if (powerRoleVo.getEffective() == 1) {
powerRoleVo.setEffectiveCn("是");
} else {
powerRoleVo.setEffectiveCn("否");
}
if(roleList.get(i).getShowRecord() == 1){
roleList.get(i).setShowRecordCn("是");
}else{
roleList.get(i).setShowRecordCn("否");
if (powerRoleVo.getShowRecord() == 1) {
powerRoleVo.setShowRecordCn("是");
} else {
powerRoleVo.setShowRecordCn("否");
}
if(roleList.get(i).getDownloadRecord() == 1){
roleList.get(i).setDownloadRecordCn("是");
}else{
roleList.get(i).setDownloadRecordCn("否");
if (powerRoleVo.getDownloadRecord() == 1) {
powerRoleVo.setDownloadRecordCn("是");
} else {
powerRoleVo.setDownloadRecordCn("否");
}
}
}
@ -148,12 +147,12 @@ public class Power_RoleServiceImpl implements Power_RoleService {
Power_User powerUser1 =(Power_User) request.getSession().getAttribute("CURRENT_USER");
List<Power_RoleVo> 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 powerRoleVo : roleList) {
if (powerRoleVo.getEffective() != null) {
if (powerRoleVo.getEffective() == 1) {
powerRoleVo.setEffectiveCn("是");
} else {
powerRoleVo.setEffectiveCn("否");
}
}
}
@ -176,8 +175,7 @@ public class Power_RoleServiceImpl implements Power_RoleService {
@Override
public List<Power_RoleVo> selectListByPower(HttpServletRequest request) {
Power_User user =(Power_User) request.getSession().getAttribute("CURRENT_USER");
List<Power_RoleVo> power_roles = powerRoleMapper.selectListByPower(user.getRoleId(),user.getUserId());
return power_roles;
return powerRoleMapper.selectListByPower(user.getRoleId(),user.getUserId());
}
@Override

@ -97,16 +97,6 @@ public class Power_Sys_DictServiceImpl implements Power_Sys_DictService {
return powerSysDictMapper.selectSysType();
}
@Override
public void export(HttpServletResponse response) throws Exception {
List<Power_Sys_Dict> powerSysDicts = this.selectList();
String[] columnNames = { "归属ID", "科室ID","医院名称", "系统标识","系统名称","地区","医院电话","父级ID","系统分类","排序","状态","是否可编辑","创建时间",
"创建人","修改时间","修改人","备注" };
String fileName = "dicts";
/*ExportExcelWrapper<Power_Sys_Dict> exportExcelWrapper = new ExportExcelWrapper<Power_Sys_Dict>();
exportExcelWrapper.exportExcel(fileName, fileName, columnNames, powerSysDicts, response, com.emr.util.ExportExcelUtil.EXCEL_FILE_2003);*/
}
@Override
public List<Power_Sys_DictVo> selectAll(String key) {
return powerSysDictMapper.selectAll(key);
@ -147,28 +137,28 @@ public class Power_Sys_DictServiceImpl implements Power_Sys_DictService {
List<String> resultList = new ArrayList<>(depts.length);
Collections.addAll(resultList,depts);
List<String> 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);
}
}

@ -90,7 +90,7 @@ public class Power_UserServiceImpl implements Power_UserService {
List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(power_user.getDeptId());
for(int j=0;j<power_depts1.size();j++){
if(j<power_depts1.size()-1){
power_depts.append(power_depts1.get(j).getDeptName()+",");
power_depts.append(power_depts1.get(j).getDeptName()).append(",");
}else{
power_depts.append(power_depts1.get(j).getDeptName());
}
@ -121,8 +121,7 @@ public class Power_UserServiceImpl implements Power_UserService {
if(powerUser.getUserPwd() != null && powerUser.getUserName() != null){
powerUser.setUserPwd(Base64.encode(MD5.KL(powerUser.getUserPwd())));
powerUser.setEffective(Constant.EFFECTIVE_YES);
Power_UserVo user = powerUserMapper.findPowerUserByUserNameAndUserPwd(powerUser);
return user;
return powerUserMapper.findPowerUserByUserNameAndUserPwd(powerUser);
}
return null;
}
@ -144,22 +143,21 @@ public class Power_UserServiceImpl implements Power_UserService {
HttpSession session= request.getSession();
Power_UserVo powerUser1 =(Power_UserVo) session.getAttribute("CURRENT_USER");
Set<String> perms = powerUser1.getMenus();
if(null != powerUser1 && powerUser1.getRoleId()!=0){
if(powerUser1.getRoleId() != 0){
powerUser.setUserId(powerUser1.getUserId());
powerUser.setRoleId(powerUser1.getRoleId());
}
List<Power_UserVo> someByMore = powerUserMapper.findSomeByMore(powerUser);
for(int i=0;i<someByMore.size();i++){
Power_UserVo power_user = someByMore.get(i);
for (Power_UserVo power_user : someByMore) {
//设置编辑和删除权限
Integer isUpdate = 0;
Integer isDelete = 0;
if(null != perms && !perms.isEmpty()){
for(String menu : perms){
if("/user/update".equals(menu)){
int isUpdate = 0;
int isDelete = 0;
if (null != perms && !perms.isEmpty()) {
for (String menu : perms) {
if ("/user/update".equals(menu)) {
isUpdate = 1;
}
if("/user/delete".equals(menu)){
if ("/user/delete".equals(menu)) {
isDelete = 1;
}
@ -191,18 +189,18 @@ public class Power_UserServiceImpl implements Power_UserService {
public void export(Power_UserVo powerUser,HttpServletRequest request,HttpServletResponse response) throws Exception {
List<Power_UserVo> 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("否");
}
}
}
@ -215,34 +213,6 @@ public class Power_UserServiceImpl implements Power_UserService {
//导出excel的操作
exportExcelUtil.expordExcel(tableThNames,fieldCns,powerUsers,fileName,response);
}
@Override
public void export1(Power_UserVo powerUser,HttpServletRequest request,HttpServletResponse response) throws Exception {
List<Power_UserVo> 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("男");
}
}
if(powerUsers.get(i).getEffective() == 1){
powerUsers.get(i).setEffectiveCn("是");
}else{
powerUsers.get(i).setEffectiveCn("否");
}
}
}
String tableThNames = "账号,姓名,性别,年龄,移动电话,邮箱地址,用户职位,所属角色,所属部门,是否有效,创建时间,创建人,修改时间,修改人";
String fieldCns = "userName,name,sex,userAge,userTel,userEmail,userPosition,roleName,powerDepts,effectiveCn,createDate,creater,updateDate,updater";
//文件名
String fileName = "用户列表(" + new SimpleDateFormat("yyyy_MM_dd HH_mm_ss").format(new Date()) + ").xls";
//ExportExcelUtil
com.manage.util.ExportExcelUtil exportExcelUtil = new com.manage.util.ExportExcelUtil();
//导出excel的操作
exportExcelUtil.expordExcel(tableThNames,fieldCns,powerUsers,fileName,response);
}
@Override
public boolean updatePassword(String newUserPwd) {

@ -16,9 +16,10 @@ import org.springframework.stereotype.Service;
public class T_MenuServiceImpl implements T_MenuService {
@Autowired
private T_MenuMapper t_menuMapper;
private T_MenuMapper tMenuMapper;
@Override
public T_Menu getRole() {
return t_menuMapper.selectByPrimaryKey(1);
return tMenuMapper.selectByPrimaryKey(1);
}
}

@ -27,8 +27,7 @@ public class User_Dept_MenuServiceImpl implements User_Dept_MenuService {
@Autowired
private User_Dept_MenuMapper userDeptMenuMapper;
@Override
public List<User_Dept_Menu> selectAll(String userName,String sysFlag,Integer userId,Integer roleId,
Integer sysId,Integer hospitalId) {
public List<User_Dept_Menu> selectAll(String userName,String sysFlag,Integer userId,Integer roleId,Integer sysId,Integer hospitalId) {
if("-100".equals(roleId)){
//针对查询菜单权限
return userDeptMenuMapper.selectMenuListByRoleId(userName, sysFlag);

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>power</artifactId>
<groupId>com.manage</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>power_web</artifactId>
<packaging>war</packaging>
<name>power_web Maven Webapp</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<finalName>power_web</finalName>
</build>
</project>

@ -1,7 +0,0 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
<display-name>Archetype Created Web Application</display-name>
</web-app>

@ -1,5 +0,0 @@
<html>
<body>
<h2>Hello World!</h2>
</body>
</html>
Loading…
Cancel
Save