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 ceba053..17171a0 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -636,18 +636,25 @@ public class FontController { * 科主任需要判定是否和病案的科室相符, * 病案室直接发送未审核数量 */ - @RequestMapping("sendMessageToOne") + @RequestMapping("sendMessageWithNew") @ResponseBody - public Msg sendMessageToOne(Message message) throws Exception{ + public Msg sendMessageWithNew(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("消息内容不能为空"); } - WebSocket wsByUser = WsPool.getWsByUser(message.getUserId().toString()); - WsPool.sendMessageToUser(wsByUser,message.getContent()); + WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag()); + return Msg.success(); } + }