lighter 1 年之前
父节点
当前提交
0eb74a2930

+ 1 - 1
pom.xml

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

+ 2 - 1
src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/emr/EmrWebSocketController.java

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

+ 2 - 5
src/main/java/thyyxxk/webserver/service/externalhttp/WebSocketService.java

@@ -22,7 +22,7 @@ public interface WebSocketService {
     ResultVo<Integer> getOnlineCount();
 
     @Post("/sendFloorTriageMessage")
-    ResultVo<String> sendFloorTriageMessage(@JSONBody ApiMessageBody body);
+    void sendFloorTriageMessage(@JSONBody ApiMessageBody body);
 
     @Post("/sendRoomTriageMessage")
     ResultVo<String> sendRoomTriageMessage(@JSONBody ApiMessageBody body);
@@ -33,9 +33,6 @@ public interface WebSocketService {
     @Post("/fetchEmrSessions")
     ResultVo<List<String>> fetchEmrSessions(@JSONBody ApiMessageBody body);
 
-    @Post("/emrSendMessage")
-    void emrSendMessage(@JSONBody ApiMessageBody body);
-
     @Get("/isBeingEditing?documentId={documentId}")
     ResultVo<String> isBeingEditing(@Var("documentId") String documentId);
 
@@ -74,5 +71,5 @@ public interface WebSocketService {
     ResultVo<String> forcedKickingOutOfPersonnelByDocumentId(@JSONBody JSONObject js);
 
     @Get("/emrSendAMessage?sid={sid}&msg={msg}")
-    ResultVo<String> emrSendAMessage(@Var("sid") String sid, @Var("msg") String msg);
+    void emrSendAMessage(@Var("sid") String sid, @Var("msg") String msg);
 }