diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index 25f4622..141003e 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -532,13 +532,13 @@ public class FontController { return power_dept.getDeptCode(); } /** - * 根据病案deptcode,查询出所有符合的科主任,需要用户id,用户名称,科室名称 + * 根据病案deptcode,查询出所有符合的科主任,数据:用户id,用户名称,科室名称 */ @RequestMapping("/getUserInfoByDeptCodeForChief") @ResponseBody public String getUserInfoByDeptCodeForChief(String DeptCode) throws Exception{ List power_users = power_userMapper.selectAllForChief(DeptCode); - String result = null; + String result = ""; for (int i = 0; i < power_users.size(); i++) { Power_User power_user = power_users.get(i); result=power_user.getUserId()+","+power_user.getUserName()+","+power_user.getName()+";"; @@ -552,7 +552,7 @@ public class FontController { @ResponseBody public String getUserInfoByDeptCodeForRecordRoom(String DeptCode) throws Exception{ List power_users = power_userMapper.selectAllForRecordRoom(DeptCode); - String result = null; + String result = ""; for (int i = 0; i < power_users.size(); i++) { Power_User power_user = power_users.get(i); result=power_user.getUserId()+","+power_user.getUserName()+","+power_user.getName()+";"; @@ -593,4 +593,31 @@ public class FontController { return result; } + /** + * 从高明更新至湛江,2021/11/20 + * 修改为向特定用户发送信息 + * 特定用户科主任,病案室 + * 科主任需要判定是否和病案的科室相符, + * 病案室直接发送未审核数量 + */ + @RequestMapping("sendMessage") + @ResponseBody + public Msg sendMessage(Message message) throws Exception{ + if(null == message.getUserId()){ + return Msg.fail("消息用户id不能为空"); + } + if(StringUtils.isBlank(message.getSysFlag())){ + return Msg.fail("消息系统标识不能为空"); + } + if(StringUtils.isBlank(message.getTitle())){ + return Msg.fail("消息标题不能为空"); + } + if(StringUtils.isBlank(message.getContent())){ + return Msg.fail("消息内容不能为空"); + } + WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag()); + //修改为向特定用户发送信息 +// WsPool.sendMessageToUser(); + return Msg.success(); + } } diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java index cde6da1..c77bbc5 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java @@ -80,4 +80,6 @@ public interface Power_UserMapper { String selectForDeptId(Integer userId); String selectForDeptCode(String deptId); + + String selectForDeptIdForChief(Integer userId); } \ No newline at end of file diff --git a/power-dao/src/main/java/com/manage/vo/Message.java b/power-dao/src/main/java/com/manage/vo/Message.java new file mode 100644 index 0000000..da8c7d5 --- /dev/null +++ b/power-dao/src/main/java/com/manage/vo/Message.java @@ -0,0 +1,65 @@ +package com.manage.vo; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/11/9 15:18 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/11/9 15:18 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +public class Message { + private Integer userId; + + private String sysFlag; + + private String title; + + private String content; + + private String typeFlag; + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getSysFlag() { + return sysFlag; + } + + public void setSysFlag(String sysFlag) { + this.sysFlag = sysFlag; + } + + 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 String getTypeFlag() { + return typeFlag; + } + + public void setTypeFlag(String typeFlag) { + this.typeFlag = typeFlag; + } +} diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index 5e79347..f5fbebb 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -746,4 +746,13 @@ FROM `power_dept` WHERE dept_id = #{deptId} + \ No newline at end of file