From e245a0109b34b5232d03e5cae75478345e0c5785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Tue, 27 Sep 2022 11:10:54 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=20=EC=8B=9D=EB=B3=84?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20-=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C?=
 =?UTF-8?q?=20=ED=95=AD=EB=AA=A9=20=EC=A0=9C=EA=B1=B0(=EB=B0=B0=ED=84=B0?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=94=EB=9F=89,=20=EC=9D=B4=EB=8F=99=EA=B1=B0?=
 =?UTF-8?q?=EB=A6=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palnet/server/command/SocketCommand.java  | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/src/main/java/com/palnet/server/command/SocketCommand.java b/src/main/java/com/palnet/server/command/SocketCommand.java
index c039e72..e9effae 100644
--- a/src/main/java/com/palnet/server/command/SocketCommand.java
+++ b/src/main/java/com/palnet/server/command/SocketCommand.java
@@ -100,7 +100,6 @@ public class SocketCommand {
                 model.setTerminalRcvDt(obj.get("terminalRcvDt").toString().trim());
                 model.setSpeedType((String) obj.get("speedType"));
                 model.setElevType((String) obj.get("elevType"));
-                model.setMoveDistanceType((String) obj.get("moveDistanceType"));
                 model.setDronStatus((String) obj.get("dronStatus"));
 
                 if (obj.get("lat") != null) model.setLat(Double.valueOf(obj.get("lat").toString()));
@@ -108,20 +107,6 @@ public class SocketCommand {
                 if (obj.get("elev") != null) model.setElev(Double.valueOf(obj.get("elev").toString()));
                 if (obj.get("speed") != null) model.setSpeed(Double.valueOf(obj.get("speed").toString()));
                 if (obj.get("heading") != null) model.setHeading(Double.valueOf(obj.get("heading").toString()));
-                if (obj.get("moveDistance") != null)
-                    model.setMoveDistance(Double.valueOf(obj.get("moveDistance").toString()));
-                if (obj.get("betteryLevel") != null)
-                    model.setBetteryLevel(Double.valueOf(obj.get("betteryLevel").toString()));
-                if (obj.get("betteryVoltage") != null)
-                    model.setBetteryVoltage(Double.valueOf(obj.get("betteryVoltage").toString()));
-
-                // 환경 데이터 필드 추가
-                if (obj.get("sensorCo") != null) model.setSensorCo(Double.valueOf(obj.get("sensorCo").toString()));
-                if (obj.get("sensorSo2") != null) model.setSensorSo2(Double.valueOf(obj.get("sensorSo2").toString()));
-                if (obj.get("sensorNo2") != null) model.setSensorNo2(Double.valueOf(obj.get("sensorNo2").toString()));
-                if (obj.get("sensorO3") != null) model.setSensorO3(Double.valueOf(obj.get("sensorO3").toString()));
-                if (obj.get("sensorDust") != null)
-                    model.setSensorDust(Double.valueOf(obj.get("sensorDust").toString()));
 
                 // 서버 수신 시간 정보
                 model.setServerRcvDt(DateUtils.getCurrentTime());
@@ -201,26 +186,6 @@ public class SocketCommand {
                 // STEP 3. 화면에 표출할 정보 WebSocket 전달
 				messageProducer.sendControlMessage(model);
 
-//				try {
-//					Socket socket = new Socket();
-//					SocketAddress address = new InetSocketAddress(
-//							env.getProperty("netty.websocket.host"),
-//							Integer.parseInt(env.getProperty("netty.websocket.port"))
-//					);
-//
-//					socket.connect(address);
-//
-//					String gpsJson = JsonUtils.toJson(model);
-//
-//					OutputStream outputStream = socket.getOutputStream();
-//					outputStream.write(gpsJson.getBytes(StandardCharsets.UTF_8));
-//					outputStream.flush();
-//
-//					socket.close();
-//				} catch (IOException e) {
-//					logger.error("");
-//				}
-
             } else {
                 logger.error("좌표 정보가 존재하지 않습니다.");
                 throw new IllegalArgumentException("좌표 정보가 존재하지 않습니다.");