Download as
Browse Code »

Commit f706937fa2d562ead6daf41bc1fc6739931cc56e

Authored by Eli de Faria Junior
1 parent 62af48a5
Exists in master

envio de coleta

Showing 3 changed files with 62 additions and 13 deletions   Show diff stats
cacic-daemon/cacicD/cacicthread.cpp
  Diff comments   View file @f706937
@@ -24,6 +24,11 @@ void CacicThread::iniciarModulo() @@ -24,6 +24,11 @@ void CacicThread::iniciarModulo()
24 proc.execute(this->moduloDirPath); 24 proc.execute(this->moduloDirPath);
25 if((proc.atEnd()) && (proc.exitStatus() == QProcess::NormalExit)){ 25 if((proc.atEnd()) && (proc.exitStatus() == QProcess::NormalExit)){
26 registraFimColeta("SUCESSO"); 26 registraFimColeta("SUCESSO");
  27 + if(enviarColeta()){
  28 + QLogger::QLog_Info("Cacic Daemon (Thread)", QString("Coleta enviada com sucesso."));
  29 + }else{
  30 + QLogger::QLog_Info("Cacic Daemon (Thread)", QString("Erro ao enviar a coleta."));
  31 + }
27 }else{ 32 }else{
28 if((!proc.atEnd()) || (proc.exitStatus() == QProcess::CrashExit)){ 33 if((!proc.atEnd()) || (proc.exitStatus() == QProcess::CrashExit)){
29 registraFimColeta("ERRO"); 34 registraFimColeta("ERRO");
@@ -34,6 +39,35 @@ void CacicThread::iniciarModulo() @@ -34,6 +39,35 @@ void CacicThread::iniciarModulo()
34 QLogger::QLog_Info("Cacic Daemon (Thread)", QString("Semáforo aberto com sucesso.")); 39 QLogger::QLog_Info("Cacic Daemon (Thread)", QString("Semáforo aberto com sucesso."));
35 } 40 }
36 41
  42 +void CacicThread::setOCacicComm(CacicComm *value)
  43 +{
  44 + OCacicComm = value;
  45 +}
  46 +
  47 +void CacicThread::setCcacic(CCacic *value)
  48 +{
  49 + ccacic = value;
  50 +}
  51 +
  52 +
  53 +void CacicThread::setNomeModulo(const QString &value)
  54 +{
  55 + nomeModulo = value;
  56 +}
  57 +
  58 +bool CacicThread::enviarColeta()
  59 +{
  60 + if(this->nomeModulo == "gercols" ){
  61 + //Envio do json gerado na coleta
  62 + bool ok = false;
  63 + QJsonObject jsonColeta = this->ccacic->getJsonFromFile(this->applicationDirPath + "/coleta.json");
  64 + this->OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);
  65 + return &ok;
  66 + }
  67 + return false;
  68 +}
  69 +
  70 +
37 void CacicThread::setCMutex(QMutex *value) 71 void CacicThread::setCMutex(QMutex *value)
38 { 72 {
39 cMutex = value; 73 cMutex = value;
cacic-daemon/cacicD/cacicthread.h
  Diff comments   View file @f706937
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
3 #include <QtCore> 3 #include <QtCore>
4 #include <QMutex> 4 #include <QMutex>
5 #include "QLogger.h" 5 #include "QLogger.h"
  6 +#include "ccacic.h"
  7 +#include "cacic_comm.h"
6 8
7 class CacicThread : public QThread 9 class CacicThread : public QThread
8 { 10 {
@@ -11,6 +13,10 @@ public: @@ -11,6 +13,10 @@ public:
11 void run(); 13 void run();
12 void setModuloDirPath(const QString &value); 14 void setModuloDirPath(const QString &value);
13 void setCMutex(QMutex *value); 15 void setCMutex(QMutex *value);
  16 + void setNomeModulo(const QString &value);
  17 + bool enviarColeta();
  18 + void setCcacic(CCacic *value);
  19 + void setOCacicComm(CacicComm *value);
14 20
15 private: 21 private:
16 QString moduloDirPath; 22 QString moduloDirPath;
@@ -21,6 +27,9 @@ private: @@ -21,6 +27,9 @@ private:
21 void registraFimColeta(QString msg); 27 void registraFimColeta(QString msg);
22 void iniciarModulo(); 28 void iniciarModulo();
23 QMutex *cMutex; 29 QMutex *cMutex;
  30 + QString nomeModulo;
  31 + CCacic *ccacic;
  32 + CacicComm *OCacicComm;
24 }; 33 };
25 34
26 #endif // CACICTHREAD_H 35 #endif // CACICTHREAD_H
cacic-daemon/cacicD/cacictimer.cpp
  Diff comments   View file @f706937
@@ -57,26 +57,32 @@ void CacicTimer::mslot(){ @@ -57,26 +57,32 @@ void CacicTimer::mslot(){
57 // QStringList nomesModulos = verificarModulos(); 57 // QStringList nomesModulos = verificarModulos();
58 // if ( !nomesModulos.empty() ) { 58 // if ( !nomesModulos.empty() ) {
59 // foreach( QString nome, nomesModulos ) { 59 // foreach( QString nome, nomesModulos ) {
60 - definirDirModulo(getApplicationDirPath(), "gercols"); 60 + QString nome = "gercols";
  61 + definirDirModulo(getApplicationDirPath(), nome);
  62 + cacicthread->setCcacic(ccacic);
  63 + cacicthread->setOCacicComm(OCacicComm);
  64 + cacicthread->setNomeModulo(nome);
61 cacicthread->setCMutex(cMutex); 65 cacicthread->setCMutex(cMutex);
62 cacicthread->setModuloDirPath(getDirProgram()); 66 cacicthread->setModuloDirPath(getDirProgram());
63 cacicthread->start(QThread::NormalPriority); 67 cacicthread->start(QThread::NormalPriority);
64 - // if(nome == "gercols"){  
65 - // //Envio do json gerado na coleta  
66 - // bool ok;  
67 - // QJsonObject jsonColeta = ccacic->getJsonFromFile("coleta.json");  
68 - // OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);  
69 - // }  
70 - // }  
71 - // } 68 +// if(nome == "gercols" ){
  69 +// //Envio do json gerado na coleta
  70 +// bool ok = false;
  71 +// QJsonObject jsonColeta = ccacic->getJsonFromFile(this->applicationDirPath + "/coleta.json");
  72 +// OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta , false);
  73 +// if(&ok){
  74 +// QLogger::QLog_Info("Cacic Daemon (Timer)", QString("coleta enviada com sucesso."));
  75 +// }
  76 +// }
  77 + }else{
  78 + QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração.");
  79 + }
72 }else{ 80 }else{
73 - QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na obtenção do arquivo de configuração."); 81 + QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest().");
74 } 82 }
75 -}else{  
76 -QLogger::QLog_Error("Cacic Daemon (Timer)", "Falha na execução do getTest().");  
77 -}  
78 } 83 }
79 84
  85 +
80 void CacicTimer::verificarEIniciarQMutex(){ 86 void CacicTimer::verificarEIniciarQMutex(){
81 if(!cacicthread->isRunning()){ 87 if(!cacicthread->isRunning()){
82 cMutex->lock(); 88 cMutex->lock();