增加了若干查询方法,替换了了一个sigar源,独立了一个websocket方法用语发送信息

master
xm 4 years ago
parent 6b711a4985
commit 9cd8b94ba6

@ -1,6 +1,8 @@
package com.manage.controller; package com.manage.controller;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.manage.dao.Power_DeptMapper;
import com.manage.dao.Power_NoticeMapper; import com.manage.dao.Power_NoticeMapper;
import com.manage.dao.Power_UserMapper; import com.manage.dao.Power_UserMapper;
import com.manage.entity.Power_Dept; import com.manage.entity.Power_Dept;
@ -64,39 +66,43 @@ public class FontController {
private Power_DeptService power_deptService; private Power_DeptService power_deptService;
@Autowired @Autowired
private Power_UserMapper power_userMapper; private Power_UserMapper power_userMapper;
@Autowired
private Power_DeptMapper powerDeptMapper;
/** /**
* 2.1 * 2.1
* @ProjectName: getUserPowerTreeBySysFlag *
* @Description: * @ProjectName: getUserPowerTreeBySysFlag
* @Param * @Description:
* @Return getMenusByUserIdAndSysFlag * @Param
* @Author: * @Return getMenusByUserIdAndSysFlag
* @CreateDate: 2019/7/9 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/7/9 10:00
* @UpdateDate: 2019/7/9 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/7/9 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "getMenusByUserIdAndSysFlag",method = RequestMethod.GET) @RequestMapping(value = "getMenusByUserIdAndSysFlag", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public Msg getMenusByUserIdAndSysFlag(String userName,String sysFlag,Integer userId,Integer roleId, public Msg getMenusByUserIdAndSysFlag(String userName, String sysFlag, Integer userId, Integer roleId,
Integer sysId,Integer hospitalId) throws Exception{ Integer sysId, Integer hospitalId) throws Exception {
if(StringUtils.isNotBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null if (StringUtils.isNotBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId == null && hospitalId == null){ && sysId == null && hospitalId == null) {
return Msg.fail("查询复杂,数据大,暂不支持只带sysFlag参数查询"); return Msg.fail("查询复杂,数据大,暂不支持只带sysFlag参数查询");
} }
if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null if (StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId != null && hospitalId == null){ && sysId != null && hospitalId == null) {
return Msg.fail("查询复杂,数据大,暂不支持只带sysId参数查询"); return Msg.fail("查询复杂,数据大,暂不支持只带sysId参数查询");
} }
if(StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null if (StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId == null && hospitalId != null){ && sysId == null && hospitalId != null) {
return Msg.fail("查询复杂,数据大,暂不支持只带hospitalId参数查询"); return Msg.fail("查询复杂,数据大,暂不支持只带hospitalId参数查询");
} }
if(StringUtils.isNotBlank(userName)){ if (StringUtils.isNotBlank(userName)) {
List<Power_User> power_users = userMapper.checkUserName(userName); List<Power_User> power_users = userMapper.checkUserName(userName);
if(null != power_users && !power_users.isEmpty()){ if (null != power_users && !power_users.isEmpty()) {
if(power_users.get(0).getRoleId().equals(0) || power_users.get(0).getRoleId().equals(-100)){ if (power_users.get(0).getRoleId().equals(0) || power_users.get(0).getRoleId().equals(-100)) {
roleId = power_users.get(0).getRoleId(); roleId = power_users.get(0).getRoleId();
} }
} }
@ -104,59 +110,61 @@ public class FontController {
List<User_Dept_Menu> list = userDeptMenuService.selectAll(userName, sysFlag, userId, roleId, sysId, hospitalId); List<User_Dept_Menu> list = userDeptMenuService.selectAll(userName, sysFlag, userId, roleId, sysId, hospitalId);
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return Msg.success().add("list",list); return Msg.success().add("list", list);
} }
/** /**
* 2.2 * 2.2
* @ProjectName: selectAllByUserIdOrRoleIdAndSysIdOrSysFlag *
* @Description: ididid * @ProjectName: selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
* @Param * @Description: ididid
* @Return selectAllByUserIdOrRoleIdAndSysIdOrSysFlag * @Param
* @Author: * @Return selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
* @CreateDate: 2019/7/29 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/7/29 10:00
* @UpdateDate: 2019/7/29 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/7/29 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "selectAllByUserIdOrRoleIdAndSysIdOrSysFlag") @RequestMapping(value = "selectAllByUserIdOrRoleIdAndSysIdOrSysFlag")
@ResponseBody @ResponseBody
public Msg selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(Integer userId,Integer roleId,Integer sysId,String sysFlag,String sysName,Integer effective,String noticeTitle,String noticeSend,String noticeDate,String noticeTypeFlag,String noticeTypeName) throws Exception{ public Msg selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(Integer userId, Integer roleId, Integer sysId, String sysFlag, String sysName, Integer effective, String noticeTitle, String noticeSend, String noticeDate, String noticeTypeFlag, String noticeTypeName) throws Exception {
List<Power_Notice> list = powerNoticeMapper.selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(userId, roleId, sysId,sysFlag,sysName,effective,noticeTitle,noticeSend,noticeDate,noticeTypeFlag,noticeTypeName); List<Power_Notice> list = powerNoticeMapper.selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(userId, roleId, sysId, sysFlag, sysName, effective, noticeTitle, noticeSend, noticeDate, noticeTypeFlag, noticeTypeName);
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return Msg.success().add("list",list); return Msg.success().add("list", list);
} }
/** /**
* 2.4 * 2.4
* @ProjectName: getUserPowerTreeBySysFlag *
* @Description: * @ProjectName: getUserPowerTreeBySysFlag
* @Param * @Description:
* @Return PowerTree * @Param
* @Author: * @Return PowerTree
* @CreateDate: 2019/7/9 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/7/9 10:00
* @UpdateDate: 2019/7/9 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/7/9 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "getUserPowerTreeBySysFlag",produces = {"text/json;charset=UTF-8"}) @RequestMapping(value = "getUserPowerTreeBySysFlag", produces = {"text/json;charset=UTF-8"})
@ResponseBody @ResponseBody
public String getUserPowerTreeBySysFlag(String sysFlag,Integer userId){ public String getUserPowerTreeBySysFlag(String sysFlag, Integer userId) {
try { try {
if(null != userId){ if (null != userId) {
//查询该用户 //查询该用户
Power_UserVo user = userMapper.selectByPrimaryKey(userId); Power_UserVo user = userMapper.selectByPrimaryKey(userId);
List<PowerTree> dicts = powerService.getUserPowerTreeBySysFlag(sysFlag,user); List<PowerTree> dicts = powerService.getUserPowerTreeBySysFlag(sysFlag, user);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(dicts); String json = mapper.writeValueAsString(dicts);
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return json; return json;
}else{ } else {
return null; return null;
} }
}catch(Exception e){ } catch (Exception e) {
CacheManager.addExcCount("exc"); CacheManager.addExcCount("exc");
e.printStackTrace(); e.printStackTrace();
ExceptionPrintUtil.printException(e); ExceptionPrintUtil.printException(e);
@ -166,32 +174,33 @@ public class FontController {
/** /**
* 2.5 * 2.5
* @ProjectName: getRolePowerTreeBySysFlag *
* @Description: * @ProjectName: getRolePowerTreeBySysFlag
* @Param * @Description:
* @Return PowerTree * @Param
* @Author: * @Return PowerTree
* @CreateDate: 2019/7/9 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/7/9 10:00
* @UpdateDate: 2019/7/9 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/7/9 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "getRolePowerTreeBySysFlag",produces = {"text/json;charset=UTF-8"}) @RequestMapping(value = "getRolePowerTreeBySysFlag", produces = {"text/json;charset=UTF-8"})
@ResponseBody @ResponseBody
public String getRolePowerTreeBySysFlag(String sysFlag,Integer userId){ public String getRolePowerTreeBySysFlag(String sysFlag, Integer userId) {
try { try {
if(null != userId){ if (null != userId) {
Power_UserVo user = userMapper.selectByPrimaryKey(userId); Power_UserVo user = userMapper.selectByPrimaryKey(userId);
List<PowerTree> dicts = powerService.getRolePowerTreeBySysFlag(sysFlag,user); List<PowerTree> dicts = powerService.getRolePowerTreeBySysFlag(sysFlag, user);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(dicts); String json = mapper.writeValueAsString(dicts);
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return json; return json;
}else{ } else {
return null; return null;
} }
}catch(Exception e){ } catch (Exception e) {
CacheManager.addExcCount("exc"); CacheManager.addExcCount("exc");
e.printStackTrace(); e.printStackTrace();
ExceptionPrintUtil.printException(e); ExceptionPrintUtil.printException(e);
@ -201,60 +210,62 @@ public class FontController {
/** /**
* 2.6 * 2.6
* @ProjectName: getUserList *
* @Description: id * @ProjectName: getUserList
* @Param * @Description: id
* @Return userList * @Param
* @Author: * @Return userList
* @CreateDate: 2019/9/6 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/9/6 10:00
* @UpdateDate: 2019/9/6 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/9/6 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "getUserList") @RequestMapping(value = "getUserList")
@ResponseBody @ResponseBody
public Msg getUserList(String userName) throws Exception{ public Msg getUserList(String userName) throws Exception {
List<User> list = new ArrayList<>(); List<User> list = new ArrayList<>();
if(StringUtils.isNoneBlank(userName)){ if (StringUtils.isNoneBlank(userName)) {
List<Power_User> users = userMapper.checkUserName(userName); List<Power_User> users = userMapper.checkUserName(userName);
if(null != users && !users.isEmpty()){ if (null != users && !users.isEmpty()) {
Integer roleId = users.get(0).getRoleId(); Integer roleId = users.get(0).getRoleId();
if(roleId == 0){ if (roleId == 0) {
list = userMapper.selectUserIdAndUserNameList(null); list = userMapper.selectUserIdAndUserNameList(null);
}else{ } else {
list = userMapper.selectUserIdAndUserNameList(users.get(0).getUserId()); list = userMapper.selectUserIdAndUserNameList(users.get(0).getUserId());
} }
} }
}else{ } else {
return Msg.fail("用户名不能为空"); return Msg.fail("用户名不能为空");
} }
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return Msg.success().add("userList",list); return Msg.success().add("userList", list);
} }
/** /**
* 2.7 * 2.7
* @ProjectName: checkToken *
* @Description: token * @ProjectName: checkToken
* @Param * @Description: token
* @Return Msg * @Param
* @Author: * @Return Msg
* @CreateDate: 2019/9/24 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/9/24 10:00
* @UpdateDate: 2019/9/24 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/9/24 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "checkToken",method = RequestMethod.POST) @RequestMapping(value = "checkToken", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Msg checkToken(String token) throws Exception{ public Msg checkToken(String token) throws Exception {
if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ) { if (StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token)) {
Cache cache = CacheManager.getCacheInfo(token); Cache cache = CacheManager.getCacheInfo(token);
if (cache == null) { if (cache == null) {
return Msg.fail("token已过期或不存在"); return Msg.fail("token已过期或不存在");
} }
}else{ } else {
return Msg.fail("token不能为空"); return Msg.fail("token不能为空");
} }
return Msg.success(); return Msg.success();
@ -262,33 +273,34 @@ public class FontController {
/** /**
* 2.8 * 2.8
* @ProjectName: getUserByToken *
* @Description: token * @ProjectName: getUserByToken
* @Param * @Description: token
* @Return getMenuListByToken * @Param
* @Author: * @Return getMenuListByToken
* @CreateDate: 2019/10/31 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/10/31 10:00
* @UpdateDate: 2019/10/31 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/10/31 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "getUserByToken",method = RequestMethod.POST) @RequestMapping(value = "getUserByToken", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Msg getMenuListByToken(String token,String sysFlag) throws Exception{ public Msg getMenuListByToken(String token, String sysFlag) throws Exception {
if(StringUtils.isBlank(token)){ if (StringUtils.isBlank(token)) {
return Msg.fail("token不能为空!"); return Msg.fail("token不能为空!");
} }
if(StringUtils.isBlank(sysFlag)){ if (StringUtils.isBlank(sysFlag)) {
return Msg.fail("sysFlag不能为空!"); return Msg.fail("sysFlag不能为空!");
} }
Cache cacheInfo = CacheManager.getCacheInfo(token); Cache cacheInfo = CacheManager.getCacheInfo(token);
Power_UserVo user = (Power_UserVo) cacheInfo.getValue(); Power_UserVo user = (Power_UserVo) cacheInfo.getValue();
if(null != user){ if (null != user) {
List<User_Dept_Menu> menuList = user.getMenuList(); List<User_Dept_Menu> menuList = user.getMenuList();
List<User_Dept_Menu> list = new ArrayList<>(); List<User_Dept_Menu> list = new ArrayList<>();
Set<String> menus = new TreeSet<>(); Set<String> menus = new TreeSet<>();
if(null != menuList && !menuList.isEmpty()){ if (null != menuList && !menuList.isEmpty()) {
for (User_Dept_Menu user_dept_menu : menuList) { for (User_Dept_Menu user_dept_menu : menuList) {
String menuSysFlag = user_dept_menu.getSysFlag(); String menuSysFlag = user_dept_menu.getSysFlag();
if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) { if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) {
@ -302,51 +314,52 @@ public class FontController {
user.setMenuList(list); user.setMenuList(list);
user.setMenus(menus); user.setMenus(menus);
UserVo userVo = new UserVo(); UserVo userVo = new UserVo();
BeanUtils.copyProperties(user,userVo); BeanUtils.copyProperties(user, userVo);
//查询用户集合 //查询用户集合
List<User> userList = new ArrayList<>(); List<User> userList = new ArrayList<>();
Integer roleId = userVo.getRoleId(); Integer roleId = userVo.getRoleId();
if(roleId == 0){ if (roleId == 0) {
userList = userMapper.selectUserIdAndUserNameList(null); userList = userMapper.selectUserIdAndUserNameList(null);
}else{ } else {
userList = userMapper.selectUserIdAndUserNameList(userVo.getUserId()); userList = userMapper.selectUserIdAndUserNameList(userVo.getUserId());
} }
//设置用户集合 //设置用户集合
userVo.setUserList(userList); userVo.setUserList(userList);
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return Msg.success().add("user",userVo); return Msg.success().add("user", userVo);
}else{ } else {
return Msg.fail("token已失效"); return Msg.fail("token已失效");
} }
} }
/** /**
* 2.9 * 2.9
* @ProjectName: getMenuByToken *
* @Description: token * @ProjectName: getMenuByToken
* @Param * @Description: token
* @Return getMenuListByToken * @Param
* @Author: * @Return getMenuListByToken
* @CreateDate: 2019/10/31 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/10/31 10:00
* @UpdateDate: 2019/10/31 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/10/31 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "getMenuByToken",method = RequestMethod.POST) @RequestMapping(value = "getMenuByToken", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Msg getMenuByToken(String token,String sysFlag) throws Exception{ public Msg getMenuByToken(String token, String sysFlag) throws Exception {
if(StringUtils.isBlank(token)){ if (StringUtils.isBlank(token)) {
return Msg.fail("token不能为空!"); return Msg.fail("token不能为空!");
} }
if(StringUtils.isBlank(sysFlag)){ if (StringUtils.isBlank(sysFlag)) {
return Msg.fail("sysFlag不能为空!"); return Msg.fail("sysFlag不能为空!");
} }
Cache cacheInfo = CacheManager.getCacheInfo(token); Cache cacheInfo = CacheManager.getCacheInfo(token);
Power_UserVo user = (Power_UserVo) cacheInfo.getValue(); Power_UserVo user = (Power_UserVo) cacheInfo.getValue();
List<User_Dept_Menu> menuList = user.getMenuList(); List<User_Dept_Menu> menuList = user.getMenuList();
List<User_Dept_Menu> list = new ArrayList<>(); List<User_Dept_Menu> list = new ArrayList<>();
if(null != menuList && !menuList.isEmpty()){ if (null != menuList && !menuList.isEmpty()) {
for (User_Dept_Menu user_dept_menu : menuList) { for (User_Dept_Menu user_dept_menu : menuList) {
String menuSysFlag = user_dept_menu.getSysFlag(); String menuSysFlag = user_dept_menu.getSysFlag();
if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) { if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) {
@ -355,36 +368,37 @@ public class FontController {
} }
} }
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return Msg.success().add("list",list); return Msg.success().add("list", list);
} }
/** /**
* 2.10 * 2.10
* @ProjectName: getToken *
* @Description: token * @ProjectName: getToken
* @Param * @Description: token
* @Return Msg * @Param
* @Author: * @Return Msg
* @CreateDate: 2019/11/06 10:00 * @Author:
* @UpdateUser: * @CreateDate: 2019/11/06 10:00
* @UpdateDate: 2019/11/06 10:00 * @UpdateUser:
* @UpdateRemark: * @UpdateDate: 2019/11/06 10:00
* @Version: 1.0 * @UpdateRemark:
* @Version: 1.0
*/ */
@RequestMapping(value = "getToken",method = RequestMethod.POST) @RequestMapping(value = "getToken", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Msg getToken(String userName,String password) throws Exception{ public Msg getToken(String userName, String password) throws Exception {
if(StringUtils.isBlank(userName)){ if (StringUtils.isBlank(userName)) {
return Msg.fail("用户名不能为空"); return Msg.fail("用户名不能为空");
} }
if(StringUtils.isBlank(password)){ if (StringUtils.isBlank(password)) {
return Msg.fail("密码不能为空"); return Msg.fail("密码不能为空");
} }
Power_User user = new Power_User(); Power_User user = new Power_User();
user.setUserName(userName); user.setUserName(userName);
user.setRemark(password); user.setRemark(password);
Power_UserVo userVo = userService.findPowerUserByUserNameAndRemark(user); Power_UserVo userVo = userService.findPowerUserByUserNameAndRemark(user);
if(null == userVo){ if (null == userVo) {
return Msg.fail("用户名或密码不正确"); return Msg.fail("用户名或密码不正确");
} }
String date = String.valueOf(DateUtils.getDate()); String date = String.valueOf(DateUtils.getDate());
@ -394,11 +408,11 @@ public class FontController {
List<User_Dept_Menu> menuList = new ArrayList<>(); List<User_Dept_Menu> menuList = new ArrayList<>();
Set<String> menus = new TreeSet<>(); Set<String> menus = new TreeSet<>();
if (userVo.getRoleId().equals(0) || userVo.getRoleId().equals(-100)) { if (userVo.getRoleId().equals(0) || userVo.getRoleId().equals(-100)) {
list = powerMenuService.queryAllPowerMenu(null,userVo.getRoleId()); list = powerMenuService.queryAllPowerMenu(null, userVo.getRoleId());
} else { } else {
list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(),null); list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(), null);
} }
if(null != list && !list.isEmpty()){ if (null != list && !list.isEmpty()) {
for (Power_Menu power_menu : list) { for (Power_Menu power_menu : list) {
User_Dept_Menu deptMenu = new User_Dept_Menu(); User_Dept_Menu deptMenu = new User_Dept_Menu();
String menuUrl = power_menu.getMenuUrl(); String menuUrl = power_menu.getMenuUrl();
@ -418,22 +432,23 @@ public class FontController {
//设置科室 //设置科室
StringBuilder power_depts = new StringBuilder(); StringBuilder power_depts = new StringBuilder();
List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId());
for(int j=0;j<power_depts1.size();j++){ for (int j = 0; j < power_depts1.size(); j++) {
if(j<power_depts1.size()-1){ if (j < power_depts1.size() - 1) {
power_depts.append(power_depts1.get(j).getDeptName()).append(","); power_depts.append(power_depts1.get(j).getDeptName()).append(",");
}else{ } else {
power_depts.append(power_depts1.get(j).getDeptName()); power_depts.append(power_depts1.get(j).getDeptName());
} }
} }
userVo.setRemark(power_depts.toString()); userVo.setRemark(power_depts.toString());
//移除缓存 //移除缓存
CacheManager.removeCacheByObject(userVo); CacheManager.removeCacheByObject(userVo);
CacheManager.putCache(token,new Cache(date,userVo,TOKEN_EXPIRE_TIME)); CacheManager.putCache(token, new Cache(date, userVo, TOKEN_EXPIRE_TIME));
return Msg.success().add("token",token); return Msg.success().add("token", token);
} }
/** /**
* 2.11 * 2.11
*
* @MethodName getUnReadCount * @MethodName getUnReadCount
* @Description: * @Description:
* @Param * @Param
@ -447,17 +462,17 @@ public class FontController {
*/ */
@RequestMapping("notice/getUnReadCount") @RequestMapping("notice/getUnReadCount")
@ResponseBody @ResponseBody
public Msg getUnReadCount(Integer userId) throws Exception{ public Msg getUnReadCount(Integer userId) throws Exception {
if(null == userId){ if (null == userId) {
return Msg.fail("用户id不能为空"); return Msg.fail("用户id不能为空");
} }
Power_UserVo userVo = userMapper.selectByPrimaryKey(userId); Power_UserVo userVo = userMapper.selectByPrimaryKey(userId);
if(null == userVo){ if (null == userVo) {
return Msg.fail("用户id不存在"); return Msg.fail("用户id不存在");
} }
int unReadCount = noticeService.getUnReadCount(userId); int unReadCount = noticeService.getUnReadCount(userId);
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
return Msg.success().add("unReadCount",unReadCount); return Msg.success().add("unReadCount", unReadCount);
} }
/** /**
@ -474,16 +489,16 @@ public class FontController {
*/ */
@RequestMapping("checkUserName") @RequestMapping("checkUserName")
@ResponseBody @ResponseBody
public Msg checkUserName(String userName) throws Exception{ public Msg checkUserName(String userName) throws Exception {
if(StringUtils.isBlank(userName)){ if (StringUtils.isBlank(userName)) {
return Msg.fail("工号不能为空!"); return Msg.fail("工号不能为空!");
} }
//查询用户 //查询用户
List<Power_User> user = userMapper.checkUserName(userName); List<Power_User> user = userMapper.checkUserName(userName);
if(null == user || user.isEmpty()){ if (null == user || user.isEmpty()) {
return Msg.fail("该工号不存在!"); return Msg.fail("该工号不存在!");
} }
return Msg.success().add("user",user); return Msg.success().add("user", user);
} }
/** /**
@ -501,19 +516,19 @@ public class FontController {
*/ */
@RequestMapping("sendEmrRecordApproveNotice") @RequestMapping("sendEmrRecordApproveNotice")
@ResponseBody @ResponseBody
public void sendEmrRecordApproveNotice(String applyType,Integer count){ public void sendEmrRecordApproveNotice(String applyType, Integer count) {
try { try {
String title = "待审批通知"; String title = "待审批通知";
String content = "您有"+count+"份"+applyType+"待审批!"; String content = "您有" + count + "份" + applyType + "待审批!";
//查询有借阅审批权限的id集合 //查询有借阅审批权限的id集合
String menuUrl = "/approve/updateApprove"; String menuUrl = "/approve/updateApprove";
List<Power_User> users = userMapper.selectUserIdsWithApprove(menuUrl); List<Power_User> users = userMapper.selectUserIdsWithApprove(menuUrl);
for(Power_User user : users){ for (Power_User user : users) {
if(null != user) { if (null != user) {
WsPool.sendMessageToAll("emr_record_" + user.getUserId(), title + STR_SPLIT + content + STR_SPLIT + "emr_record"); WsPool.sendMessageToAll("emr_record_" + user.getUserId(), title + STR_SPLIT + content + STR_SPLIT + "emr_record");
} }
} }
}catch (Exception e){ } catch (Exception e) {
ExceptionPrintUtil.printException(e); ExceptionPrintUtil.printException(e);
e.printStackTrace(); e.printStackTrace();
} }
@ -521,6 +536,7 @@ public class FontController {
/** /**
* *
*
* @return String * @return String
* @throws Exception * @throws Exception
* @CreateDate: 2021-08-30 * @CreateDate: 2021-08-30
@ -528,49 +544,110 @@ public class FontController {
*/ */
@RequestMapping("/getDeptCodeByUserName") @RequestMapping("/getDeptCodeByUserName")
@ResponseBody @ResponseBody
public String getDeptCodeByDeptId(Integer deptId) throws Exception{ public String getDeptCodeByDeptId(Integer deptId) throws Exception {
Power_Dept power_dept = power_deptService.selectByPrimaryKey(deptId); Power_Dept power_dept = power_deptService.selectByPrimaryKey(deptId);
return power_dept.getDeptCode(); return power_dept.getDeptCode();
} }
/** /**
* deptcodeid * deptcodeid
*/ */
@RequestMapping(value = "/getUserInfoByDeptCodeForChief",produces = "text/plain;charset=UTF-8") @RequestMapping(value = "/getUserInfoByDeptCodeForChief", produces = "text/plain;charset=UTF-8")
@ResponseBody @ResponseBody
public String getUserInfoByDeptCodeForChief(String DeptCode){ public String getUserInfoByDeptCodeForChief(String DeptCode) {
List<Power_User> power_users = power_userMapper.selectAllForChief(DeptCode); List<Power_User> power_users = power_userMapper.selectAllForChief(DeptCode);
String result = ""; String result = "";
for (int i = 0; i < power_users.size(); i++) { for (int i = 0; i < power_users.size(); i++) {
Power_User power_user = power_users.get(i); Power_User power_user = power_users.get(i);
result=power_user.getUserId()+","+power_user.getUserName()+","+power_user.getName()+";"; result += power_user.getUserId() + "," + power_user.getUserName() + "," + power_user.getName() + ";";
} }
return result; return result;
} }
/** /**
* deptcodeid * deptcodeid
*/ */
@RequestMapping(value = "/getUserInfoByDeptCodeForRecordRoom",produces = "text/plain;charset=UTF-8") @RequestMapping(value = "/getUserInfoByDeptCodeForRecordRoom", produces = "text/plain;charset=UTF-8")
@ResponseBody @ResponseBody
public String getUserInfoByDeptCodeForRecordRoom(String DeptCode){ public String getUserInfoByDeptCodeForRecordRoom() {
List<Power_User> power_users = power_userMapper.selectAllForRecordRoom(DeptCode); List<Power_User> power_users = power_userMapper.selectAllForRecordRoom();
String result = ""; String result = "";
for (int i = 0; i < power_users.size(); i++) { for (int i = 0; i < power_users.size(); i++) {
Power_User power_user = power_users.get(i); Power_User power_user = power_users.get(i);
result=power_user.getUserId()+","+power_user.getUserName()+","+power_user.getName()+";"; result += power_user.getUserId() + "," + power_user.getUserName() + "," + power_user.getName() + ";";
} }
return result; return result;
} }
/**
* deptcodeidroleId
*/
@RequestMapping(value = "/getUserInfoByDeptCodeForMedicalRecordCollection", produces = "text/plain;charset=UTF-8")
@ResponseBody
public String getUserInfoByDeptCodeForMedicalRecordCollection(String deptCode) {
// 通过deptCode获取userId数组
List<Power_User> power_users = power_userMapper.selectAllUserInfo();
StringBuilder userALLInfo = new StringBuilder();
for (Power_User powerUser : power_users) {
String deptId = powerUser.getDeptId();
String[] userDeptId = deptId.split(",");
Integer roleId = powerUser.getRoleId();
for (int i = 0; i < userDeptId.length; i++) {
// 查询到deptId对应的deptCode
List<Power_Dept> powerDepts = powerDeptMapper.selectDeptCode(userDeptId[i]);
for (Power_Dept powerDept : powerDepts) {
if (deptCode.equals(powerDept.getDeptCode())) {
String oneDeptCodeResult = powerUser.getUserId() + "," + powerUser.getName() + ";";
if (roleId == 24 || roleId == 26 || roleId == 23 || roleId == 29) {
userALLInfo.append(oneDeptCodeResult);
}
}
}
}
}
return userALLInfo.toString();
}
/**
* deptcodeidroleId
*/
@RequestMapping(value = "/getUserInfoByDeptCodeForAcquisitionCompleted", produces = "text/plain;charset=UTF-8")
@ResponseBody
public String getUserInfoByDeptCodeForAcquisitionCompleted(String deptCode) {
// 通过deptCode获取userId数组
List<Power_User> power_users = power_userMapper.selectAllUserInfo();
StringBuilder userALLInfo = new StringBuilder();
for (Power_User powerUser : power_users) {
String deptId = powerUser.getDeptId();
String[] userDeptId = deptId.split(",");
Integer roleId = powerUser.getRoleId();
for (int i = 0; i < userDeptId.length; i++) {
// 查询到deptId对应的deptCode
List<Power_Dept> powerDepts = powerDeptMapper.selectDeptCode(userDeptId[i]);
for (Power_Dept powerDept : powerDepts) {
if (deptCode.equals(powerDept.getDeptCode())) {
String oneDeptCodeResult = powerUser.getUserId() + "," + powerUser.getName() + ";";
if (roleId == 24 || roleId == 26 || roleId == 23 || roleId == 29) {
userALLInfo.append(oneDeptCodeResult);
}
}
}
}
}
return userALLInfo.toString();
}
/** /**
* id, * id,
* deptcode * deptcode
*/ */
@RequestMapping(value = "/getDoctorNameAndDoctorRoom",produces = "text/plain;charset=UTF-8") @RequestMapping(value = "/getDoctorNameAndDoctorRoom", produces = "text/plain;charset=UTF-8")
@ResponseBody @ResponseBody
public String getDoctorNameAndDoctorRoom(String userId,String deptcode){ public String getDoctorNameAndDoctorRoom(String userId, String deptcode) {
String name = power_userMapper.selectForDoctorName(userId); String name = power_userMapper.selectForDoctorName(userId);
String room= power_userMapper.selectForDoctorRoom(deptcode); String room = power_userMapper.selectForDoctorRoom(deptcode);
String result = room+","+name; String result = room + "," + name;
return result; return result;
} }
@ -579,7 +656,7 @@ public class FontController {
*/ */
@RequestMapping("/getDoctorDeptcode") @RequestMapping("/getDoctorDeptcode")
@ResponseBody @ResponseBody
public String getDoctorDeptcode(Integer userId){ public String getDoctorDeptcode(Integer userId) {
//获取deptId //获取deptId
String deptId = power_userMapper.selectForDeptId(userId); String deptId = power_userMapper.selectForDeptId(userId);
//获取deptcode //获取deptcode
@ -605,6 +682,45 @@ public class FontController {
return realName; return realName;
} }
/**
* deptcode
*/
@RequestMapping("/getDeptCodeByChinese")
@ResponseBody
public String getDeptCodeByChinese(String deptCode) {
//获取realName
String chineseName = powerDeptMapper.getDeptCodeByChinese(deptCode);
return chineseName;
}
/**
* iddeptcode
*/
@RequestMapping("/getAllUserInfo")
@ResponseBody
public String getAllUserInfo() {
List<Power_User> power_users = power_userMapper.selectAllUserInfo();
String deptCode = "";
String deptName = "";
for (int i = 0; i < power_users.size(); i++) {
String deptId = power_users.get(i).getDeptId();
String[] deptIdOne = deptId.split(",");
for (int j = 0; j < deptIdOne.length; j++) {
List<Power_Dept> deptCodeAndDeptCodeChinese = powerDeptMapper.getDeptCodeAndDeptCodeChinese(deptIdOne[j]);
for (int k = 0; k < deptCodeAndDeptCodeChinese.size(); k++) {
String deptCodeOne = deptCodeAndDeptCodeChinese.get(k).getDeptCode();
deptCode += deptCodeOne + ",";
String deptNameOne = deptCodeAndDeptCodeChinese.get(k).getDeptName();
deptName += deptNameOne + ",";
}
}
power_users.get(i).setDeptCode(deptCode);
power_users.get(i).setDeptId(deptName);
}
String json = JSON.toJSONString(power_users);
return json;
}
/** /**
* 2021/11/20 * 2021/11/20
@ -615,19 +731,20 @@ public class FontController {
if (null == message.getUserId()) { if (null == message.getUserId()) {
return Msg.fail("消息用户id不能为空"); return Msg.fail("消息用户id不能为空");
} }
if(StringUtils.isBlank(message.getSysFlag())){ if (StringUtils.isBlank(message.getSysFlag())) {
return Msg.fail("消息系统标识不能为空"); return Msg.fail("消息系统标识不能为空");
} }
if(StringUtils.isBlank(message.getTitle())){ if (StringUtils.isBlank(message.getTitle())) {
return Msg.fail("消息标题不能为空"); return Msg.fail("消息标题不能为空");
} }
if(StringUtils.isBlank(message.getContent())){ if (StringUtils.isBlank(message.getContent())) {
return Msg.fail("消息内容不能为空"); return Msg.fail("消息内容不能为空");
} }
WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag()); WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag());
return Msg.success(); return Msg.success();
} }
/** /**
* 2021/11/20 * 2021/11/20
* *
@ -637,17 +754,17 @@ public class FontController {
*/ */
@RequestMapping("sendMessageWithNew") @RequestMapping("sendMessageWithNew")
@ResponseBody @ResponseBody
public Msg sendMessageWithNew(Message message) throws Exception{ public Msg sendMessageWithNew(Message message) throws Exception {
if(null == message.getUserId()){ if (null == message.getUserId()) {
return Msg.fail("消息用户id不能为空"); return Msg.fail("消息用户id不能为空");
} }
if(StringUtils.isBlank(message.getSysFlag())){ if (StringUtils.isBlank(message.getSysFlag())) {
return Msg.fail("消息系统标识不能为空"); return Msg.fail("消息系统标识不能为空");
} }
if(StringUtils.isBlank(message.getTitle())){ if (StringUtils.isBlank(message.getTitle())) {
return Msg.fail("消息标题不能为空"); return Msg.fail("消息标题不能为空");
} }
if(StringUtils.isBlank(message.getContent())){ if (StringUtils.isBlank(message.getContent())) {
return Msg.fail("消息内容不能为空"); return Msg.fail("消息内容不能为空");
} }
WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag()); WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag());
@ -655,5 +772,27 @@ public class FontController {
return Msg.success(); return Msg.success();
} }
/**
* 2021/11/29
* ,使sysflag
*
*
*
*/
@RequestMapping("sendMessageWithNewWithOutSysFlag")
@ResponseBody
public Msg sendMessageWithNewWithOutSysFlag(Message message) throws Exception {
if (null == message.getUserId()) {
return Msg.fail("消息用户id不能为空");
}
if (StringUtils.isBlank(message.getTitle())) {
return Msg.fail("消息标题不能为空");
}
if (StringUtils.isBlank(message.getContent())) {
return Msg.fail("消息内容不能为空");
}
WsPool.sendMessageToAll(message.getUserId().toString(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag());
return Msg.success();
}
} }

@ -61,9 +61,9 @@
ws.onmessage = function(e){ ws.onmessage = function(e){
var msg = e.data.split(strSplit); var msg = e.data.split(strSplit);
var a1 = msg[0]; var a1 = msg[0];
if(a1=="借阅通知"){ if (a1 == "借阅通知") {
narn1('warn',msg[0],msg[1],msg[2]); narnBorrow('warn', msg[0], msg[1], msg[2]);
}else{ } else {
narn('warn',msg[0],msg[1],msg[2]); narn('warn',msg[0],msg[1],msg[2]);
} }
}; };
@ -81,21 +81,22 @@
naranja()[type]({ naranja()[type]({
title: title, title: title,
text: text, text: text,
timeout: 1000*60, timeout: 1000 * 60,
buttons: [{ buttons: [{
text: '查看详情', text: '查看详情',
click: function (e) { click: function (e) {
noticeManage1(noticeId); noticeManage1(noticeId);
} }
}] }]
}) })
} }
function narn1 (type,title,text,noticeId) {
function narnBorrow(type, title, text, noticeId) {
debugger debugger
naranja()[type]({ naranja()[type]({
title: title, title: title,
text: text, text: text,
timeout: 1000*60 timeout: 1000 * 60
}) })
} }
</script> </script>

@ -35,11 +35,17 @@ public interface Power_DeptMapper {
List<Power_DeptVo> selectDeptByUserId(@Param("userId") Integer userId); List<Power_DeptVo> selectDeptByUserId(@Param("userId") Integer userId);
List<Power_DeptVo> selectDeptByDictId(@Param("dictId") Integer dictId,@Param("sysFlag")String sysFlag); List<Power_DeptVo> selectDeptByDictId(@Param("dictId") Integer dictId, @Param("sysFlag") String sysFlag);
int SimpleInsert(List<Power_Dept> list); int SimpleInsert(List<Power_Dept> list);
Power_Dept selectByPrimaryKeyDeptId(Integer deptId); Power_Dept selectByPrimaryKeyDeptId(Integer deptId);
String getDeptCodeByChinese(String deptCode);
List<Power_Dept> getDeptCodeAndDeptCodeChinese(String s);
List<Power_Dept> selectDeptCode(String deptId);
} }

@ -71,7 +71,7 @@ public interface Power_UserMapper {
//根据deptcode科室id查询符合的科主任信息 //根据deptcode科室id查询符合的科主任信息
List<Power_User> selectAllForChief (String deptCode); List<Power_User> selectAllForChief (String deptCode);
List<Power_User> selectAllForRecordRoom (String deptCode); List<Power_User> selectAllForRecordRoom();
String selectForDoctorName(String userId); String selectForDoctorName(String userId);
@ -85,4 +85,5 @@ public interface Power_UserMapper {
String selectForRealName(String userName); String selectForRealName(String userName);
List<Power_User> selectAllUserInfo();
} }

@ -291,6 +291,21 @@
power_dept.dict_id = #{dictId} power_dept.dict_id = #{dictId}
</if> </if>
</select> </select>
<select id="getDeptCodeByChinese" resultType="java.lang.String">
SELECT dept_name
from power_dept
WHERE dept_code = #{deptCode}
</select>
<select id="getDeptCodeAndDeptCodeChinese" resultType="com.manage.entity.Power_Dept">
SELECT dept_name, dept_code
from power_dept
WHERE dept_code = #{deptCode}
</select>
<select id="selectDeptCode" resultType="com.manage.entity.Power_Dept">
SELECT dept_code
FROM power_dept
WHERE dept_id = #{deptId}
</select>
<!--批量插入--> <!--批量插入-->
<insert id="SimpleInsert" parameterType="java.util.List"> <insert id="SimpleInsert" parameterType="java.util.List">

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.manage.dao.Power_UserMapper"> <mapper namespace="com.manage.dao.Power_UserMapper">
<resultMap id="BaseResultMap" type="com.manage.vo.Power_UserVo"> <resultMap id="BaseResultMap" type="com.manage.vo.Power_UserVo">
<id column="user_id" jdbcType="INTEGER" property="userId" /> <id column="user_id" jdbcType="INTEGER" property="userId"/>
<result column="user_name" jdbcType="VARCHAR" property="userName" /> <result column="user_name" jdbcType="VARCHAR" property="userName" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="user_pwd" jdbcType="VARCHAR" property="userPwd" /> <result column="user_pwd" jdbcType="VARCHAR" property="userPwd" />
@ -712,13 +712,11 @@
<select id="selectAllForRecordRoom" resultType="com.manage.entity.Power_User"> <select id="selectAllForRecordRoom" resultType="com.manage.entity.Power_User">
SELECT user_id, SELECT user_id,
user_name, user_name,
power_user.name power_user.name,
role_id
from power_user from power_user
where dept_id like concat( '%',(select dept_id where effective = 1
from power_dept and role_id in (20, 22)
where dept_code = #{deptCode}<![CDATA[),]]>'%')
and effective = 1
and role_id in (2022)
</select> </select>
<select id="selectForDoctorName" resultType="java.lang.String"> <select id="selectForDoctorName" resultType="java.lang.String">
select power_user.`name` select power_user.`name`
@ -756,5 +754,19 @@
FROM power_user FROM power_user
where user_name = #{userName} where user_name = #{userName}
</select> </select>
<select id="selectAllUserInfo" resultType="com.manage.entity.Power_User">
select *
from power_user
</select>
<select id="selectAllForEveryOne" resultType="com.manage.entity.Power_User">
SELECT user_id,
user_name,
power_user.name
from power_user
where dept_id like concat('%', (select dept_id
from power_dept
where dept_code = #{deptCode}<![CDATA[),]]> '%')
and effective = 1
</select>
</mapper> </mapper>

@ -107,9 +107,9 @@
<version>3.11-beta2</version> <version>3.11-beta2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hyperic.sigar</groupId> <groupId>org.fusesource</groupId>
<artifactId>com.springsource.org.hyperic.sigar</artifactId> <artifactId>sigar</artifactId>
<version>1.6.3</version> <version>1.6.4</version>
</dependency> </dependency>
<!--系统使用率导包开始--> <!--系统使用率导包开始-->
<dependency> <!--工具类 小数格式化 可以改为其他--> <dependency> <!--工具类 小数格式化 可以改为其他-->

Loading…
Cancel
Save