浏览代码

Se corrige el DeviceManager para enviar disableTenancy y además se lee
el tenancyId desde el device[tenancy][id] que es como responde ahora los
devices.

Maximiliano Schvindt 7 年之前
父节点
当前提交
5f71ba56e3

+ 3 - 1
src/StatsBundle/Resources/translations/StatsBundle.es.yml

@@ -84,4 +84,6 @@ link_action_update_devices: Actualizar dispositivos
 
 Statistics: Estadísticas
 macroFields:
-    notavailable: 'NULL'
+    notavailable: 'NULL'
+List: Listados
+ONU: ONU

+ 6 - 1
src/StatsBundle/Services/DeviceManager.php

@@ -77,6 +77,7 @@ class DeviceManager
             foreach ($deviceTypes as $deviceType) {
                 $filters = array(
                     'deviceType' => $deviceType,
+                    'disableTenancy' => true
                 );
 
                 $limit = 2000;
@@ -90,7 +91,11 @@ class DeviceManager
                     foreach ($remoteDevices as $remoteDevice) {
                         $deviceType = str_replace("\\","\\\\",$remoteDevice['deviceType']);
                         $deviceId = $remoteDevice['deviceId'];
-                        $tenancyId = $remoteDevice['tenancyId'];
+                        if(isset($remoteDevice['tenancy'])) {
+                            $tenancyId = $remoteDevice['tenancy']['id'];
+                        } else {
+                            $tenancyId = 1;
+                        }
                         $deviceIp = $remoteDevice['ip'];
                         $deviceExtraData = $remoteDevice['extraData'];
                         $devicesIds[] = $deviceId;