电子病历通知问题

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>11.4.4</version>
+    <version>11.4.8</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/emr/EmrWebSocketController.java

@@ -49,7 +49,7 @@ public class EmrWebSocketController {
     public ResultVo<String> sendAMessage(@RequestParam("sid") String sid,
                                          @RequestParam("key") String key,
                                          @RequestParam("message") String message) {
-        return server.sendAMessage(sid, key, message);
+        return webSocketService.emrSendAMessage(sid, String.format("{\"%s\": \"%s\"}", key, message));
     }
 
     @GetMapping("/getChatHistoryBySid")

src/main/java/thyyxxk/webserver/service/externalhttp/WebSocketService.java

@@ -71,4 +71,8 @@ public interface WebSocketService {
     ResultVo<String> getCurrentDocumentUserCode(@Var("documentId") String documentId);
 
     @Post("/forcedKickingOutOfPersonnelByDocumentId")
-    ResultVo<String> forcedKickingOutOfPersonnelByDocumentId(@JSONBody JSONObject js);}
+    ResultVo<String> forcedKickingOutOfPersonnelByDocumentId(@JSONBody JSONObject js);
+
+    @Get("/emrSendAMessage?sid={sid}&msg={msg}")
+    ResultVo<String> emrSendAMessage(@Var("sid") String sid, @Var("msg") String msg);
+}

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrWebSocketServer.java

@@ -77,39 +77,7 @@ public class EmrWebSocketServer {
     }
 
     public ResultVo<String> sendAMessage(String sid, String key, String message) {
-        EmrSocketMessage esm = new EmrSocketMessage();
-        UserInfo us = redisLikeService.getUserInfoByToken();
 
-        esm.setName(us.getName()).setMessage(message).setAvatar(us.getAvatar()).setDate(DateUtil.formatDatetime(new Date())).setDeptName(us.getDeptName()).setCode(us.getCode());
-
-        if ("message".equals(key)) {
-            if (CHAT_ROOM.containsKey(sid)) {
-                CHAT_ROOM.get(sid).add(esm);
-            } else {
-                List<EmrSocketMessage> list = new ArrayList<>();
-                list.add(esm);
-                CHAT_ROOM.put(sid, list);
-            }
-        }
-
-        ApiMessageBody messageBody = new ApiMessageBody();
-        messageBody.setSid(sid);
-        ResultVo<List<String>> response = socketService.fetchEmrSessions(messageBody);
-        if (null == response || response.getCode() != ExceptionEnum.SUCCESS.getCode()) {
-            return ResultVoUtil.success();
-        }
-        List<String> list = response.getData();
-        if (ListUtil.isBlank(list)) {
-            return ResultVoUtil.success();
-        }
-        list.forEach(item -> {
-            String code = item.split("-")[0];
-            if (!code.equals(us.getCode())) {
-                messageBody.setUserCode(code);
-                messageBody.setMessageContent(String.format("{\"%s\" : \"%s\"}", key, message));
-                socketService.emrSendMessage(messageBody);
-            }
-        });
         return ResultVoUtil.success();
     }