From 4a178b15885ae60dfed3f6a4687abc04603a12db Mon Sep 17 00:00:00 2001
From: Starlone Passos <starlone.passos@gmail.com>
Date: Wed, 27 Jun 2018 23:43:22 -0300
Subject: [PATCH] Indicador 27 - Filtro por data, obtendo a ultima data enviada de acessos dos usuarios

---
 rn/MdEstatisticasColetarRN.php | 11 +++++++----
 rn/MdEstatisticasEnviarRN.php  | 44 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/rn/MdEstatisticasColetarRN.php b/rn/MdEstatisticasColetarRN.php
index d131cc2..94bbd06 100644
--- a/rn/MdEstatisticasColetarRN.php
+++ b/rn/MdEstatisticasColetarRN.php
@@ -445,15 +445,18 @@ class MdEstatisticasColetarRN extends InfraRN {
     return $lista;
   }
 
-  private function obterAcessosUsuarios(){
+  public function obterAcessosUsuarios($ultimadata=null){
+    if ($ultimadata == null) {
+      $ultimadata = '1900-01-01';
+    }
     $sgbd = $this->obterTipoSGBD();
     $query = '';
     if ($sgbd == 'MySql') {
-      $query = "select count(*) as quantidade, date(dth_acesso) as data from infra_navegador group by date(dth_acesso)";
+      $query = "select count(*) as quantidade, date(dth_acesso) as data from infra_navegador where dth_acesso >= '" . $ultimadata . "' group by date(dth_acesso)";
     } elseif ($sgbd == 'SqlServer') {
-      $query = "select count(*) as quantidade, CONVERT(date, dth_acesso) as data from infra_navegador group by CONVERT(date, dth_acesso)";
+      $query = "select count(*) as quantidade, CONVERT(date, dth_acesso) as data from infra_navegador where dth_acesso >= '" . $ultimadata . "' group by CONVERT(date, dth_acesso)";
     } elseif ($sgbd == 'Oracle') {
-      $query = "select count(*) as quantidade, to_char(dth_acesso,'YYYY-MM-DD') AS data from infra_navegador group by to_char(dth_acesso,'YYYY-MM-DD')";
+      $query = "select count(*) as quantidade, to_char(dth_acesso,'YYYY-MM-DD') AS data from infra_navegador where dth_acesso >= date '" . $ultimadata . "' group by to_char(dth_acesso,'YYYY-MM-DD')";
     }
 
     $rs = array();
diff --git a/rn/MdEstatisticasEnviarRN.php b/rn/MdEstatisticasEnviarRN.php
index 016ad2f..95b654c 100644
--- a/rn/MdEstatisticasEnviarRN.php
+++ b/rn/MdEstatisticasEnviarRN.php
@@ -21,19 +21,16 @@ class MdEstatisticasEnviarRN extends InfraRN {
 
       $objConfiguracaoSEI = ConfiguracaoSEI::getInstance();
       $url = $objConfiguracaoSEI->getValor('MdEstatisticas','url', false, 'http://estatisticas.planejamento.gov.br');
+      $orgaoSigla = $objConfiguracaoSEI->getValor('MdEstatisticas','sigla', false, '');
 
-      InfraDebug::getInstance()->gravar('URL: ' . $url, InfraLog::$INFORMACAO);
+      $output = $this->doPost($url, $json);
+      $id = $output['id'];
+      InfraDebug::getInstance()->gravar('Output: ' . json_encode($output), InfraLog::$INFORMACAO);
+      InfraDebug::getInstance()->gravar('iD: ' . $id, InfraLog::$INFORMACAO);
 
-      $ch = curl_init();
-      curl_setopt($ch, CURLOPT_URL, $url);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-      curl_setopt($ch, CURLOPT_POST, true);
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
-      curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
-      $output = curl_exec($ch);
-
-      InfraDebug::getInstance()->gravar('Output: ' . $output, InfraLog::$INFORMACAO);
-      curl_close($ch);
+      $data = $this->doGet($url . '/ultimoacesso?sigla=' . $orgaoSigla);
+      $data = date($data);
+      InfraDebug::getInstance()->gravar('Data: ' . $data, InfraLog::$INFORMACAO);
 
       return true;
 
@@ -45,5 +42,30 @@ class MdEstatisticasEnviarRN extends InfraRN {
     }
   }
 
+  private function doPost($url, $json) {
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
+    $output = curl_exec($ch);
+    curl_close($ch);
+    return json_decode($output, true);
+  }
+
+  private function doGet($url, $isjson=false) {
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_URL, $url);
+    $output = curl_exec($ch);
+    curl_close($ch);
+
+    if ($isjson) {
+      return json_decode($output, true);
+    }
+    return $output;
+  }
+
 }
 ?>
--
libgit2 0.21.2