diff --git a/EffectProcess/snaverblog.cpp b/EffectProcess/snaverblog.cpp index 56e1157..4c60127 100644 --- a/EffectProcess/snaverblog.cpp +++ b/EffectProcess/snaverblog.cpp @@ -433,7 +433,6 @@ void SNaverBlog::slotLoadFinished(bool ok) out << str << "\n"; file.close(); - }); break; } @@ -713,3 +712,4 @@ void SNaverBlog::cbReply(const QVariant& _result) */ emit signalDataOk(m_efData); } + diff --git a/EffectProcess/snaverblogprocess.cpp b/EffectProcess/snaverblogprocess.cpp index a432e91..abdc7c8 100644 --- a/EffectProcess/snaverblogprocess.cpp +++ b/EffectProcess/snaverblogprocess.cpp @@ -28,3 +28,4 @@ void SNaverBlogProcess::run(const QString& _url) { m_pSNaverBlog->go(_url); } + diff --git a/EffectProcess/sresultsender.cpp b/EffectProcess/sresultsender.cpp index 7130e7d..e79afe9 100644 --- a/EffectProcess/sresultsender.cpp +++ b/EffectProcess/sresultsender.cpp @@ -65,12 +65,15 @@ bool SResultSender::send(const State_s1_effect& _result) } strQuery = "insert into stats_s1_effect (" - "event_num,view_buzz,replybuzz,replycount,likecount,viewcount,interactioncount,reachcount,engagementcount) " + "event_num,viewbuzz,replybuzz,replycount,likecount,viewcount,interactioncount,reachcount,engagementcount) " "values " - "(:event_num,:view_buzz,:replybuzz,:replycount,:likecount,:viewcount,:interactioncount,:reachcount,:engagementcount)"; + "(:event_num,:viewbuzz,:replybuzz,:replycount,:likecount,:viewcount,:interactioncount,:reachcount,:engagementcount) " + " on duplicate key update viewbuzz = :viewbuzz, replybuzz = :replybuzz, replycount = :replycount," + "likecount = :likecount, viewcount = :viewcount, interactioncount = :interactioncount, reachcount = :reachcount," + "engagementcount = :engagementcount"; query.prepare(strQuery); query.bindValue(":event_num", _result.event_num); - query.bindValue(":view_buzz", _result.view_buzz); + query.bindValue(":viewbuzz", _result.view_buzz); query.bindValue(":replybuzz", _result.replybuzz); query.bindValue(":replycount", _result.replycount); query.bindValue(":likecount", _result.likecount); @@ -81,8 +84,6 @@ bool SResultSender::send(const State_s1_effect& _result) if (!query.exec()) { - qDebug() << "insert error"; - emit signalError(E_ERROR_CODE::DB_QUERY_ERROR, query.lastError().text() + "\n" + query.lastQuery()); return false; } diff --git a/EffectProcess/swebpage.cpp b/EffectProcess/swebpage.cpp index dc1f6d2..7d33532 100644 --- a/EffectProcess/swebpage.cpp +++ b/EffectProcess/swebpage.cpp @@ -11,6 +11,7 @@ void SWebPage::javaScriptAlert(const QUrl &securityOrigin, const QString &msg) qDebug() << "alert"; emit signalAlert(msg); } + /* bool SWebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) { diff --git a/EffectUI/EffectUI.pro.user b/EffectUI/EffectUI.pro.user index 614f588..35dfbb3 100644 --- a/EffectUI/EffectUI.pro.user +++ b/EffectUI/EffectUI.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 4 ProjectExplorer.Project.EditorSettings @@ -40,6 +40,7 @@ true false 0 + true true 0 8 @@ -57,193 +58,6 @@ ProjectExplorer.Project.Target.0 - - Desktop Qt 5.4.0 MinGW 32bit - Desktop Qt 5.4.0 MinGW 32bit - qt.54.win32_mingw491_kit - 1 - 0 - 0 - - C:/source/build-EffectUI-Desktop_Qt_5_4_0_MinGW_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/source/build-EffectUI-Desktop_Qt_5_4_0_MinGW_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - EffectUI - - Qt4ProjectManager.Qt4RunConfiguration:C:/source/EffectUI/EffectUI.pro - - EffectUI.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop Qt 5.4.0 MSVC2013 32bit Desktop Qt 5.4.0 MSVC2013 32bit @@ -260,9 +74,9 @@ QtProjectManager.QMakeBuildStep false - true false + false false @@ -314,9 +128,9 @@ QtProjectManager.QMakeBuildStep false - true false + false false @@ -375,6 +189,204 @@ 1 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + EffectUI + + Qt4ProjectManager.Qt4RunConfiguration:C:/source/EffectUI/EffectUI.pro + true + + EffectUI.pro + false + + C:/source/build-EffectUI-Desktop_Qt_5_4_0_MSVC2013_32bit-Debug + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.4.1 MSVC2013 64bit + Desktop Qt 5.4.1 MSVC2013 64bit + {481b3484-407d-4ae0-ba41-458f5e9d2bf2} + 0 + 0 + 0 + + C:/source/build-EffectUI-Desktop_Qt_5_4_1_MSVC2013_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/source/build-EffectUI-Desktop_Qt_5_4_1_MSVC2013_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 0 + + true false false @@ -430,197 +442,11 @@ ProjectExplorer.Project.Target.2 - - Desktop Qt 5.4.1 MSVC2013 64bit - Desktop Qt 5.4.1 MSVC2013 64bit - {481b3484-407d-4ae0-ba41-458f5e9d2bf2} - 0 - 0 - 0 - - C:/source/build-EffectUI-Desktop_Qt_5_4_1_MSVC2013_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/source/build-EffectUI-Desktop_Qt_5_4_1_MSVC2013_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - -1 - - - - false - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.3 Desktop Qt 5.4.0 MSVC2013 64bit Desktop Qt 5.4.0 MSVC2013 64bit {4a73e1a8-867f-4a8f-a70a-a3bb186185e4} - 1 + 0 0 0 @@ -632,9 +458,9 @@ QtProjectManager.QMakeBuildStep false - true false + false false @@ -686,9 +512,9 @@ QtProjectManager.QMakeBuildStep false - true false + false false @@ -747,6 +573,11 @@ 1 + false + false + 0 + + true false false @@ -786,11 +617,13 @@ EffectUI Qt4ProjectManager.Qt4RunConfiguration:C:/source/EffectUI/EffectUI.pro + true EffectUI.pro false false + C:/source/build-EffectUI-Desktop_Qt_5_4_0_MSVC2013_64bit-Debug 3768 false true @@ -802,7 +635,7 @@ - ProjectExplorer.Project.Target.4 + ProjectExplorer.Project.Target.3 Desktop Qt 5.4.1 MSVC2013 32bit Desktop Qt 5.4.1 MSVC2013 32bit @@ -819,9 +652,9 @@ QtProjectManager.QMakeBuildStep false - true false + false false @@ -873,9 +706,9 @@ QtProjectManager.QMakeBuildStep false - true false + false false @@ -934,6 +767,11 @@ 1 + false + false + 0 + + true false false @@ -987,6 +825,253 @@ 1 + + ProjectExplorer.Project.Target.4 + + Desktop Qt 5.5.1 MSVC2013 64bit3 + Desktop Qt 5.5.1 MSVC2013 64bit3 + qt.55.win64_msvc2013_64_kit + 1 + 0 + 0 + + C:/source/build-EffectUI-Desktop_Qt_5_5_1_MSVC2013_64bit3-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/source/build-EffectUI-Desktop_Qt_5_5_1_MSVC2013_64bit3-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/source/build-EffectUI-Desktop_Qt_5_5_1_MSVC2013_64bit3-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + EffectUI + + Qt4ProjectManager.Qt4RunConfiguration:C:/source/EffectUI/EffectUI.pro + true + + EffectUI.pro + false + + C:/source/build-EffectUI-Desktop_Qt_5_5_1_MSVC2013_64bit3-Release + 3768 + false + true + false + false + true + + 1 + + ProjectExplorer.Project.TargetCount 5 diff --git a/EffectUI/scompanyprocess.cpp b/EffectUI/scompanyprocess.cpp index 1cdf211..a30fd52 100644 --- a/EffectUI/scompanyprocess.cpp +++ b/EffectUI/scompanyprocess.cpp @@ -49,6 +49,13 @@ void SCompanyProcess::runInit() { setInnerMode(E_INNER_RUN_MODE::MODE_WAIT_INIT); + if (m_vecRunList.empty()) + { + setError(SError(E_ERROR_CODE::UNKNOWN_ERROR, "Empty Running List")); + emit signalTerminateError(getError()); + return; + } + QSqlDatabase db = QSqlDatabase::database(strDatabaseName); if (!db.open()) { @@ -57,14 +64,13 @@ void SCompanyProcess::runInit() return; } - QString strQuery("select num, enddate from company where num in ("); + QString strQuery("select num, company_num from eventgroup where adddate(curdate(), interval -1 month) <= enddate and company_num in ("); foreach (auto num, m_vecRunList) { strQuery += (QString::number(num) + ","); } strQuery = strQuery.left(strQuery.length() - 1); strQuery += ")"; - signalLog(strQuery); QSqlQuery query(db); if (!query.exec(strQuery)) @@ -73,19 +79,32 @@ void SCompanyProcess::runInit() emit signalTerminateError(getError()); return; } + QSet setGroup; + while (query.next()) { + setGroup.insert(query.value(0).toInt()); + if (!m_vecRunOrderList.contains(query.value(1).toInt())) + m_vecRunOrderList.append(query.value(1).toInt()); + } + qDebug() << m_vecRunOrderList; + /* + while (query.next()) + { + QDate enddate = QDate::fromString(query.value(1).toString(), "yyyy-MM-dd"); QDate today = QDate::currentDate(); if (today <= enddate.addMonths(1)) + { m_vecRunOrderList.push_back(query.value(0).toInt()); } } + */ - strQuery = "select company.num, name, startdate, enddate, t.event_num, " - "t.date, t.url, t.eventcode, t.platformname_num from company " - "join (select company_num, event_num, event.date, event.url, event.eventcode, " + strQuery = "select company.num, name, startdate, enddate, t.eventgroupnum, " + "t.date, t.url, t.num, t.platformname_num from company " + "join (select company_num, company_event_map.eventgroup_num as eventgroupnum, event.date, event.url, event.num, " "event.platformname_num from company_event_map join event on company_event_map.event_num = event.num) " "as t on company.num = t.company_num where company.num in ("; @@ -102,34 +121,63 @@ void SCompanyProcess::runInit() emit signalTerminateError(getError()); return; } -/* + /* foreach (auto &num, m_vecRunOrderList) { m_vecRunOrderList.insert(num, QVector()); } -*/ + */ + QMap mapSummary; + qDebug() << setGroup; while (query.next()) { + int nCompany = query.value(0).toInt(); + qDebug() << query.value(4).toInt(); + if (!m_mapEffectRow.contains(nCompany)) + m_mapEffectRow.insert(nCompany, QVector()); - if (!m_mapEffectRow.contains(query.value(0).toInt())) - m_mapEffectRow.insert(query.value(0).toInt(), QVector()); + if (!mapSummary.contains(nCompany)) + mapSummary.insert(nCompany, SReportSummary()); - SEffectRow row(query.value(0).toInt(), - query.value(1).toString().trimmed(), - QDate::fromString(query.value(2).toString().trimmed(), "yyyy-MM-dd"), - QDate::fromString(query.value(3).toString().trimmed(), "yyyy-MM-dd"), - query.value(4).toInt(), - QDate::fromString(query.value(5).toString().trimmed(), "yyyy-MM-dd"), - query.value(6).toString().trimmed(), - query.value(7).toString().trimmed(), - query.value(8).toInt() - ); + mapSummary[nCompany].nTotal++; - m_mapEffectRow[query.value(0).toInt()].append(row); + if (setGroup.contains(query.value(4).toInt())) + { + mapSummary[nCompany].nAllGroupEvent++; + if (!query.value(6).toString().trimmed().isEmpty()) + { + mapSummary[nCompany].nActiveEventCode++; + SEffectRow row(query.value(0).toInt(), + query.value(1).toString().trimmed(), + QDate::fromString(query.value(2).toString().trimmed(), "yyyy-MM-dd"), + QDate::fromString(query.value(3).toString().trimmed(), "yyyy-MM-dd"), + query.value(4).toInt(), + QDate::fromString(query.value(5).toString().trimmed(), "yyyy-MM-dd"), + query.value(6).toString().trimmed(), + query.value(7).toString().trimmed(), + query.value(8).toInt() + ); + + m_mapEffectRow[nCompany].append(row); + } + } + } + setReportSummary(mapSummary); + int totalEffectNum = 0; + for (auto iterPos = m_mapEffectRow.begin(); iterPos != m_mapEffectRow.end(); ++iterPos) + { + totalEffectNum += iterPos.value().size(); } - initIterator(); + if (totalEffectNum == 0) + { + setError(SError(E_ERROR_CODE::UNKNOWN_ERROR, "There is no valid Urls")); + emit signalTerminateError(getError()); + return; + } + + initIterator(); setInnerMode(E_INNER_RUN_MODE::MODE_RUN_EVENTCODE); db.close(); } diff --git a/EffectUI/sparentprocess.cpp b/EffectUI/sparentprocess.cpp index a3f19f7..f10b761 100644 --- a/EffectUI/sparentprocess.cpp +++ b/EffectUI/sparentprocess.cpp @@ -471,6 +471,10 @@ bool SParentProcess::isUserAbort() return m_bUserAbort; } +void SParentProcess::setReportSummary(const QMap& _mapSummary) +{ + m_mapReportSummary = _mapSummary; +} void SParentProcess::setCurrentEffectRow(const SEffectRow& _row) { diff --git a/EffectUI/sparentprocess.h b/EffectUI/sparentprocess.h index bf42534..a4b2c79 100644 --- a/EffectUI/sparentprocess.h +++ b/EffectUI/sparentprocess.h @@ -61,7 +61,7 @@ protected: void setCurrentEffectRow(const SEffectRow& _row); void setCurrentEffectRow(SEffectRow&& _row); void runProcess(QStringList _arguments); - + void setReportSummary(const QMap& _mapSummary); public slots: void stop();