Merge pull request #378 from pahnjy/develop

LWM2M Device 제어 추가 #372
iotoasis · Feb 14, 2017 · a6754cc · a6754cc
2 parents 290705d + db60d81
commit a6754cc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 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
@@ -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
@@ -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
@@ -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<String, String> sessionData) {