power2.0
/
power_yd
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2020-12-23备份

Browse Source
master
zengwh 5 years ago
parent 87b6d830d1
commit 53e08ae8d4
23 changed files with 9813 additions and 8226 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -1,4 +1,4 @@
target
/target/
/.idea/
/out/
power.iml

17482
doc/ydpower.sql
View File

File diff suppressed because it is too large Load Diff

382
power-admin/src/main/java/com/manage/controller/FontController.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.manage.service.*;
import com.manage.service.cache.Cache;
import com.manage.service.cache.CacheManager;
import com.manage.service.ipml.Power_NoticeServiceImpl;
import com.manage.service.webSocket.WsPool;
import com.manage.util.DateUtils;
import com.manage.util.Msg;
import com.manage.vo.*;
@ -39,6 +40,8 @@ import java.util.*;
@Controller
@RequestMapping("font/")
public class FontController {
@Value("${STR_SPLIT}")
private String STR_SPLIT;
@Autowired
private PowerService powerService;
@Autowired
@ -60,38 +63,39 @@ public class FontController {
/**
* 2.1
* @ProjectName: getUserPowerTreeBySysFlag
* @Description: 获取菜单通过系统标识
* @Param 无
* @Return getMenusByUserIdAndSysFlag
* @Author: 曾文和
* @CreateDate: 2019/7/9 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/9 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: getUserPowerTreeBySysFlag
* @Description: 获取菜单通过系统标识
* @Param 无
* @Return getMenusByUserIdAndSysFlag
* @Author: 曾文和
* @CreateDate: 2019/7/9 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/9 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "getMenusByUserIdAndSysFlag",method = RequestMethod.GET)
@RequestMapping(value = "getMenusByUserIdAndSysFlag", method = RequestMethod.GET)
@ResponseBody
public Msg getMenusByUserIdAndSysFlag(String userName,String sysFlag,Integer userId,Integer roleId,
Integer sysId,Integer hospitalId){
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){
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){
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){
if (StringUtils.isBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId == null && hospitalId != null) {
return Msg.fail("查询复杂,数据大,暂不支持只带hospitalId参数查询");
}
if(StringUtils.isNotBlank(userName)){
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)){
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();
}
}
@ -99,8 +103,8 @@ public class FontController {
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){
return Msg.success().add("list", list);
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
@ -109,25 +113,26 @@ public class FontController {
/**
* 2.2
* @ProjectName: selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
* @Description: 根据用户id或角色id和系统id或系统标识查询通知记录
* @Param 无
* @Return selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
* @Author: 曾文和
* @CreateDate: 2019/7/29 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/29 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
* @Description: 根据用户id或角色id和系统id或系统标识查询通知记录
* @Param 无
* @Return selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
* @Author: 曾文和
* @CreateDate: 2019/7/29 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/29 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "selectAllByUserIdOrRoleIdAndSysIdOrSysFlag")
@ResponseBody
public Msg selectAllByUserIdOrRoleIdAndSysIdOrSysFlag(Integer userId,Integer roleId,Integer sysId,String sysFlag){
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){
return Msg.success().add("list", list);
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
@ -136,33 +141,34 @@ public class FontController {
/**
* 2.4
* @ProjectName: getUserPowerTreeBySysFlag
* @Description: 获取系统用户树通过系统标识
* @Param 无
* @Return PowerTree
* @Author: 曾文和
* @CreateDate: 2019/7/9 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/9 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: getUserPowerTreeBySysFlag
* @Description: 获取系统用户树通过系统标识
* @Param 无
* @Return PowerTree
* @Author: 曾文和
* @CreateDate: 2019/7/9 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/9 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "getUserPowerTreeBySysFlag",produces = {"text/json;charset=UTF-8"})
@RequestMapping(value = "getUserPowerTreeBySysFlag", produces = {"text/json;charset=UTF-8"})
@ResponseBody
public String getUserPowerTreeBySysFlag(String sysFlag,Integer userId){
public String getUserPowerTreeBySysFlag(String sysFlag, Integer userId) {
try {
if(null != userId){
if (null != 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();
String json = mapper.writeValueAsString(dicts);
CacheManager.addExcCount("noExc");
return json;
}else{
} else {
return null;
}
}catch(Exception e){
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -171,32 +177,33 @@ public class FontController {
/**
* 2.5
* @ProjectName: getRolePowerTreeBySysFlag
* @Description: 获取系统角色树通过系统标识
* @Param 无
* @Return PowerTree
* @Author: 曾文和
* @CreateDate: 2019/7/9 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/9 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: getRolePowerTreeBySysFlag
* @Description: 获取系统角色树通过系统标识
* @Param 无
* @Return PowerTree
* @Author: 曾文和
* @CreateDate: 2019/7/9 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/7/9 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "getRolePowerTreeBySysFlag",produces = {"text/json;charset=UTF-8"})
@RequestMapping(value = "getRolePowerTreeBySysFlag", produces = {"text/json;charset=UTF-8"})
@ResponseBody
public String getRolePowerTreeBySysFlag(String sysFlag,Integer userId){
public String getRolePowerTreeBySysFlag(String sysFlag, Integer userId) {
try {
if(null != userId){
if (null != 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();
String json = mapper.writeValueAsString(dicts);
CacheManager.addExcCount("noExc");
return json;
}else{
} else {
return null;
}
}catch(Exception e){
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -205,38 +212,39 @@ public class FontController {
/**
* 2.6
* @ProjectName: getUserList
* @Description: 获取用户id和用户名
* @Param 无
* @Return userList
* @Author: 曾文和
* @CreateDate: 2019/9/6 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/9/6 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: getUserList
* @Description: 获取用户id和用户名
* @Param 无
* @Return userList
* @Author: 曾文和
* @CreateDate: 2019/9/6 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/9/6 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "getUserList")
@ResponseBody
public Msg getUserList(String userName){
public Msg getUserList(String userName) {
try {
List<User> list = new ArrayList<>();
if(StringUtils.isNoneBlank(userName)){
if (StringUtils.isNoneBlank(userName)) {
List<Power_User> users = userMapper.checkUserName(userName);
if(null != users && !users.isEmpty()){
if (null != users && !users.isEmpty()) {
Integer roleId = users.get(0).getRoleId();
if(roleId == 0){
if (roleId == 0) {
list = userMapper.selectUserIdAndUserNameList(null);
}else{
} else {
list = userMapper.selectUserIdAndUserNameList(users.get(0).getUserId());
}
}
}else{
} else {
return Msg.fail("用户名不能为空");
}
CacheManager.addExcCount("noExc");
return Msg.success().add("userList",list);
}catch(Exception e){
return Msg.success().add("userList", list);
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return null;
@ -245,32 +253,33 @@ public class FontController {
/**
* 2.7
* @ProjectName: checkToken
* @Description: 验证token是否有效
* @Param 无
* @Return Msg
* @Author: 曾文和
* @CreateDate: 2019/9/24 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/9/24 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: checkToken
* @Description: 验证token是否有效
* @Param 无
* @Return Msg
* @Author: 曾文和
* @CreateDate: 2019/9/24 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/9/24 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "checkToken",method = RequestMethod.POST)
@RequestMapping(value = "checkToken", method = RequestMethod.POST)
@ResponseBody
public Msg checkToken(String token){
public Msg checkToken(String token) {
try {
if(StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token) ) {
if (StringUtils.isNotBlank(token) && StringUtils.isNotBlank(token)) {
token = MD5.JM(Base64.decode(token));
Cache cache = CacheManager.getCacheInfo(token);
if (cache == null) {
return Msg.fail("token已过期或不存在");
}
}else{
} else {
return Msg.fail("token不能为空");
}
return Msg.success();
}catch(Exception e){
} catch (Exception e) {
e.printStackTrace();
return Msg.fail(e.getMessage());
}
@ -278,40 +287,41 @@ public class FontController {
/**
* 2.8
* @ProjectName: getUserByToken
* @Description: 根据token获取用户
* @Param 无
* @Return getMenuListByToken
* @Author: 曾文和
* @CreateDate: 2019/10/31 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/10/31 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: getUserByToken
* @Description: 根据token获取用户
* @Param 无
* @Return getMenuListByToken
* @Author: 曾文和
* @CreateDate: 2019/10/31 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/10/31 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "getUserByToken",method = RequestMethod.POST)
@RequestMapping(value = "getUserByToken", method = RequestMethod.POST)
@ResponseBody
public Msg getMenuListByToken(String token,String sysFlag){
public Msg getMenuListByToken(String token, String sysFlag) {
try {
if(StringUtils.isBlank(token)){
if (StringUtils.isBlank(token)) {
return Msg.fail("token不能为空!");
}
if(StringUtils.isBlank(sysFlag)){
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){
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()){
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)){
if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) {
list.add(menuList.get(i));
if(StringUtils.isNotBlank(menuList.get(i).getMethod())){
if (StringUtils.isNotBlank(menuList.get(i).getMethod())) {
menus.add(menuList.get(i).getMenuUrl());
}
}
@ -320,23 +330,23 @@ public class FontController {
user.setMenuList(list);
user.setMenus(menus);
UserVo userVo = new UserVo();
BeanUtils.copyProperties(user,userVo);
BeanUtils.copyProperties(user, userVo);
//查询用户集合
List<User> userList = new ArrayList<>();
Integer roleId = userVo.getRoleId();
if(roleId == 0){
if (roleId == 0) {
userList = userMapper.selectUserIdAndUserNameList(null);
}else{
} else {
userList = userMapper.selectUserIdAndUserNameList(userVo.getUserId());
}
//设置用户集合
userVo.setUserList(userList);
CacheManager.addExcCount("noExc");
return Msg.success().add("user",userVo);
}else{
return Msg.success().add("user", userVo);
} else {
return Msg.fail("token已失效");
}
}catch(Exception e){
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
@ -345,25 +355,26 @@ public class FontController {
/**
* 2.9
* @ProjectName: getMenuByToken
* @Description: 根据token获取菜单
* @Param 无
* @Return getMenuListByToken
* @Author: 曾文和
* @CreateDate: 2019/10/31 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/10/31 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: getMenuByToken
* @Description: 根据token获取菜单
* @Param 无
* @Return getMenuListByToken
* @Author: 曾文和
* @CreateDate: 2019/10/31 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/10/31 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "getMenuByToken",method = RequestMethod.POST)
@RequestMapping(value = "getMenuByToken", method = RequestMethod.POST)
@ResponseBody
public Msg getMenuByToken(String token,String sysFlag){
public Msg getMenuByToken(String token, String sysFlag) {
try {
if(StringUtils.isBlank(token)){
if (StringUtils.isBlank(token)) {
return Msg.fail("token不能为空!");
}
if(StringUtils.isBlank(sysFlag)){
if (StringUtils.isBlank(sysFlag)) {
return Msg.fail("sysFlag不能为空!");
}
token = MD5.JM(Base64.decode(token));
@ -371,17 +382,17 @@ public class FontController {
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()){
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)){
if (StringUtils.isNotBlank(menuSysFlag) && menuSysFlag.equals(sysFlag)) {
list.add(menuList.get(i));
}
}
}
CacheManager.addExcCount("noExc");
return Msg.success().add("list",list);
}catch(Exception e){
return Msg.success().add("list", list);
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail();
@ -390,32 +401,33 @@ public class FontController {
/**
* 2.10
* @ProjectName: getToken
* @Description: 获取token
* @Param 无
* @Return Msg
* @Author: 曾文和
* @CreateDate: 2019/11/06 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/11/06 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*
* @ProjectName: getToken
* @Description: 获取token
* @Param 无
* @Return Msg
* @Author: 曾文和
* @CreateDate: 2019/11/06 10:00
* @UpdateUser: 更新者
* @UpdateDate: 2019/11/06 10:00
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
@RequestMapping(value = "getToken",method = RequestMethod.POST)
@RequestMapping(value = "getToken", method = RequestMethod.POST)
@ResponseBody
public Msg getToken(String userName,String password){
public Msg getToken(String userName, String password) {
try {
if(StringUtils.isBlank(userName)){
if (StringUtils.isBlank(userName)) {
return Msg.fail("用户名不能为空");
}
if(StringUtils.isBlank(password)){
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){
if (null == userVo) {
return Msg.fail("用户名或密码不正确");
}
String date = String.valueOf(DateUtils.getDate());
@ -425,20 +437,20 @@ public class FontController {
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());
list = powerMenuService.queryAllPowerMenu(null, userVo.getRoleId());
} else {
list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(),null);
list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(), null);
}
if(null != list && !list.isEmpty()){
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);
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())){
if (StringUtils.isNotBlank(list.get(i).getMethod())) {
menus.add(list.get(i).getMenuUrl());
}
}
@ -447,21 +459,21 @@ public class FontController {
userVo.setMenus(menus);
//设置科室
String power_depts = "";
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 += power_depts1.get(j).getDeptName()+",";
}else{
power_depts += power_depts1.get(j).getDeptName();
for (int j = 0; j < power_depts1.size(); j++) {
if (j < power_depts1.size() - 1) {
power_depts.append(power_depts1.get(j).getDeptName()).append(",");
} else {
power_depts.append(power_depts1.get(j).getDeptName());
}
}
userVo.setRemark(power_depts);
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){
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());
}
@ -469,6 +481,7 @@ public class FontController {
/**
* 2.11
*
* @MethodName getUnReadCount
* @Description: 根据用户获取未读通知数量
* @Param 无
@ -482,22 +495,31 @@ public class FontController {
*/
@RequestMapping("notice/getUnReadCount")
@ResponseBody
public Msg getUnReadCount(Integer userId){
public Msg getUnReadCount(Integer userId) {
try {
if(null == userId){
if (null == userId) {
return Msg.fail("用户id不能为空");
}
Power_UserVo userVo = userMapper.selectByPrimaryKey(userId);
if(null == userVo){
if (null == userVo) {
return Msg.fail("用户id不存在");
}
int unReadCount = noticeService.getUnReadCount(userId);
CacheManager.addExcCount("noExc");
return Msg.success().add("unReadCount",unReadCount);
}catch (Exception e){
return Msg.success().add("unReadCount", unReadCount);
} catch (Exception e) {
CacheManager.addExcCount("exc");
e.printStackTrace();
return Msg.fail(e.getMessage());
}
}
@RequestMapping("sendMessage")
@ResponseBody
public Msg sendMessage(SendMessage sendMessage) {
String message = sendMessage.getTitle() + STR_SPLIT + sendMessage.getContent() + STR_SPLIT + sendMessage.getType() + STR_SPLIT + sendMessage.getType1() + STR_SPLIT + sendMessage.getFlagId();
WsPool.sendMessageToAll(sendMessage.getUserId().toString(), message);
return Msg.success();
}
}

14
power-admin/src/main/java/com/manage/controller/LoginController.java
Unescape Escape View File

@ -104,16 +104,16 @@ public class LoginController {
user.setMenus(menus);
//设置科室
String power_depts = "";
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 += power_depts1.get(j).getDeptName()+",";
StringBuilder powerDepts = new StringBuilder();
List<Power_Dept> powerDepts1 = power_deptService.selectByPrimaryKeys(user.getDeptId());
for(int j=0;j<powerDepts1.size();j++){
if(j<powerDepts1.size()-1){
powerDepts.append(powerDepts1.get(j).getDeptName()).append(",");
}else{
power_depts += power_depts1.get(j).getDeptName();
powerDepts.append(powerDepts1.get(j).getDeptName());
}
}
user.setRemark(power_depts);
user.setRemark(powerDepts.toString());
//设置进缓存
CacheManager.putCache(date,new Cache(date,user,TOKEN_EXPIRE_TIME));

4
power-admin/src/main/resources/config/config.properties
Unescape Escape View File

@ -23,12 +23,12 @@ POWER_PORT = ${SERVER_PORT}
#病案归档系统ip
EMRMEDICALRECORD_IP = ${SERVER_IP}
#病案归档系统端口
EMRMEDICALRECORD_PORT = ${SERVER_PORT}
EMRMEDICALRECORD_PORT = 8082
#病案管理系统ip
EMRRECORD_IP = ${SERVER_IP}
#病案管理系统端口
EMRRECORD_PORT = ${SERVER_PORT}
EMRRECORD_PORT = 8083
#病案复印预约ip
EMRAPPLYCOPY_IP = ${SERVER_IP}

10
power-admin/src/main/resources/config/jdbc.properties
Unescape Escape View File

@ -1,5 +1,5 @@
jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8
jdbc.url=jdbc\:mysql\://localhost\:3306/ydpower?useUnicode\=true&characterEncoding\=utf-8
jdbc.username=root
#jdbc.password=docus@702
jdbc.password=docus702
@ -15,13 +15,13 @@ hibernate.current_session_context_class=thread
hibernate.jdbc.batch_size=50
hibernate.enable_lazy_load_no_trans=true
#执行:右键 Run As ---->Maven build ---->Goals:mybatis-generator:generate
#输出目录
#\u05B4\uFFFD\uFFFD:\uFFFD\u04BC\uFFFD Run As ---->Maven build ---->Goals:mybatis-generator:generate
#\uFFFD\uFFFD\uFFFD\u013F\u00BC
targetProject=src/main/java
#modelPackage,sqlMapperPackage,daoMapperPackage 通常一致??
#modelPackage,sqlMapperPackage,daoMapperPackage \u0368\uFFFD\uFFFD\u04BB\uFFFD\uFFFD??
modelPackage=com.manage.entity
daoMapperPackage=com.manage.dao
#输出目录
#\uFFFD\uFFFD\uFFFD\u013F\u00BC
targetProject2=src/main/resources
sqlMapperPackage=mapper

21
power-admin/src/main/resources/rebel.xml
Unescape Escape View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
-->
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
<classpath>
<dir name="D:/ideaProject/yingde/power_yd/power-admin/target/classes">
</dir>
</classpath>
<web>
<link target="/">
<dir name="D:/ideaProject/yingde/power_yd/power-admin/src/main/webapp">
</dir>
</link>
</web>
</application>

4
power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
Unescape Escape View File

@ -109,8 +109,8 @@
<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"/>
<label for="name">姓名:</label>
<input type="text" class="form-control input-sm" id="searchName" maxlength="16"/>
</div>
<div class="form-group">
<label>所属角色:</label>

25
power-admin/src/main/webapp/static/js/user.js
Unescape Escape View File

@ -29,6 +29,7 @@ var form = '';
searchRoleId:$("#roleId").val(),
deptId : $("#dept_id option:selected").val(),
effective : $("#effective option:selected").val(),
name : $("#searchName").val()
};
return temp;
},
@ -51,11 +52,11 @@ var form = '';
},
{
title:'账号',
field:'userName',
field:'userName'
},
{
title:'姓名',
field:'name',
field:'name'
},
{
title:'性别',
@ -70,28 +71,28 @@ var form = '';
},
{
title:'年龄',
field:'userAge',
field:'userAge'
},
{
title:'移动电话',
field:'userTel',
field:'userTel'
},
{
title:'邮箱地址',
field:'userEmail',
field:'userEmail'
},
{
title:'用户职位',
field:'userPosition',
field:'userPosition'
},
{
title:'所属角色',
field:'roleName',
field:'roleName'
},
{
title:'所属部门',
field:'powerDepts',
formatter:paramsMatter,
formatter:paramsMatter
},
{
title:'是否有效',
@ -106,19 +107,19 @@ var form = '';
},
{
title:'创建时间',
field:'createDate',
field:'createDate'
},
{
title:'创建人',
field:'creater',
field:'creater'
},
{
title:'修改时间',
field:'updateDate',
field:'updateDate'
},
{
title:'修改人',
field:'updater',
field:'updater'
},
{
title:'操作',

63
power-dao/src/main/java/com/manage/entity/SendMessage.java
Unescape Escape View File

@ -0,0 +1,63 @@
package com.manage.entity;
public class SendMessage {
private Integer userId;
private String title;
private String content;
private Integer type;
private Integer type1;
private Integer flagId;
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public Integer getType1() {
return type1;
}
public void setType1(Integer type1) {
this.type1 = type1;
}
public Integer getFlagId() {
return flagId;
}
public void setFlagId(Integer flagId) {
this.flagId = flagId;
}
}

2
power-dao/src/main/resources/mapper/Power_MenuMapper.xml
Unescape Escape View File

@ -279,7 +279,7 @@
<if test="sysFlag != '' and sysFlag != null">
and sys_flag=#{sysFlag}
</if>
order by sys_id,menu_id,sort
order by sort
</select>
<!--<select id="queryMenuViewByUserId" parameterType="java.lang.Integer"
resultType="com.manage.entity.Power_Detailed_Menu">

6
power-dao/src/main/resources/mapper/Power_UserMapper.xml
Unescape Escape View File

@ -316,6 +316,9 @@
</if>
)
</if>
<if test="name!=null and name!=''">
and power_user.name LIKE '%${name}%'
</if>
<if test="userName!=null and userName!=''">
and power_user.user_name LIKE '%${userName}%'
</if>
@ -374,6 +377,9 @@
</if>
)
</if>
<if test="name!=null and name!=''">
and power_user.name LIKE '%${name}%'
</if>
<if test="userName!=null and userName!=''">
and power_user.user_name LIKE '%${userName}%'
</if>

2
power-dao/target/classes/mapper/Power_MenuMapper.xml
Unescape Escape View File

@ -279,7 +279,7 @@
<if test="sysFlag != '' and sysFlag != null">
and sys_flag=#{sysFlag}
</if>
order by sys_id,menu_id,sort
order by sort
</select>
<!--<select id="queryMenuViewByUserId" parameterType="java.lang.Integer"
resultType="com.manage.entity.Power_Detailed_Menu">

6
power-dao/target/classes/mapper/Power_UserMapper.xml
Unescape Escape View File

@ -316,6 +316,9 @@
</if>
)
</if>
<if test="name!=null and name!=''">
and power_user.name LIKE '%${name}%'
</if>
<if test="userName!=null and userName!=''">
and power_user.user_name LIKE '%${userName}%'
</if>
@ -374,6 +377,9 @@
</if>
)
</if>
<if test="name!=null and name!=''">
and power_user.name LIKE '%${name}%'
</if>
<if test="userName!=null and userName!=''">
and power_user.user_name LIKE '%${userName}%'
</if>

16
power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java
Unescape Escape View File

@ -409,6 +409,7 @@ public class PowerServiceImpl implements PowerService {
int id = 1;
int oneLevelId = 0;
int twoLevelId = 0;
int threeLevelId = 0;
for(Power_UserAndRoleTree hos : hosList){
//第一级医院
Power_UserAndRoleTree tree1 = new Power_UserAndRoleTree();
@ -428,13 +429,13 @@ public class PowerServiceImpl implements PowerService {
twoLevelId = id;
tree2.setParentId(oneLevelId);
tree2.setSysFlag(powerSys.getSysFlag());
Boolean isParent = false;
boolean isParent = false;
//第三级用户
if(null != userList && !userList.isEmpty()){
//属于该医院的权限系统下有有该用户
for(Power_UserAndRoleTree powerUser : userList){
if(null != powerUser.getParentId() && powerUser.getParentId().equals(hos.getSelfId())){
/*Power_UserAndRoleTree tree3 = new Power_UserAndRoleTree();
Power_UserAndRoleTree tree3 = new Power_UserAndRoleTree();
BeanUtils.copyProperties(powerUser,tree3);
tree3.setId(id);
tree3.setParentId(twoLevelId);
@ -447,7 +448,7 @@ public class PowerServiceImpl implements PowerService {
}
tree3.setSysFlag("power");
treeList.add(tree3);
id++;*/
id++;
isParent = true;
}
}
@ -478,6 +479,7 @@ public class PowerServiceImpl implements PowerService {
Power_UserAndRoleTree tree5 = new Power_UserAndRoleTree();
BeanUtils.copyProperties(sys,tree5);
tree5.setId(id);
threeLevelId = id;
tree5.setParentId(twoLevelId);
tree5.setSysFlag(sys.getSysFlag());
boolean isParent = false;
@ -490,7 +492,7 @@ public class PowerServiceImpl implements PowerService {
if(!deptId.contains(",")){
if(deptId.equals(dept.getDeptId())){
isParent = true;
/*Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree();
Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree();
BeanUtils.copyProperties(users,tree6);
tree6.setId(id);
tree6.setParentId(threeLevelId);
@ -503,14 +505,14 @@ public class PowerServiceImpl implements PowerService {
}
tree6.setSysFlag(sys.getSysFlag());
treeList.add(tree6);
id++;*/
id++;
}
}else{
//逗号隔开多科室
String[] deptIds = deptId.split(",");
for (String deptStr : deptIds) {
if(StringUtils.isNotBlank(deptStr) && deptStr.equals(dept.getDeptId())){
/*Power_UserAndRoleTree tree7 = new Power_UserAndRoleTree();
Power_UserAndRoleTree tree7 = new Power_UserAndRoleTree();
BeanUtils.copyProperties(users,tree7);
tree7.setId(id);
tree7.setParentId(threeLevelId);
@ -523,7 +525,7 @@ public class PowerServiceImpl implements PowerService {
}
tree7.setSysFlag(sys.getSysFlag());
treeList.add(tree7);
id++;*/
id++;
isParent = true;
continue;
}

BIN
power-service/target/classes/com/manage/service/ImportExcel/ImportExcelJudgeMethod.class
View File

Binary file not shown.

BIN
power-service/target/classes/com/manage/service/ImportExcel/ImportExcelUtil.class
View File

Binary file not shown.

BIN
power-service/target/classes/com/manage/service/cache/CacheManager.class vendored
View File

Binary file not shown.

BIN
power-service/target/classes/com/manage/service/ipml/PageServiceImpl.class
View File

Binary file not shown.

BIN
power-service/target/classes/com/manage/service/ipml/PowerServiceImpl.class
View File

Binary file not shown.

BIN
power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class
View File

Binary file not shown.

BIN
power-service/target/classes/com/manage/service/ipml/Power_RoleServiceImpl.class
View File

Binary file not shown.

BIN
power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save