From 9641c5ccf39d435ac63dab945d049bd5ea671c62 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, 27 Feb 2024 10:43:44 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20decode=20=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/palnet/kac/socket/core/codec/DronDecoder.java | 3 --- .../java/kr/co/palnet/kac/socket/core/codec/DronEncoder.java | 4 ++-- .../kac/socket/core/command/impl/SandboxDronCommandImpl.java | 2 +- .../kr/co/palnet/kac/socket/core/handler/DronHandler.java | 2 ++ 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronDecoder.java b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronDecoder.java index 010c88d..7b38f83 100644 --- a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronDecoder.java +++ b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronDecoder.java @@ -21,9 +21,6 @@ public class DronDecoder extends MessageToMessageDecoder { protected void decode(ChannelHandlerContext ctx, String in, List out) throws Exception { log.info(">>>>> decode <<<<<"); try { -// TypeReference typeRef = new TypeReference() { -// }; -// DronRQ payload = objectMapper.readValue(in, typeRef); DronRq payload = objectMapper.readValue(in, DronRq.class); if (payload != null) { out.add(payload); diff --git a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronEncoder.java b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronEncoder.java index cf3fddf..1b4b099 100644 --- a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronEncoder.java +++ b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/codec/DronEncoder.java @@ -19,8 +19,8 @@ public class DronEncoder extends MessageToMessageEncoder { protected void encode(ChannelHandlerContext ctx, Object msg, List out) throws Exception { log.info(">>>>> encode <<<"); try { -// String json = objectMapper.writeValueAsString(msg); -// out.add(json); + String json = objectMapper.writeValueAsString(msg); + out.add(json); } catch (Exception e) { log.warn("json parsing error : {} :: {}", e.getMessage(), msg); } diff --git a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/command/impl/SandboxDronCommandImpl.java b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/command/impl/SandboxDronCommandImpl.java index dac003e..fb7ae40 100644 --- a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/command/impl/SandboxDronCommandImpl.java +++ b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/command/impl/SandboxDronCommandImpl.java @@ -133,7 +133,7 @@ public class SandboxDronCommandImpl implements DronCommand { } Long end = System.currentTimeMillis(); - log.info(">>> during time : {}::{}", dron.getObjectId(), end - start); + log.info(">>> during time : {} - {}", dron.getObjectId(), end - start); } else { log.error("좌표 정보가 존재하지 않습니다."); diff --git a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/handler/DronHandler.java b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/handler/DronHandler.java index d903543..294695a 100644 --- a/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/handler/DronHandler.java +++ b/app/kac-socket-app/src/main/java/kr/co/palnet/kac/socket/core/handler/DronHandler.java @@ -67,7 +67,9 @@ public class DronHandler extends SimpleChannelInboundHandler { } log.info(">>> rq : {}", rq); + DronCommand commandService = commandMap.get(rq.getCommand().trim()); + if (commandService == null) { ctx.writeAndFlush(DronRs.builder() .code("-2100")