From 6c12365a2360c6bdf56baa674ac6c6e120b481d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Tue, 29 Aug 2023 11:21:56 +0900 Subject: [PATCH] remove rabbit server and socket --- ...ler.java => SocketReceiverController.java} | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) rename src/main/java/com/palnet/server/controller/{WebSocketReceiverController.java => SocketReceiverController.java} (68%) diff --git a/src/main/java/com/palnet/server/controller/WebSocketReceiverController.java b/src/main/java/com/palnet/server/controller/SocketReceiverController.java similarity index 68% rename from src/main/java/com/palnet/server/controller/WebSocketReceiverController.java rename to src/main/java/com/palnet/server/controller/SocketReceiverController.java index d473048..d52a41f 100644 --- a/src/main/java/com/palnet/server/controller/WebSocketReceiverController.java +++ b/src/main/java/com/palnet/server/controller/SocketReceiverController.java @@ -8,8 +8,7 @@ import com.palnet.comn.model.GPModel; import com.palnet.server.task.ctr.service.CtrCntrlTaskService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; /** @@ -27,28 +26,30 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/api/ws") -public class WebSocketReceiverController { +public class SocketReceiverController { private final CtrCntrlTaskService service; private final CtrHistoryShareContext historyShareContext; private final ObjectMapper objectMapper; @PostMapping("/receiver") - public String receiver(@RequestBody String message) { - log.info("websocket message : {}", message); + public ResponseEntity receiver(@RequestBody GPModel model) { + log.info("websocket message : {}", model); - GPModel model = null; - try { - model = objectMapper.readValue(message, GPModel.class); - } catch (JsonProcessingException e) { - log.error("ERROR : {}\n{}", e.getMessage(), e.getStackTrace()); - throw new RuntimeException(e); - } +// log.info("websocket message : {}", message); +// GPModel model = null; +// try { +// model = objectMapper.readValue(message, GPModel.class); +// } catch (JsonProcessingException e) { +// log.error("ERROR : {}\n{}", e.getMessage(), e.getStackTrace()); +// throw new RuntimeException(e); +// } CtrCntrlModel history = service.modelConvert(model); // DRON의 대한 식별정보만 이력 관리 historyShareContext.putHistory(model.getObjectId(), history); - return "SUCCESS"; + + return ResponseEntity.ok().build(); } }