diff --git a/EffectProcess/EffectProcess.pro.user b/EffectProcess/EffectProcess.pro.user index 61a9403..df685a6 100644 --- a/EffectProcess/EffectProcess.pro.user +++ b/EffectProcess/EffectProcess.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/EffectUI/EffectUI.pro.user b/EffectUI/EffectUI.pro.user index aff3e15..69e4055 100644 --- a/EffectUI/EffectUI.pro.user +++ b/EffectUI/EffectUI.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/FilterProcess/sconsumer.cpp b/FilterProcess/sconsumer.cpp index 84bd618..31f5fcc 100644 --- a/FilterProcess/sconsumer.cpp +++ b/FilterProcess/sconsumer.cpp @@ -152,7 +152,7 @@ bool SConsumer::makeOverallCategory(int _nCategory) bool SConsumer::makeTable(SDatagroup &_datagroup) { - if (m_mapCategory.size() > 1) + if (m_mapCategory.size() > 0) { m_pSInitializer->insertLog("Make Consumer Tables"); m_SBodyConsumerMap.makeTable(_datagroup, m_mapCategory); diff --git a/FilterProcess/sfilterprocess.cpp b/FilterProcess/sfilterprocess.cpp index 59afc4b..4f64bb7 100644 --- a/FilterProcess/sfilterprocess.cpp +++ b/FilterProcess/sfilterprocess.cpp @@ -118,3 +118,4 @@ int SFilterProcess::getCompanyNum() { return m_nCompany; } + diff --git a/FilterProcess/spowercafe.cpp b/FilterProcess/spowercafe.cpp index ffa393b..6549602 100644 --- a/FilterProcess/spowercafe.cpp +++ b/FilterProcess/spowercafe.cpp @@ -12,6 +12,14 @@ #include #include "spowercafe.h" +QString getCommunityKey(const QStringList& _slRow, const int* anColumn) +{ + return _slRow[anColumn[SInitializer::E_DATA_platform_id]].trimmed() + + _slRow[anColumn[SInitializer::E_DATA_platform_name]].trimmed() + + _slRow[anColumn[SInitializer::E_DATA_platform_form]].trimmed(); +} + + void SPowercafe::setInitiaizer(SInitializer &_initializer) { m_pSInitializer = &_initializer; @@ -220,7 +228,8 @@ void SPowercafe::STPowercafe::makeTable(SDatagroup &_datagroup, const QMap::const_iterator iterPos1 = streal.m_mapRealReplyUniqueUrl.begin(); iterPos1 != streal.m_mapRealReplyUniqueUrl.constEnd(); iterPos1++) { - QString strKey = (*mapReply)[iterPos1.key()][iterPos1.value()][anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + //QString strKey = (*mapReply)[iterPos1.key()][iterPos1.value()][anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + QString strKey = getCommunityKey((*mapReply)[iterPos1.key()][iterPos1.value()], anColumn); if (!mapPowercafeReal.contains(strKey)) { mapPowercafeReal.insert(strKey, stPowercafe()); @@ -426,7 +438,8 @@ void SPowercafe::SStatsPowCafeRank::makeTable(SDatagroup &_datagroup, const QMap if (iterPos.value()[anColumn[SInitializer::E_DATA_platform_form]].trimmed() != "cafe") continue; */ - QString strKey = iterPos.value()[anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + //QString strKey = iterPos.value()[anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + QString strKey = getCommunityKey(iterPos.value(), anColumn); if (!mapPowercafeAll.contains(strKey)) { mapPowercafeAll.insert(strKey, stStatsPowCafeRank()); @@ -445,7 +458,8 @@ void SPowercafe::SStatsPowCafeRank::makeTable(SDatagroup &_datagroup, const QMap if (iterPos1.value()[anColumn[SInitializer::E_DATA_platform_form]].trimmed() != "cafe") continue; */ - QString strKey = iterPos1.value()[anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + //QString strKey = iterPos1.value()[anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + QString strKey = getCommunityKey(iterPos1.value(), anColumn); if (!mapPowercafeAll.contains(strKey)) { mapPowercafeAll.insert(strKey, stStatsPowCafeRank()); @@ -479,7 +493,8 @@ void SPowercafe::SStatsPowCafeRank::makeTable(SDatagroup &_datagroup, const QMap foreach (const QString& url, streal.m_setRealBodyUrl) { - QString strKey = (*mapBody)[url][anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + //QString strKey = (*mapBody)[url][anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + QString strKey = getCommunityKey((*mapBody)[url], anColumn); if (!mapPowercafeReal.contains(strKey)) { mapPowercafeReal.insert(strKey, stStatsPowCafeRank()); @@ -492,7 +507,8 @@ void SPowercafe::SStatsPowCafeRank::makeTable(SDatagroup &_datagroup, const QMap for (QMap::const_iterator iterPos1 = streal.m_mapRealReplyUniqueUrl.begin(); iterPos1 != streal.m_mapRealReplyUniqueUrl.constEnd(); iterPos1++) { - QString strKey = (*mapReply)[iterPos1.key()][iterPos1.value()][anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + //QString strKey = (*mapReply)[iterPos1.key()][iterPos1.value()][anColumn[SInitializer::E_DATA_platform_id]].trimmed(); + QString strKey = getCommunityKey((*mapReply)[iterPos1.key()][iterPos1.value()], anColumn); if (!mapPowercafeReal.contains(strKey)) { mapPowercafeReal.insert(strKey, stStatsPowCafeRank()); @@ -927,6 +943,7 @@ void SPowercafe::SStatsJson::makeTable(SDatagroup &_datagroup, const QMap &_listFilter); virtual bool makeOverallCategory(int _categoryNum); virtual bool makeTable(SDatagroup &_datagroup); + }; #endif // SPOWERCAFE diff --git a/FilterProcess/sspammer.cpp b/FilterProcess/sspammer.cpp index f4de8cd..1186c05 100644 --- a/FilterProcess/sspammer.cpp +++ b/FilterProcess/sspammer.cpp @@ -177,7 +177,7 @@ bool SSpammer::makeOverallCategory(int _categoryNum) bool SSpammer::makeTable(SDatagroup &_datagroup) { - if (m_mapCategory.size() > 1) + if (m_mapCategory.size() > 0) { m_pSInitializer->insertLog("Make spammer tables"); m_pSInitializer->insertLog("Make spammer spammer");