优化

src/main/java/thyyxxk/webserver/controller/socketmessage/SocketMessageController.java

@@ -3,11 +3,16 @@ package thyyxxk.webserver.controller.socketmessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.config.auth.PassToken;
+import thyyxxk.webserver.constants.Message;
 import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.dictionary.CodeName;
+import thyyxxk.webserver.entity.socketmessage.ApiMessageBody;
 import thyyxxk.webserver.entity.socketmessage.MessageIndex;
 import thyyxxk.webserver.entity.socketmessage.SocketMessage;
 import thyyxxk.webserver.entity.socketmessage.SystemMessage;
+import thyyxxk.webserver.service.externalhttp.WebSocketService;
 import thyyxxk.webserver.service.socketmessage.SocketMessageService;
+import thyyxxk.webserver.utils.SocketMsg;
 
 import java.util.List;
 import java.util.Map;
@@ -16,10 +21,12 @@ import java.util.Map;
 @RequestMapping("/socketMessage")
 public class SocketMessageController {
     private final SocketMessageService service;
+    private final WebSocketService socketService;
 
     @Autowired
-    public SocketMessageController(SocketMessageService service) {
+    public SocketMessageController(SocketMessageService service, WebSocketService socketService) {
         this.service = service;
+        this.socketService = socketService;
     }
 
     @GetMapping("/selectSystemMessages")
@@ -43,4 +50,13 @@ public class SocketMessageController {
         return service.fetchAllMessages(sender);
     }
 
+    @PassToken
+    @PostMapping("/sendById")
+    public String sendMessageById(@RequestBody CodeName msg) {
+        String message = SocketMsg.socketVo(Message.MED_INS_FEE_UPLOAD_PROGRESS, msg.getName());
+        ApiMessageBody messageBody = new ApiMessageBody(message);
+        messageBody.setSid(msg.getCode());
+        socketService.sendMessageBySid(messageBody);
+        return "done";
+    }
 }

src/main/java/thyyxxk/webserver/controller/webosket/SendSocketController.java

@@ -1,34 +0,0 @@
-package thyyxxk.webserver.controller.webosket;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import thyyxxk.webserver.config.auth.PassToken;
-import thyyxxk.webserver.constants.Message;
-import thyyxxk.webserver.entity.dictionary.CodeName;
-import thyyxxk.webserver.entity.socketmessage.ApiMessageBody;
-import thyyxxk.webserver.service.externalhttp.WebSocketService;
-import thyyxxk.webserver.utils.SocketMsg;
-
-@RestController
-@RequestMapping("/socketMessage")
-public class SendSocketController {
-    private final WebSocketService socketService;
-
-    @Autowired
-    public SendSocketController(WebSocketService socketService) {
-        this.socketService = socketService;
-    }
-
-    @PassToken
-    @PostMapping("/sendById")
-    public String sendMessageById(@RequestBody CodeName msg) {
-        String message = SocketMsg.socketVo(Message.MED_INS_FEE_UPLOAD_PROGRESS, msg.getName());
-        ApiMessageBody messageBody = new ApiMessageBody(message);
-        messageBody.setSid(msg.getCode());
-        socketService.sendMessageBySid(messageBody);
-        return "done";
-    }
-}