Merge pull request #307 from pahnjy/develop

Device Subscription에 따른 로직 변경 #291
iotoasis · Dec 21, 2016 · 950e965 · 950e965
2 parents e74a388 + 04ab14c
commit 950e965
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 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
@@ -224,19 +224,22 @@ public void deviceUpdate(DeviceStatusData deviceStatusData) {
             String deviceUri = getOnem2mDeviceUri(deviceStatusData.get_uri());
             Device device = deviceSearchById(deviceUri);
             DeviceSubscriptionObject deviceSubscriptionObject = deviceSubscriptionStore.retrieve(deviceStatusData.get_commandId());
-
+            String response;
             if(deviceSubscriptionObject != null && deviceSubscriptionObject.get_commandId().equals(deviceStatusData.get_commandId()) && deviceSubscriptionObject.getDeviceStatus().equals(deviceStatusData.getCon())){
                 logger.debug(LogPrint.LogMethodNamePrint() + "Device Data Update");
                 device.setDeviceStatus(deviceStatusData.getCon());
                 deviceStore.update(device);
                 /**
                  * Device Subscription 해제 요청
                  */
-                String response = deviceSubscriptionRelease(deviceUri + (ClientProfile.actionDeviceCommand(device.getDeviceUri()) ? ClientProfile.SI_CONTAINER_ACTION : ClientProfile.SI_CONTAINER_POWER) + ClientProfile.SI_CONTAINER_STATUS);
-                deviceSubscriptionObject.setReleaseResult(response);
-                deviceSubscriptionStore.update(deviceSubscriptionObject);
+                response = deviceSubscriptionRelease(deviceUri + (ClientProfile.actionDeviceCommand(device.getDeviceUri()) ? ClientProfile.SI_CONTAINER_ACTION : ClientProfile.SI_CONTAINER_POWER) + ClientProfile.SI_CONTAINER_STATUS);
             } else {
                 logger.debug(LogPrint.LogMethodNamePrint() + "The state or command of the device is different.");
+                response = "Status not same.";
+            }
+            if (deviceSubscriptionObject != null) {
+                deviceSubscriptionObject.setReleaseResult(response);
+                deviceSubscriptionStore.update(deviceSubscriptionObject);
             }
         }
     }

diff --git a/...evice/src/main/java/com/pineone/icbms/so/device/store/mongo/DeviceSubscriptionObject.java b/...evice/src/main/java/com/pineone/icbms/so/device/store/mongo/DeviceSubscriptionObject.java
@@ -82,6 +82,8 @@ public String toString() {
                 "_id='" + _id + '\'' +
                 ", _commandId='" + _commandId + '\'' +
                 ", deviceStatus='" + deviceStatus + '\'' +
+                ", subscriptionResult='" + subscriptionResult + '\'' +
+                ", releaseResult='" + releaseResult + '\'' +
                 '}';
     }
 }