From f706937fa2d562ead6daf41bc1fc6739931cc56e Mon Sep 17 00:00:00 2001
From: Eli de Faria Junior <eli.junior01@gmail.com>
Date: Thu, 9 Oct 2014 15:46:39 -0300
Subject: [PATCH] envio de coleta

---
 cacic-daemon/cacicD/cacicthread.cpp | 34 ++++++++++++++++++++++++++++++++++
 cacic-daemon/cacicD/cacicthread.h   |  9 +++++++++
 cacic-daemon/cacicD/cacictimer.cpp  | 32 +++++++++++++++++++-------------
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/cacic-daemon/cacicD/cacicthread.cpp b/cacic-daemon/cacicD/cacicthread.cpp
index ee44c54..e2d3a1f 100644
--- a/cacic-daemon/cacicD/cacicthread.cpp
+++ b/cacic-daemon/cacicD/cacicthread.cpp
@@ -24,6 +24,11 @@ void CacicThread::iniciarModulo()
     proc.execute(this->moduloDirPath);
     if((proc.atEnd()) && (proc.exitStatus() == QProcess::NormalExit)){
         registraFimColeta("SUCESSO");
+        if(enviarColeta()){
+            QLogger::QLog_Info("Cacic Daemon (Thread)", QString("Coleta enviada com sucesso."));
+        }else{
+            QLogger::QLog_Info("Cacic Daemon (Thread)", QString("Erro ao enviar a coleta."));
+        }
     }else{
         if((!proc.atEnd()) || (proc.exitStatus() == QProcess::CrashExit)){
             registraFimColeta("ERRO");
@@ -34,6 +39,35 @@ void CacicThread::iniciarModulo()
     QLogger::QLog_Info("Cacic Daemon (Thread)", QString("Semáforo aberto com sucesso."));
 }
 
+void CacicThread::setOCacicComm(CacicComm *value)
+{
+    OCacicComm = value;
+}
+
+void CacicThread::setCcacic(CCacic *value)
+{
+    ccacic = value;
+}
+
+
+void CacicThread::setNomeModulo(const QString &value)
+{
+    nomeModulo = value;
+}
+
+bool CacicThread::enviarColeta()
+{
+    if(this->nomeModulo == "gercols" ){
+        //Envio do json gerado na coleta
+        bool ok = false;
+        QJsonObject jsonColeta = this->ccacic->getJsonFromFile(this->applicationDirPath + "/coleta.json");
+        this->OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);
+        return &ok;
+    }
+    return false;
+}
+
+
 void CacicThread::setCMutex(QMutex *value)
 {
     cMutex = value;
diff --git a/cacic-daemon/cacicD/cacicthread.h b/cacic-daemon/cacicD/cacicthread.h
index 9b34ca2..e85e60c 100644
--- a/cacic-daemon/cacicD/cacicthread.h
+++ b/cacic-daemon/cacicD/cacicthread.h
@@ -3,6 +3,8 @@
 #include <QtCore>
 #include <QMutex>
 #include "QLogger.h"
+#include "ccacic.h"
+#include "cacic_comm.h"
 
 class CacicThread : public QThread
 {
@@ -11,6 +13,10 @@ public:
     void run();
     void setModuloDirPath(const QString &value);
     void setCMutex(QMutex *value);
+    void setNomeModulo(const QString &value);
+    bool enviarColeta();
+    void setCcacic(CCacic *value);
+    void setOCacicComm(CacicComm *value);
 
 private:
     QString moduloDirPath;
@@ -21,6 +27,9 @@ private:
     void registraFimColeta(QString msg);
     void iniciarModulo();
     QMutex *cMutex;
+    QString nomeModulo;
+    CCacic *ccacic;
+    CacicComm *OCacicComm;
 };
 
 #endif // CACICTHREAD_H
diff --git a/cacic-daemon/cacicD/cacictimer.cpp b/cacic-daemon/cacicD/cacictimer.cpp
index 4159977..d62ed36 100644
--- a/cacic-daemon/cacicD/cacictimer.cpp
+++ b/cacic-daemon/cacicD/cacictimer.cpp
@@ -57,26 +57,32 @@ void CacicTimer::mslot(){
             //            QStringList nomesModulos = verificarModulos();
             //            if ( !nomesModulos.empty() ) {
             //             foreach( QString nome, nomesModulos ) {
-            definirDirModulo(getApplicationDirPath(), "gercols");
+            QString nome = "gercols";
+            definirDirModulo(getApplicationDirPath(), nome);
+            cacicthread->setCcacic(ccacic);
+            cacicthread->setOCacicComm(OCacicComm);
+            cacicthread->setNomeModulo(nome);
             cacicthread->setCMutex(cMutex);
             cacicthread->setModuloDirPath(getDirProgram());
             cacicthread->start(QThread::NormalPriority);
-            //            if(nome == "gercols"){
-            //             //Envio do json gerado na coleta
-            //                bool ok;
-            //                QJsonObject jsonColeta = ccacic->getJsonFromFile("coleta.json");
-            //                OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);
-            //            }
-            //             }
-      //  }
+//            if(nome == "gercols" ){
+//                //Envio do json gerado na coleta
+//                bool ok = false;
+//                QJsonObject jsonColeta = ccacic->getJsonFromFile(this->applicationDirPath + "/coleta.json");
+//                OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);
+//                if(&ok){
+//                    QLogger::QLog_Info("Cacic Daemon (Timer)", QString("coleta enviada com sucesso."));
+//                }
+//            }
+        }else{
+            QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração.");
+        }
     }else{
-        QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração.");
+        QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest().");
     }
-}else{
-QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest().");
-}
 }
 
+
 void CacicTimer::verificarEIniciarQMutex(){
     if(!cacicthread->isRunning()){
         cMutex->lock();
--
libgit2 0.21.2