From 31666f0337fcf0ba6cd23331cbb5f8701ad7148b Mon Sep 17 00:00:00 2001 From: jg Date: Wed, 6 Aug 2025 15:38:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[MOD]=20=ED=94=84=EB=A1=A0=ED=8A=B8=20?= =?UTF-8?q?=EC=B8=A1=EC=97=90=EC=84=9C=20=EC=A0=84=EB=8B=AC=ED=95=9C=20?= =?UTF-8?q?=EC=84=B1=EA=B3=B5=20=EA=B5=AC=EB=B6=84=EC=9E=90=20=EB=B0=98?= =?UTF-8?q?=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../balybus/galaxy/chat/controller/ChatSocketController.java | 2 +- .../java/com/balybus/galaxy/chat/dto/ChatMsgRequestDto.java | 2 ++ src/main/resources/templates/chat/chatTestA.html | 5 +++-- src/main/resources/templates/chat/chatTestB.html | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java b/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java index 250e6650..24a83dad 100644 --- a/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java +++ b/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java @@ -35,7 +35,7 @@ public void sendPrivateMessage(ChatMsgRequestDto.SendPrivateMessage message, @He try { ChatMsgResponseDto.SendPrivateMessage responseDto = chatService.saveMessage(message, sender); //채팅 데이터 DB 저장 messagingTemplate.convertAndSendToUser(responseDto.getReceiverMail(), "/queue/private", responseDto); //받는사람에게 채팅 전송 - messagingTemplate.convertAndSendToUser(sender, "/queue/success", "SUCCESS"); //보낸사람에게 채팅 전송 성공여부 전송 + messagingTemplate.convertAndSendToUser(sender, "/queue/success", message.getSuccessSepCode()); //보낸사람에게 채팅 전송 성공여부 전송 } catch (Exception e) { // 예외가 발생한 경우 메시지를 보낸 사람에게 에러 메시지를 보냄 messagingTemplate.convertAndSendToUser(sender, "/queue/error", "Error occurred: " + e.getMessage()); diff --git a/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgRequestDto.java b/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgRequestDto.java index e4892d85..24ee21ef 100644 --- a/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgRequestDto.java +++ b/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgRequestDto.java @@ -9,6 +9,8 @@ public static class SendPrivateMessage { private Long receiverId; private Long patientLogId; private String content; + + private String successSepCode; } @Data diff --git a/src/main/resources/templates/chat/chatTestA.html b/src/main/resources/templates/chat/chatTestA.html index 3cabcbfc..788eda53 100644 --- a/src/main/resources/templates/chat/chatTestA.html +++ b/src/main/resources/templates/chat/chatTestA.html @@ -68,8 +68,9 @@

WebSocket Test

const message = { content: document.getElementById("textMsg").value, senderId: chatSenderId, // 메시지를 보낼 사용자 - receiverId: document.getElementById("receiverId").value, // 메시지를 받을 사용자 - patientLogId: document.getElementById("patientId").value // 메시지를 환자 + receiverId: document.getElementById("receiverId").value, // 메시지를 받을 사용자 + patientLogId: document.getElementById("patientId").value, // 메시지를 환자 + successSepCode: "123456789" }; messageContainer.innerHTML += `

보낸 개인 메시지: ${message.content}

`; stompClient.send("/app/private-message", {}, JSON.stringify(message)); // private-message 엔드포인트로 메시지 전송 diff --git a/src/main/resources/templates/chat/chatTestB.html b/src/main/resources/templates/chat/chatTestB.html index 7e4d8efe..b291175d 100644 --- a/src/main/resources/templates/chat/chatTestB.html +++ b/src/main/resources/templates/chat/chatTestB.html @@ -69,7 +69,8 @@

WebSocket Test

content: document.getElementById("textMsg").value, senderId: chatSenderId, // 메시지를 보낼 사용자 receiverId: document.getElementById("receiverId").value, // 메시지를 받을 사용자 - patientLogId: document.getElementById("patientId").value // 메시지를 환자 + patientLogId: document.getElementById("patientId").value, // 메시지를 환자 + successSepCode: "123456789" }; messageContainer.innerHTML += `

보낸 개인 메시지: ${message.content}

`; stompClient.send("/app/private-message", {}, JSON.stringify(message)); // private-message 엔드포인트로 메시지 전송 From 87ee9d40d6e6ff85321bcfdc20c4243a76bc6d71 Mon Sep 17 00:00:00 2001 From: jg Date: Wed, 6 Aug 2025 15:57:00 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[MOD]=20=ED=94=84=EB=A1=A0=ED=8A=B8=20?= =?UTF-8?q?=EC=B8=A1=EC=97=90=EC=84=9C=20=EC=A0=84=EB=8B=AC=ED=95=9C=20?= =?UTF-8?q?=EC=84=B1=EA=B3=B5=20=EA=B5=AC=EB=B6=84=EC=9E=90=20=EB=B0=98?= =?UTF-8?q?=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/controller/ChatSocketController.java | 14 ++++++++++++-- .../galaxy/chat/dto/ChatMsgResponseDto.java | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java b/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java index 24a83dad..2ed34d88 100644 --- a/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java +++ b/src/main/java/com/balybus/galaxy/chat/controller/ChatSocketController.java @@ -35,10 +35,20 @@ public void sendPrivateMessage(ChatMsgRequestDto.SendPrivateMessage message, @He try { ChatMsgResponseDto.SendPrivateMessage responseDto = chatService.saveMessage(message, sender); //채팅 데이터 DB 저장 messagingTemplate.convertAndSendToUser(responseDto.getReceiverMail(), "/queue/private", responseDto); //받는사람에게 채팅 전송 - messagingTemplate.convertAndSendToUser(sender, "/queue/success", message.getSuccessSepCode()); //보낸사람에게 채팅 전송 성공여부 전송 + messagingTemplate.convertAndSendToUser(sender, "/queue/success", + ChatMsgResponseDto.resultNotice.builder() + .code(200) + .msg("SUCCESS") + .successSepCode(message.getSuccessSepCode()) + .build()); //보낸사람에게 채팅 전송 성공여부 전송 } catch (Exception e) { // 예외가 발생한 경우 메시지를 보낸 사람에게 에러 메시지를 보냄 - messagingTemplate.convertAndSendToUser(sender, "/queue/error", "Error occurred: " + e.getMessage()); + messagingTemplate.convertAndSendToUser(sender, "/queue/error", + ChatMsgResponseDto.resultNotice.builder() + .code(400) + .msg(e.getMessage()) + .successSepCode(message.getSuccessSepCode()) + .build()); } } } diff --git a/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgResponseDto.java b/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgResponseDto.java index 84ce3cc6..d5e3731f 100644 --- a/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgResponseDto.java +++ b/src/main/java/com/balybus/galaxy/chat/dto/ChatMsgResponseDto.java @@ -7,6 +7,14 @@ import java.util.List; public class ChatMsgResponseDto { + @Getter + @Builder + public static class resultNotice { + private int code; + private String msg; + private String successSepCode; + } + @Getter @Builder public static class SendPrivateMessage {