增加病案系统请求未审批通知接口

master
zengwh 5 years ago
parent 468ca12f71
commit f3f20396cb

@ -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
@ -500,4 +503,67 @@ public class FontController {
return Msg.fail(e.getMessage());
}
}
/**
* @MethodName checkUserName
* @Description:
* @Param
* @Returnt Msg
* @Author:
* @CreateDate: 2020-04-22
* @UpdateUser:
* @UpdateDate: 2020-04-22
* @UpdateRemark:
* @Version: 1.2.2
*/
@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());
}
}
/**
* @MethodName sendEmrRecordApproveNotice
* @Description:
* @Param applyType
* @Param count
* @Param count
* @Returnt Msg
* @Author:
* @CreateDate: 2020-04-24
* @UpdateUser:
* @UpdateDate: 2020-04-24
* @UpdateRemark:
* @Version:
*/
@RequestMapping("sendEmrRecordApproveNotice")
@ResponseBody
public void sendEmrRecordApproveNotice(String applyType,Integer count){
try {
String title = "待审批通知";
String content = "您有"+count+"份待审批"+applyType+"!";
//查询有借阅审批权限的id集合
String menuUrl = "/approve/updateApprove";
List<Power_User> users = userMapper.selectUserIdsWithApprove(menuUrl);
for(Power_User user : users){
WsPool.sendMessageToAll("emr_record_"+user.getUserId(),title+STR_SPLIT+content+STR_SPLIT+"emr_record");
}
}catch (Exception e){
e.printStackTrace();
}
}
}

@ -173,7 +173,7 @@ public class Power_Sys_DictController {
if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){
//修改医院信息
Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName());
if(dictVo != null && dictVo.getDictId() != powerSysDict.getDictId()){
if(dictVo != null && !dictVo.getDictId().equals(powerSysDict.getDictId())){
return Msg.fail("医院名称已存在!");
}else{
powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request);

@ -217,12 +217,12 @@
<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 id="txtTreeSelect1" type="text" onclick="showMenu1(); return false;"
class="form-control input-sm input" placeholder="所属科室"
name="parentId1"
data-id=""
readonly="readonly"
/>--%>
</div>
</div>
<%--<div id="menuContent1" class="menuContent" style="display:none;background: #f9f9f9;

@ -1,84 +0,0 @@
package com.manage.dao;
import com.manage.entity.Power_Dept;
import com.manage.vo.Power_DeptVo;
import java.util.List;
import java.util.Map;
public class Power_DeptMapperImpl implements Power_DeptMapper {
@Override
public int deleteByPrimaryKey(Integer dept_id) {
return this.deleteByPrimaryKey(dept_id);
}
@Override
public int insert(Power_Dept record) {
return this.insert(record);
}
@Override
public int insertSelective(Power_Dept record) {
return this.insertSelective(record);
}
@Override
public Power_Dept selectByPrimaryKey(Integer dept_id) {
return this.selectByPrimaryKey(dept_id);
}
@Override
public int updateByPrimaryKeySelective(Power_Dept record) {
return this.updateByPrimaryKeySelective(record);
}
@Override
public int updateByPrimaryKey(Power_Dept record) {
return this.updateByPrimaryKey(record);
}
@Override
public List<Power_DeptVo> findSomeByMore(Power_Dept powerDept) {
return this.findSomeByMore(powerDept);
}
@Override
public int getTotal(Power_Dept powerDept) {
return this.getTotal(powerDept);
}
@Override
public List<Power_DeptVo> getDeptList() {
return this.getDeptList();
}
@Override
public List<Power_Dept> checkDeptName(String deptName, Integer dictId) {
return this.checkDeptName(deptName,dictId);
}
@Override
public List<Power_Dept> selectByPrimaryKeys(Map<String, Object> map) {
return this.selectByPrimaryKeys(map);
}
@Override
public List<Power_Dept> selectDeptByDeptName(Map<String, Object> map) {
return this.selectDeptByDeptName(map);
}
@Override
public List<Power_DeptVo> selectDeptByUserId(Integer userId) {
return this.selectDeptByUserId(userId);
}
@Override
public List<Power_DeptVo> selectDeptByDictId(Integer dictId,String sysFlag) {
return this.selectDeptByDictId(dictId,sysFlag);
}
@Override
public int SimpleInsert(List<Power_Dept> list) {
return this.SimpleInsert(list);
}
}

@ -1,100 +0,0 @@
package com.manage.dao;
import com.manage.entity.Power_Detailed_Menu;
import com.manage.entity.Power_Menu;
import com.manage.entity.Power_Menu_User;
import java.util.List;
/**
* @Author:hjl
* @Date:Creatid in 1:13 2019/4/17
* @Description:
*/
/*@Repository*/
public class Power_MenuMapperImpl implements Power_MenuMapper {
@Override
public int deleteByPrimaryKey(Integer menuId) {
return this.deleteByPrimaryKey(menuId);
}
@Override
public int insert(Power_Menu record) {
return this.insert(record);
}
@Override
public int insertSelective(Power_Menu record) {
return this.insertSelective(record);
}
@Override
public Power_Menu selectByPrimaryKey(Integer menuId) {
return this.selectByPrimaryKey(menuId);
}
@Override
public int updateByPrimaryKeySelective(Power_Menu record) {
return this.updateByPrimaryKeySelective(record);
}
@Override
public int updateByPrimaryKey(Power_Menu record) {
return this.updateByPrimaryKey(record);
}
@Override
public List<Power_Menu> queryAllPowerMenu(String sysFlag,Integer roleId) {
return this.queryAllPowerMenu(sysFlag,roleId);
}
/* @Override
public List<Power_Detailed_Menu> queryMenuViewByUserId(Integer userId) {
return this.queryMenuViewByUserId(userId);
}*/
@Override
public List<Power_Menu_User> queryPoswerMenuByUserId(Integer userId,String sysFlag) {
return this.queryPoswerMenuByUserId(userId,sysFlag);
}
@Override
public List<Power_Menu> selectAll(String sysFlag, Integer isEffective,Integer roleId) {
return this.selectAll(sysFlag,isEffective,roleId);
}
@Override
public List<Power_Menu> selectMethodByMenuIdPowerTree(Integer parentId) {
return this.selectMethodByMenuIdPowerTree(parentId);
}
@Override
public List<Power_Menu> selectRoleMenuByUserIdAndDictId(Integer dictId, Integer userId) {
return this.selectRoleMenuByUserIdAndDictId(dictId,userId);
}
@Override
public List<Power_Menu> selectUserMenuByUserIdAndDictId(Integer dictId, Integer userId) {
return this.selectUserMenuByUserIdAndDictId(dictId,userId);
}
@Override
public List<Power_Menu> checkMenuNameBySysId(String sysFlag, String menuName) {
return this.checkMenuNameBySysId(sysFlag, menuName);
}
@Override
public List<Power_Menu> checkMethodByParentId(Integer parentId,String menuName,String method) {
return this.checkMethodByParentId(parentId,menuName,method);
}
@Override
public List<Power_Menu> selectUserAndRoleMenuListPower(Integer userId, String sysFlag) {
return this.selectUserAndRoleMenuListPower(userId, sysFlag);
}
@Override
public int updateChildSysFlagAndSysId(Integer menuId, Integer sysId, String sysFlag) {
return this.updateChildSysFlagAndSysId(menuId, sysId, sysFlag);
}
}

@ -1,68 +0,0 @@
package com.manage.dao;
import com.manage.entity.Power_Role;
import com.manage.vo.Power_RoleVo;
import java.util.List;
public class Power_RoleMapperImpl implements Power_RoleMapper {
@Override
public int deleteByPrimaryKey(Integer roleId) {
return this.deleteByPrimaryKey(roleId);
}
@Override
public int insert(Power_Role record) {
return this.insert(record);
}
@Override
public int insertSelective(Power_Role record) {
return this.insertSelective(record);
}
@Override
public Power_Role selectByPrimaryKey(Integer roleId) {
return this.selectByPrimaryKey(roleId);
}
@Override
public int updateByPrimaryKeySelective(Power_Role record) {
return this.updateByPrimaryKeySelective(record);
}
@Override
public int updateByPrimaryKey(Power_Role record) {
return this.updateByPrimaryKey(record);
}
@Override
public List<Power_RoleVo> findSomeByMore(Power_RoleVo powerRole, Integer roleId,Integer userId) {
return this.findSomeByMore(powerRole,roleId,userId);
}
@Override
public int getTotal(Power_RoleVo powerRole,Integer userRoleId,Integer userId) {
return this.getTotal(powerRole,userRoleId,userId);
}
@Override
public List<Power_RoleVo> selectList() {
return this.selectList();
}
@Override
public Power_Role checkRoleName(String roleName) {
return this.checkRoleName(roleName);
}
@Override
public List<Power_RoleVo> selectListByPower(Integer roleId,Integer userId) {
return this.selectListByPower(roleId,userId);
}
@Override
public int SimpleInsert(List<Power_Role> list) {
return this.SimpleInsert(list);
}
}

@ -59,4 +59,9 @@ public interface Power_UserMapper {
List<Power_User> getUserTreeByHospitalId(@Param("hospitalId")Integer hospitalId);
List<Power_User> getUserTreeByDeptId(@Param("deptId")Integer deptId);
/**
* id
* */
List<Power_User> selectUserIdsWithApprove(@Param("menuUrl")String menuUrl);
}

@ -1,150 +0,0 @@
package com.manage.dao;
import com.manage.entity.Power_User;
import com.manage.vo.Power_UserVo;
import com.manage.vo.User;
import java.util.List;
/**
* @Author:hjl
* @Date:Creatid in 1:09 2019/4/17
* @Description:
*/
/*@Repository*/
public class Power_UserMapperImpl implements Power_UserMapper{
@Override
public int deleteByPrimaryKey(Integer userId) {
return this.deleteByPrimaryKey(userId);
}
@Override
public int insert(Power_User record) {
return this.insert(record);
}
@Override
public int insertSelective(Power_User record) {
return this.insertSelective(record);
}
@Override
public Power_UserVo selectByPrimaryKey(Integer userId) {
return this.selectByPrimaryKey(userId);
}
@Override
public int updateByPrimaryKeySelective(Power_User record) {
return this.updateByPrimaryKey(record);
}
@Override
public int updateByPrimaryKey(Power_User record) {
return this.updateByPrimaryKey(record);
}
@Override
public List<Power_User> checkUserName(String userName) {
return this.checkUserName(userName);
}
@Override
public Power_UserVo findPowerUserByUserNameAndUserPwd(Power_User powerUser) {
return this.findPowerUserByUserNameAndUserPwd(powerUser);
}
@Override
public List<Power_UserVo> findSomeByMore(Power_UserVo powerUser) {
return this.findSomeByMore(powerUser);
}
@Override
public int getTotal(Power_UserVo powerUser) {
return this.getTotal(powerUser);
}
@Override
public List<Power_UserVo> selectList() {
return this.selectList();
}
@Override
public List<Power_UserVo> selectAllByDeptId(Integer deptId,String userName) {
return this.selectAllByDeptId(deptId,userName);
}
@Override
public List<Power_UserVo> selectAllBySysRole(Integer dictId) {
return this.selectAllBySysRole(dictId);
}
@Override
public List<Power_UserVo> selectAllByRoleIdAndDictId(Integer roleId,Integer dictId) {
return this.selectAllByRoleIdAndDictId(roleId,dictId);
}
@Override
public Integer updatePassword(String userPwd, Integer userId, String updater, String updateDate) {
return this.updatePassword(userPwd,userId, updater, updateDate);
}
@Override
public Integer validPassword(String userPwd, Integer userId, String updater, String updateDate) {
return this.validPassword(userPwd,userId, updater, updateDate);
}
@Override
public List<Power_UserVo> selectAllBySysId(Integer hospitalId,String userName) {
return this.selectAllBySysId(hospitalId,userName);
}
@Override
public List<Power_UserVo> selectUserListByNoticeTypeId(Integer noticeTypeId,Integer hospitalId) {
return this.selectUserListByNoticeTypeId(noticeTypeId,hospitalId);
}
@Override
public Integer selectHospitalIdByUserId(Integer userId) {
return this.selectHospitalIdByUserId(userId);
}
@Override
public List<Power_UserVo> selectUsersBySysFlagAndHospitalId(String sysFlag, Integer hospitalId) {
return this.selectUsersBySysFlagAndHospitalId(sysFlag,hospitalId);
}
@Override
public List<User> selectUserIdAndUserNameList(Integer userId) {
return this.selectUserIdAndUserNameList(userId);
}
@Override
public Integer selectEffectiveCount() {
return this.selectEffectiveCount();
}
@Override
public List<Power_UserVo> selectAllNotAdmin() {
return this.selectAllNotAdmin();
}
@Override
public int SimpleInsert(List<Power_User> list) {
return this.SimpleInsert(list);
}
@Override
public Power_UserVo findPowerUserByUserNameAndRemark(Power_User powerUser) {
return this.findPowerUserByUserNameAndRemark(powerUser);
}
@Override
public List<Power_User> getUserTreeByHospitalId(Integer hospitalId) {
return this.getUserTreeByHospitalId(hospitalId);
}
@Override
public List<Power_User> getUserTreeByDeptId(Integer deptId) {
return this.getUserTreeByDeptId(deptId);
}
}

@ -1,44 +0,0 @@
package com.manage.dao;
import com.manage.entity.T_Menu;
import org.springframework.stereotype.Repository;
/**
* @Author:hjl
* @Date:Creatid in 16:25 2019/4/7
* @Description:
* @Repository
*/
/*@Repository*/
public class T_MenuMapperImpl implements T_MenuMapper {
@Override
public int deleteByPrimaryKey(Integer menuId) {
return this.deleteByPrimaryKey(menuId);
}
@Override
public int insert(T_Menu record) {
return this.insert(record);
}
@Override
public int insertSelective(T_Menu record) {
return this.insertSelective(record);
}
@Override
public T_Menu selectByPrimaryKey(Integer menuId) {
return this.selectByPrimaryKey(menuId);
}
@Override
public int updateByPrimaryKeySelective(T_Menu record) {
return this.updateByPrimaryKeySelective(record);
}
@Override
public int updateByPrimaryKey(T_Menu record) {
return 0;
}
}

@ -657,4 +657,42 @@
FIND_IN_SET(#{deptId},dept_id)
and role_id != -100
</select>
<!--查询有审批权限的用户id-->
<select id="selectUserIdsWithApprove" resultMap="BaseResultMap">
SELECT DISTINCT
power_user.user_id
FROM
power_role_menu
INNER JOIN power_menu ON power_role_menu.menu_id = power_menu.menu_id
AND power_menu.menu_url = #{menuUrl}
INNER JOIN power_role ON power_role_menu.role_id = power_role.role_id
AND power_role.effective = 1
LEFT JOIN power_user ON power_role_menu.role_id = power_user.role_id
AND power_user.effective = 1
AND user_id NOT IN (
SELECT
user_id
FROM
power_user_menu
INNER JOIN power_menu ON power_user_menu.menu_id = power_menu.menu_id
AND power_menu.menu_url = #{menuUrl}
AND power_user_menu.flag = 0
)
UNION ALL
SELECT
user_id
FROM
power_user_menu
INNER JOIN power_menu ON power_user_menu.menu_id = power_menu.menu_id
AND power_menu.menu_url = #{menuUrl}
AND power_user_menu.flag = 1
UNION ALL
SELECT
user_id
FROM
power_user
WHERE
role_id = 0
OR role_id = - 100
</select>
</mapper>

@ -156,14 +156,14 @@ public class Power_NoticeServiceImpl{
//单个人
if(StringUtils.isNotBlank(powerNotice.getNoticeReceive())){
String receice = powerNotice.getNoticeReceive();
Integer parentId = powerNotice.getParentId();
Power_Notice power_notice = noticeMapper.selectByPrimaryKey(parentId);
String sysFlag = power_notice.getNoticeTypeFlag();
if(!"all".equals(receice)){
WsPool.sendMessageToAll(receice,title+STR_SPLIT+content+STR_SPLIT+powerNotice.getNoticeId());
WsPool.sendMessageToAll(sysFlag+"_"+receice,title+STR_SPLIT+content+STR_SPLIT+powerNotice.getNoticeId());
}else{
//all 该系统全部,不包括自己
//系统标识是power则该医院全部否则该系统全部
Integer parentId = powerNotice.getParentId();
Power_Notice power_notice = noticeMapper.selectByPrimaryKey(parentId);
String sysFlag = power_notice.getNoticeTypeFlag();
//查询该用户医院id
Integer hospitalId = null;
if(null != user.getUserId() && user.getRoleId() != 0){
@ -198,7 +198,7 @@ public class Power_NoticeServiceImpl{
if(null != powerUserVos && !powerUserVos.isEmpty()){
for (Power_UserVo users:powerUserVos){
if(!user.getUserId().equals(users.getUserId())){
WsPool.sendMessageToAll(users.getUserId().toString(),title+STR_SPLIT+content+STR_SPLIT+powerNotice.getNoticeId());
WsPool.sendMessageToAll(sysFlag+"_"+users.getUserId().toString(),title+STR_SPLIT+content+STR_SPLIT+powerNotice.getNoticeId());
}
}
}

@ -41,6 +41,7 @@ public class WsPool {
*
*/
public static void addUser(String userName, WebSocket conn) {
wsUserMap.put(conn, userName); // 添加连接
}

Loading…
Cancel
Save