|
@@ -127,8 +127,14 @@ class StatsController extends Controller
|
|
|
$adminPool = $this->get('sonata.admin.pool');
|
|
|
|
|
|
$api = $this->get('geoserver.api');
|
|
|
- $data = $api->getLayerData("deviceServer_1", "onu_stats_tenancy_1");
|
|
|
-
|
|
|
+ $tenancyId = $this->get("base_tenancy.tenancy_service")->getTenancyIdCurrent();
|
|
|
+ $deviceServerId = $this->getParameter('device_server_base');
|
|
|
+ $gsHost = $this->getParameter('geoserver_host');
|
|
|
+ $gsPort = $this->getParameter('geoserver_port');
|
|
|
+ $workspace = "deviceServer_{$deviceServerId}";
|
|
|
+ $layer = "onu_stats_tenancy_{$tenancyId}";
|
|
|
+
|
|
|
+ $data = $api->getLayerData($workspace, $layer);
|
|
|
$setLatLng = $setZoom = false;
|
|
|
|
|
|
if(!empty($data)) {
|
|
@@ -169,7 +175,11 @@ class StatsController extends Controller
|
|
|
'base_template' => $adminPool->getTemplate('layout'),
|
|
|
'admin_pool' => $adminPool,
|
|
|
'admin' => $adminPool->getAdminByClass("StatsBundle\Entity\Onu"),
|
|
|
- 'map' => $map
|
|
|
+ 'map' => $map,
|
|
|
+ 'ws' => $workspace,
|
|
|
+ 'layer' => $layer,
|
|
|
+ 'gsHost'=> $gsHost,
|
|
|
+ 'gsPort'=> $gsPort
|
|
|
));
|
|
|
}
|
|
|
|
|
@@ -340,9 +350,12 @@ class StatsController extends Controller
|
|
|
|
|
|
$adminPool = $this->get('sonata.admin.pool');
|
|
|
$api = $this->get('geoserver.api');
|
|
|
-
|
|
|
+ $gsHost = $this->getParameter('geoserver_host');
|
|
|
+ $gsPort = $this->getParameter('geoserver_port');
|
|
|
+ $workspace = "deviceServer_{$deviceServerId}";
|
|
|
$layer = "ponport_stats_t_{$tenancyId}_o_{$oltDeviceId}_s_{$deviceServerId}_c_{$card}_s_{$slot}";
|
|
|
- $data = $api->getLayerData("deviceServer_1", $layer);
|
|
|
+
|
|
|
+ $data = $api->getLayerData($workspace, $layer);
|
|
|
|
|
|
$setLatLng = $setZoom = false;
|
|
|
|
|
@@ -386,7 +399,10 @@ class StatsController extends Controller
|
|
|
'admin' => $adminPool->getAdminByClass("StatsBundle\Entity\PonPort"),
|
|
|
'map' => $map,
|
|
|
'layer' => $layer,
|
|
|
- 'ponPort' => $ponPort
|
|
|
+ 'ponPort' => $ponPort,
|
|
|
+ 'ws' => $workspace,
|
|
|
+ 'gsHost'=> $gsHost,
|
|
|
+ 'gsPort'=> $gsPort
|
|
|
));
|
|
|
}
|
|
|
|