Merge branch 'dev-zyj' of hanzhengyi/DataProcessService into master

DataProcessService/ytTBSN101Process/tbcore.cpp

@@ -263,6 +263,7 @@ void TBCore::AlarmReport(QString subtype, quint64 addr, quint64 insertid, QStrin
                         .replace(",","%2C").replace(":","%3A").replace(" ","+");
                 logThread->appendData(data);
                 wxThreads[0][wxcur&0x0f]->appendData(data);
+                wxThreads[2][wxcur&0x0f]->appendData(data);
                 wxcur++;
                 wxcur &= 0x0f;
             }

DataProcessService/ytWarterMkProcess/mkcore.cpp

@@ -22,9 +22,11 @@ MKCore::MKCore(QObject *parent) :
     svr = new QTcpServer(this);
     connect(svr, SIGNAL(newConnection()),this,SLOT(new_incomming()));
     for(quint16 i=0;i<16;i++){
+        wxThreads[3][i] = new WechartThreads(this,i,"47.98.201.73","/jdxf/wxapp2.php/Home/GeneralPush/voice_alarm");
         wxThreads[2][i] = new WechartThreads(this,i,"47.98.201.73","/jdxf/wxapp2.php/Home/ManholeCoverwarn/message_manhole_cover");
         wxThreads[1][i] = new WechartThreads(this,i,"47.98.201.73","/jdxf/wxapp2.php/Home/Waterwarn/message_water");
         wxThreads[0][i] = new WechartThreads(this,i,"47.98.201.73","/jdxf/wxapp2.php/Home/Yeweiwarn/message_water");
+        connect(wxThreads[3][i],SIGNAL(wxchart(quint16,QDateTime,QString,bool)),this,SLOT(wxchart(quint16,QDateTime,QString,bool)));
         connect(wxThreads[2][i],SIGNAL(wxchart(quint16,QDateTime,QString,bool)),this,SLOT(wxchart(quint16,QDateTime,QString,bool)));
         connect(wxThreads[1][i],SIGNAL(wxchart(quint16,QDateTime,QString,bool)),this,SLOT(wxchart(quint16,QDateTime,QString,bool)));
         connect(wxThreads[0][i],SIGNAL(wxchart(quint16,QDateTime,QString,bool)),this,SLOT(wxchart(quint16,QDateTime,QString,bool)));
@@ -32,6 +34,7 @@ MKCore::MKCore(QObject *parent) :
         connect(repThread[i],&ttsThreads::ttslog,this,&MKCore::repLog);
         wssThread[i] = new ttsThreads(this,i,"47.98.201.73","/report",55125);
         connect(wssThread[i],&ttsThreads::ttslog,this,&MKCore::repLog);
+        wxThreads[3][i]->start();
         wxThreads[2][i]->start();
         wxThreads[1][i]->start();
         wxThreads[0][i]->start();
@@ -269,6 +272,7 @@ void MKCore::AlarmReport(QString addr, quint64 insertid, QString type, QString t
                 QString data1 = QString("device_code=%1&insert_id=%2&phone=%3&time=%4&evt_name=%5&evt=%6&bz=%7&user_from=water_form").arg(addr).arg(insertid).arg(phonelist).arg(time).arg(type).arg(eventCode).arg(deviceName)
                         .replace(",","%2C").replace(":","%3A").replace(" ","+");
                 wxThreads[2][wxcur&0x0f]->appendData(data1);//井盖告警微信推送
+                wxThreads[3][wxcur&0x0f]->appendData(data1);//井盖告警语音推送
                 wxcur++;
                 wxcur &= 0x0f;
 

DataProcessService/ytWarterMkProcess/mkcore.h

@@ -72,7 +72,7 @@ private:
     LogThread *logThread;
     DatabaseThread *dbThread;
     quint8 wxcur,repcur;
-    WechartThreads *wxThreads[3][16];
+    WechartThreads *wxThreads[4][16];
     QTimer *timer;
     int DevIdx3;
     QString DeviceID3;