Se actualizan elementos y claves de tabla Onu.

app/Resources/geoserverStyles/onuRxPower.xml

@@ -49,7 +49,7 @@
                     <CssParameter name="fill">#a00400</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -103,7 +103,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -156,7 +156,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -210,7 +210,7 @@
                     <CssParameter name="fill">#00a65a</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -264,7 +264,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -318,7 +318,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -364,7 +364,7 @@
                     <CssParameter name="fill">#a00400</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -409,7 +409,7 @@
                     <CssParameter name="fill">#c9c9c9</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>

app/Resources/geoserverStyles/onuRxPowerLabel.xml

@@ -49,7 +49,7 @@
                     <CssParameter name="fill">#a00400</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -133,7 +133,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -216,7 +216,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -300,7 +300,7 @@
                     <CssParameter name="fill">#00a65a</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -384,7 +384,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -468,7 +468,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -544,7 +544,7 @@
                     <CssParameter name="fill">#a00400</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -619,7 +619,7 @@
                     <CssParameter name="fill">#c9c9c9</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>

app/Resources/geoserverStyles/onuStatus..xml

@@ -49,7 +49,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -93,7 +93,7 @@
                     <CssParameter name="fill">#00a65a</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>

app/Resources/geoserverStyles/onuTxPower.xml

@@ -49,7 +49,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -103,7 +103,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -156,7 +156,7 @@
                     <CssParameter name="fill">#00a65a</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -210,7 +210,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -264,7 +264,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -310,7 +310,7 @@
                     <CssParameter name="fill">#a00400</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -355,7 +355,7 @@
                     <CssParameter name="fill">#c9c9c9</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>

app/Resources/geoserverStyles/onuTxPowerLabel.xml

@@ -49,7 +49,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -133,7 +133,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -216,7 +216,7 @@
                     <CssParameter name="fill">#00a65a</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -300,7 +300,7 @@
                     <CssParameter name="fill">#ffa732</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -384,7 +384,7 @@
                     <CssParameter name="fill">#ff4d3f</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -460,7 +460,7 @@
                     <CssParameter name="fill">#a00400</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
           <TextSymbolizer>
@@ -535,7 +535,7 @@
                     <CssParameter name="fill">#c9c9c9</CssParameter>
                   </Fill>
                 </Mark>
-              <Size>7</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>

composer.lock

@@ -1466,7 +1466,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
-                "reference": "5598897b65f539ff1788fd601daa102cc4692479"
+                "reference": "2dc4e1918d81b7fbb82447ad1268637a267f6554"
             },
             "require": {
                 "ext-curl": "*",
@@ -1479,7 +1479,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-08-30 12:33:41"
+            "time": "2017-09-01 15:52:53"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1647,7 +1647,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "b52ce2ca48888b55efae468773b25f2119348c5e"
+                "reference": "320af7d65cc6092c5788bb7c24b66ce1d513a5c4"
             },
             "require": {
                 "ext-curl": "*",
@@ -1660,7 +1660,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-08-15 13:48:13"
+            "time": "2017-08-31 14:11:18"
         },
         {
             "name": "incenteev/composer-parameter-handler",

src/StatsBundle/Controller/StatsController.php

@@ -186,10 +186,10 @@ class StatsController extends Controller
         
         $data = json_decode($return,true);
         
-        $return = array();
-        
-        if(isset($data['features'])) {
+        if(isset($data['features']) && isset($data['features'][0])) {
             $return = json_encode($data['features'][0]['properties']);
+        } else {
+            $return = json_encode(array());
         }
 
         $response = new Response(
@@ -202,4 +202,36 @@ class StatsController extends Controller
 
     }
 
+    /**
+     * @Route("/admin/stats/deviceserver/getroutes", name="deviceserver_get_routes")
+     * 
+     * @return string
+     */
+    public function deviceServerGetRoutesAction()
+    {
+        $webservice = $this->get("webservice");
+        
+        $test = $webservice->makeGetRequest("http://200.50.168.118/base/app_dev.php/api/routes");
+
+        
+        $response = new Response(
+            $test,
+            Response::HTTP_OK,
+            array('content-type' => 'application/json')
+        );
+
+        return $response;
+        
+        print_r("<pre>");
+        var_dump($test);
+
+        
+        //$resource = $request->query->get('resource');
+ 
+        //$url = $this->getParameter('url_ftth');
+        //print_r($url);
+        die;
+ 
+    }
+
 }

src/StatsBundle/Entity/Onu.php

@@ -6,84 +6,83 @@ use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Workflow\Exception\ExceptionInterface;
+
 
 /**
  * @ORM\Table
  * @ORM\Entity
+ * @UniqueEntity(fields={"deviceServer", "oltDeviceId", "ponSerialNumber"}, message="errors.duplicate_key")
+ * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="unique_idx", columns={"device_server_id", "olt_device_id", "pon_serial_number"})})
  * 
  */
 class Onu
 {
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
+     
+     /**
      * @var int
      *
      * @ORM\Column(type="integer", nullable=true)
      * 
      */
-    private $deviceId;
-    
-    /**
+     private $deviceId;
+     
+     /**
      * @var int
      *
      * @ORM\Column(type="integer", nullable=true)
+     * @ORM\Id
      * 
      */
-    private $oltDeviceId;
-
-    /**
+     private $oltDeviceId;
+     
+     /**
      * @ORM\ManyToOne(targetEntity="DeviceServer", inversedBy="devices", fetch="EXTRA_LAZY")
+     * @ORM\Id
      * 
      */
-    protected $deviceServer;
-
-    /**
+     protected $deviceServer;
+     
+     /**
      * @var int
      *
      * @ORM\Column(type="integer", nullable=false, options={"default":1})
      */
-    protected $tenancyId = 1;
-
-    /**
+     protected $tenancyId = 1;
+     
+     /**
      * @var string
      *
      * @ORM\Column(type="string", length=255, nullable=true)
      * 
      * @Assert\Ip
      */
-    private $ip;
-
-    /**
+     private $ip;
+     
+     /**
      * @var string
      *
      * @ORM\Column(type="string", length=12, nullable=true)
      */
-    private $mac;
-
-    /**
+     private $mac;
+     
+     /**
      * @var string
      *
      * @ORM\Column(type="string", length=25, nullable=true)
      */
-    private $serialNumber;
-
-    /**
+     private $serialNumber;
+     
+     /**
      * @var string
      *
      * @ORM\Column(type="string", length=25, nullable=true)
+     * @ORM\Id
      */
-    private $ponSerialNumber;
-
-    /**
+     private $ponSerialNumber;
+     
+     /**
      * @ORM\Column(type="string", length=25, nullable=true)
      */
     private $ponPort;

src/StatsBundle/Resources/views/Stats/onu_map.html.twig

@@ -155,7 +155,7 @@ function initializeMap() {
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,
-		maxZoom: 24,
+		maxZoom: 18,
         styles: 'onuRxPowerLabel'
 	});
     layerGeoTx = L.tileLayer.betterWms('http://200.50.168.118:8081/geoserver/deviceServer_1/wms', {
@@ -163,7 +163,7 @@ function initializeMap() {
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,
-		maxZoom: 24,
+		maxZoom: 18,
         styles: 'onuTxPowerLabel'
 	});
     
@@ -172,7 +172,7 @@ function initializeMap() {
 		transparent:true,
 		format: 'image/png',
         zIndex: 99,
-		maxZoom: 24,
+		maxZoom: 18,
         styles: 'onuStatus'
 	}).addTo(window.map);
     
@@ -191,27 +191,30 @@ function initializeMap() {
 /* --------------------- Show Features wms ------------------------- */
 
 function customPopupFeature(latlng, content) {
+
+    if(content.hasOwnProperty('id')) {
+        id = content.id;
+
+        if(content.status == 1) {status = "On";} else {status = "Off";}
+        if(content.rx == 0) {rx = "-";} else {rx = content.rx;}
+        if(content.tx == 0) {tx = "-";} else {tx = content.tx;}
+        if(content.volt == 0) {volt = "-";} else {volt = content.volt;}
+        if(content.temp == 0) {temp = "-";} else {temp = content.temp;}
+
+        ponSerialNumber = id.replace("onu.", "").toUpperCase();
+        data = "<b>" + ponSerialNumber + "</b><br /> Tx: <span class='"+txStyle(content.tx)+"'>" + tx + 
+               "</span> dBm<br /> Rx: <span class='"+rxStyle(content.rx)+"'>" + rx + 
+               "</span> dBm<br /> Status: " + status  + 
+               "<br /> Voltage: " + volt + 
+               " V<br /> Temperature: " + temp + 
+               " ºC<br /> Muestreo: " + content.muestreo;
+
+        popup = L.popup()
+            .setLatLng(latlng)
+            .setContent(data)
+            .openOn(window.map);
     
-    id = content.id;
-
-    if(content.status == 1) {status = "On";} else {status = "Off";}
-    if(content.rx == 0) {rx = "-";} else {rx = content.rx;}
-    if(content.tx == 0) {tx = "-";} else {tx = content.tx;}
-    if(content.volt == 0) {volt = "-";} else {volt = content.volt;}
-    if(content.temp == 0) {temp = "-";} else {temp = content.temp;}
-
-    ponSerialNumber = id.replace("onu.", "").toUpperCase();
-    data = "<b>" + ponSerialNumber + "</b><br /> Tx: <span class='"+txStyle(content.tx)+"'>" + tx + 
-           "</span> dBm<br /> Rx: <span class='"+rxStyle(content.rx)+"'>" + rx + 
-           "</span> dBm<br /> Status: " + status  + 
-           "<br /> Voltage: " + volt + 
-           " V<br /> Temperature: " + temp + 
-           " ºC<br /> Muestreo: " + content.muestreo;
-    
-    popup = L.popup()
-        .setLatLng(latlng)
-        .setContent(data)
-        .openOn(window.map);
+    }
 
 }
 

src/StatsBundle/Services/DeviceManager.php

@@ -64,6 +64,13 @@ class DeviceManager
         $date = $dateTime->format("Y-m-d H:i:s");
 
         foreach ($deviceServers as $deviceServer) {
+            
+            $baseRoutes = json_decode($this->webservice->makeGetRequest($deviceServer->getUrl()),true);
+            
+            if(!isset($baseRoutes['get_devices'])) return $devices;
+
+            $devicesRoute = $baseRoutes['get_devices'];
+
             $deviceTypes = $deviceServer->getDeviceTypes();
             $deviceServerId = $deviceServer->getId();
 
@@ -83,12 +90,15 @@ class DeviceManager
                 $limit = 2000;
                 $offset = 0;
 
-                $remoteDevices = $this->webservice->get($deviceServer->getUrl(), $filters, array(), $limit, $offset);
+                $remoteDevices = $this->webservice->getData($devicesRoute, $filters, array(), $limit, $offset);
+
                 while(!empty($remoteDevices)) {
 
                     $devices_values = array();
 
                     foreach ($remoteDevices as $remoteDevice) {
+
+
                         $deviceType = str_replace("\\","\\\\",$remoteDevice['deviceType']);
                         $deviceId = $remoteDevice['deviceId'];
                         if(isset($remoteDevice['tenancy'])) {
@@ -111,7 +121,7 @@ class DeviceManager
                     $conn->close();
                     
                     $offset += $limit;
-                    $remoteDevices = $this->webservice->get($deviceServer->getUrl(), $filters, array(), $limit, $offset);
+                    $remoteDevices = $this->webservice->getData($devicesRoute, $filters, array(), $limit, $offset);
                 }
             }
         }