From db60d81ee120e35ff3176133b7b8459d787f781e Mon Sep 17 00:00:00 2001 From: pahnjy Date: Tue, 14 Feb 2017 11:32:00 +0900 Subject: [PATCH] =?UTF-8?q?LWM2M=20Device=20=EC=A0=9C=EC=96=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20#372?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pineone/icbms/so/device/logic/DeviceManagerLogic.java | 3 +-- .../com/pineone/icbms/so/device/util/ClientProfile.java | 1 - .../com/pineone/icbms/so/util/session/DefaultSession.java | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java b/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java index 76f84934..d51d7062 100644 --- a/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java +++ b/so-device/src/main/java/com/pineone/icbms/so/device/logic/DeviceManagerLogic.java @@ -128,8 +128,7 @@ public String deviceExecute(String deviceId,String deviceCommand, String session // Device 제어 요청 보냄. ResultMessage resultMessage = new ResultMessage(); if(device.getDeviceUri().contains("lwm2m")){ -// resultMessage = deviceControlProxy.lwm2mDeviceControlRequest(contextAddress.getServerAddress(ContextAddress.SI_SERVER) + AddressStore.SI_LWM2M_CONTOL_URI,deviceControlMessage,lwm2MDeviceControl); - resultMessage = deviceControlProxy.lwm2mDeviceControlRequest(ClientProfile.SI_CONTROL_DEV_URI + AddressStore.SI_LWM2M_CONTOL_URI,deviceControlMessage,lwm2MDeviceControl); + resultMessage = deviceControlProxy.lwm2mDeviceControlRequest(contextAddress.getServerAddress(ContextAddress.SI_SERVER) + AddressStore.SI_LWM2M_CONTOL_URI,deviceControlMessage,lwm2MDeviceControl); } else { resultMessage = deviceControlProxy.deviceControlRequest(contextAddress.getServerAddress(ContextAddress.SI_SERVER) + AddressStore.SI_CONTOL_URI,deviceControlMessage); } diff --git a/so-device/src/main/java/com/pineone/icbms/so/device/util/ClientProfile.java b/so-device/src/main/java/com/pineone/icbms/so/device/util/ClientProfile.java index a6c9fcdf..f97015ee 100644 --- a/so-device/src/main/java/com/pineone/icbms/so/device/util/ClientProfile.java +++ b/so-device/src/main/java/com/pineone/icbms/so/device/util/ClientProfile.java @@ -9,7 +9,6 @@ public class ClientProfile { public static final String SI_COMMAND_ID = "cmd_"; // LWM2M control Data - public static final String SI_CONTROL_DEV_URI = "http://218.153.68.53:8081"; public static final String SI_CONTROL_JSON_TYPE = "application/json:1"; public static final String SI_CONTROL_LWM2M_SOUND = "sound__-1024-12-3"; public static final String SI_CONTROL_LWM2M = "lwm2m"; diff --git a/so-util/src/main/java/com/pineone/icbms/so/util/session/DefaultSession.java b/so-util/src/main/java/com/pineone/icbms/so/util/session/DefaultSession.java index b7d10588..73c28dfa 100644 --- a/so-util/src/main/java/com/pineone/icbms/so/util/session/DefaultSession.java +++ b/so-util/src/main/java/com/pineone/icbms/so/util/session/DefaultSession.java @@ -67,13 +67,6 @@ public DefaultSession() { mongoTime = new Date(); createDate = mongoTime.toString(); calculateTime = System.currentTimeMillis(); - - System.out.println("ahn"); - System.out.println(mongoTime); - System.out.println(createDate); - System.out.println(calculateTime); - System.out.println("ahn"); - } public DefaultSession(String id, Map sessionData) {