etc/clients
1
0
Fork 0
Code Issues Pull Requests Releases Activity

filterprocess consumer / spammer 그래프 수정

Browse Source 
카카오스토리 modified date가 위로 올라오는 문제로 인해 
과거 댓글이 그래프구간에 영향을 끼치는 문제 수정


git-svn-id: svn://192.168.0.12/source@325 8346c931-da38-4b9b-9d4c-e48b93cbd075
This commit is contained in:
admin
2016-11-30 09:09:35 +00:00
parent e2f9700d20
commit 9306969bea
9 changed files with 87 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Filter/widget.cpp
View File

@@ -246,10 +246,12 @@ void Widget::Refresh()
m_plw[i].clear();
{
QSqlQuery query("select id,name from filtergroup");
QSqlQuery query("select id,name,locked from filtergroup");
while (query.next())
{
QListWidgetItem *pItem = new QListWidgetItem(query.value(1).toString(),&m_plw[E_LIST_FILTER]);
QListWidgetItem *pItem = new QListWidgetItem(query.value(1).toString() +
((query.value(2).toInt() == 0)? "" : " (Locked)")
,&m_plw[E_LIST_FILTER]);
pItem->setData(Qt::UserRole, QVariant(query.value(0)));
}
}

14
FilterProcess/sconsumer.cpp
View File

@@ -407,9 +407,10 @@ void SConsumer::SStatsJson::makeTable(SDatagroup &_datagroup, const QMap<int, st
QDate date = QDateTime::fromString(slReply[anColumn[SInitializer::E_DATA_article_date]].trimmed().replace("T", " "), "yyyy-MM-dd HH:mm:ss").date();
if (date.year() == 1990)
continue;
dateStart = (date < dateStart ) ? date : dateStart;
//dateStart = (date < dateStart ) ? date : dateStart;
dateEnd = (date > dateEnd ) ? date : dateEnd;
dateStartReply = (date < dateStartReply ) ? date : dateStartReply;
dateStartReply = (date < dateStartReply ) ? (date < dateStart ? dateStart : date) : dateStartReply;
//dateStartReply = (date < dateStartReply ) ? date : dateStartReply;
dateEndReply = (date > dateEndReply ) ? date : dateEndReply;
if (stbuzzy.m_mapReplyBuzz.contains(date))
@@ -430,6 +431,8 @@ void SConsumer::SStatsJson::makeTable(SDatagroup &_datagroup, const QMap<int, st
QDate date = QDateTime::fromString((*mapBody)[strUrl.trimmed()][anColumn[SInitializer::E_DATA_article_date]].trimmed().replace("T", " "), "yyyy-MM-dd HH:mm:ss").date();
if (date.year() == 1990)
continue;
if (date.day() == 5)
qDebug() << "body: " << strUrl;
if (stbuzzy.m_mapBodyBuzz.contains(date))
stbuzzy.m_mapBodyBuzz[date]++;
@@ -443,6 +446,9 @@ void SConsumer::SStatsJson::makeTable(SDatagroup &_datagroup, const QMap<int, st
QDate date = QDateTime::fromString(slReply[anColumn[SInitializer::E_DATA_article_date]].trimmed().replace("T", " "), "yyyy-MM-dd HH:mm:ss").date();
if (date.year() == 1990)
continue;
if (date.day() == 5)
qDebug() << "Reply: " << slReply[anColumn[SInitializer::E_DATA_article_url]];
if (stbuzzy.m_mapReplyBuzz.contains(date))
stbuzzy.m_mapReplyBuzz[date]++;
@@ -502,6 +508,10 @@ void SConsumer::SStatsJson::makeTable(SDatagroup &_datagroup, const QMap<int, st
QJsonArray jsArrayReply;
QJsonArray jsArrayBody;
qDebug() << "consumer";
qDebug() << dateStart;
qDebug() << dateEnd;
foreach (const stBuzzy &stbuzzy, listBuzzy)
{
QJsonArray jsValueAll;

1
FilterProcess/sfilterprocess.cpp
View File

@@ -109,6 +109,7 @@ bool SFilterProcess::run()
process.m_nCompanyNum);
m_SInitializer.insertLog("Upload Done");
m_nCompany = process.m_nCompanyNum;
}
else
{

4
FilterProcess/sspammer.cpp
View File

@@ -900,9 +900,9 @@ void SSpammer::SStatsJson::makeTableBuzz(SDatagroup &_datagroup, const QMap<int,
QDate date = QDateTime::fromString(slReply[anColumn[SInitializer::E_DATA_article_date]].trimmed().replace("T", " "), "yyyy-MM-dd HH:mm:ss").date();
if (date.year() == 1990)
continue;
dateStart = (date < dateStart ) ? date : dateStart;
//dateStart = (date < dateStart ) ? date : dateStart;
dateEnd = (date > dateEnd ) ? date : dateEnd;
dateStartReply = (date < dateStartReply ) ? date : dateStartReply;
dateStartReply = (date < dateStartReply ) ? (date < dateStart ? dateStart : date) : dateStartReply;
dateEndReply = (date > dateEndReply ) ? date : dateEndReply;
if (stbuzzy.m_mapReplyBuzz.contains(date))

41
MorphereAnalyzer/sfilterdlg.cpp
View File

@@ -39,6 +39,8 @@ void SFilterDlg::setWidgets()
connect(pbModify, SIGNAL(released()),this, SLOT(Group_Modify()));
QPushButton *pbCopy_Paste = new QPushButton("Copy&Paste");
connect(pbCopy_Paste, SIGNAL(released()),this, SLOT(Group_CopyPaste()));
QPushButton *pbLock = new QPushButton("Lock");
connect(pbLock, SIGNAL(released()), this, SLOT(Group_Lock()));
QPushButton *pbRefresh = new QPushButton("Refresh");
connect(pbRefresh, SIGNAL(released()),this, SLOT(Group_Refresh()));
QPushButton *pbRun = new QPushButton("Run");
@@ -48,6 +50,7 @@ void SFilterDlg::setWidgets()
hlayout->addWidget(pbDelete);
hlayout->addWidget(pbModify);
hlayout->addWidget(pbCopy_Paste);
hlayout->addWidget(pbLock);
hlayout->addWidget(pbRefresh);
hlayout->addWidget(pbRun);
vlayout->addLayout(hlayout);
@@ -84,8 +87,32 @@ void SFilterDlg::Group_Insert()
Group_Refresh();
}
void SFilterDlg::Group_Lock()
{
int nSelect = GetMainWindow()->m_pFilterDlg->GetSelectGroupID();
if (nSelect == D_NOT_SELECT)
return;
QString strQuery = "update filtergroup set locked = ";
if (GetMainWindow()->m_pFilterObjectDlg->isLock())
strQuery += QString::number(0) + " where id = " + QString::number(nSelect);
else
strQuery += QString::number(1) + " where id = " + QString::number(nSelect);
QSqlQuery query;
if(!query.exec(strQuery))
qDebug() << query.lastError().text();
Group_Refresh();
}
void SFilterDlg::Group_Delete()
{
if (GetMainWindow()->m_pFilterObjectDlg->isLock()) return;
QSqlQuery query;
foreach (QListWidgetItem *item,m_plwFilterGroup->selectedItems())
{
@@ -100,6 +127,8 @@ void SFilterDlg::Group_Delete()
void SFilterDlg::Group_Modify()
{
if (GetMainWindow()->m_pFilterObjectDlg->isLock()) return;
QSqlQuery query;
foreach (QListWidgetItem *item,m_plwFilterGroup->selectedItems())
{
@@ -132,10 +161,15 @@ void SFilterDlg::Group_CopyPaste()
void SFilterDlg::Group_Refresh()
{
m_plwFilterGroup->clear();
QSqlQuery query("select id,name from filtergroup");
QSqlQuery query("select id,name,locked from filtergroup");
if (!query.exec())
qDebug() << query.lastError().text();
while (query.next())
{
QListWidgetItem *pItem = new QListWidgetItem(query.value(1).toString(),m_plwFilterGroup);
qDebug() << query.value(1).toString();
QListWidgetItem *pItem = new QListWidgetItem(query.value(1).toString() +
((query.value(2).toInt() == 0) ? "" : " (Locked)"),
m_plwFilterGroup);
pItem->setData(Qt::UserRole, QVariant(query.value(0)));
}
}
@@ -177,6 +211,7 @@ void SFilterDlg::Up()
{
int nSelect = m_plwFilter->currentRow();
if (nSelect <= 0) return;
if (GetMainWindow()->m_pFilterObjectDlg->isLock()) return;
QString strID1 = m_plwFilter->item(nSelect)->data(Qt::UserRole).toString();
QString strID2 = m_plwFilter->item(nSelect-1)->data(Qt::UserRole).toString();
QString strQuery = "UPDATE filter t1 INNER JOIN filter t2 ON (t1.id, t2.id) IN ((" + strID1 + ","+ strID2 +"),("+ strID2 + "," + strID1 + ")) SET t1.type = t2.type,t1.filtergroup_id = t2.filtergroup_id,t1.data = t2.data";
@@ -191,6 +226,7 @@ void SFilterDlg::Down()
{
int nSelect = m_plwFilter->currentRow();
if (nSelect < 0) return;
if (GetMainWindow()->m_pFilterObjectDlg->isLock()) return;
if (nSelect >= (m_plwFilter->count() - 1)) return;
QString strID1 = m_plwFilter->item(nSelect)->data(Qt::UserRole).toString();
QString strID2 = m_plwFilter->item(nSelect+1)->data(Qt::UserRole).toString();
@@ -204,6 +240,7 @@ void SFilterDlg::Down()
void SFilterDlg::Delete()
{
if (GetMainWindow()->m_pFilterObjectDlg->isLock()) return;
QSqlQuery query;
foreach (QListWidgetItem *item,m_plwFilter->selectedItems())
{

1
MorphereAnalyzer/sfilterdlg.h
View File

@@ -29,6 +29,7 @@ private slots:
void Group_CopyPaste();
void Group_Refresh();
void Group_Run();
void Group_Lock();
void GroupItemChanged(QListWidgetItem *, QListWidgetItem *);
void ItemChanged(QListWidgetItem*,QListWidgetItem*);

24
MorphereAnalyzer/sfilterobject.cpp
View File

@@ -523,10 +523,34 @@ void SFilterObject::unlockTabs()
m_tab.setTabEnabled(i, true);
}
bool SFilterObject::isLock()
{
QSqlQuery query;
int nSelect = GetMainWindow()->m_pFilterDlg->GetSelectGroupID();
qDebug() << nSelect;
if (nSelect == D_NOT_SELECT)
return true;
QString strQuery = "select locked from filtergroup where id = " + QString::number(nSelect);
if(!query.exec(strQuery))
return false;
query.next();
if (query.value(0).toInt() == 0)
return false;
else
return true;
}
void SFilterObject::DataBaseFilter(int _nType,QString _strJson,int _nGroup,int _nCommand,int _nFilterID)
{
QString sql;
if (_nGroup == D_NOT_SELECT) return;
if (isLock()) return;
switch(_nCommand)
{
case E_DATABASE_COMMAND_INSERT:

2
MorphereAnalyzer/sfilterobject.h
View File

@@ -35,6 +35,8 @@ public:
void DataBaseLengthFilter(int _nArticle,int _nCategory,int _nComp,int _nInsDel,QString _str,int _nGroup,int _nCommand,int _nFilterID = D_NOT_SELECT);
void DataBaseCounterFilter(int _nArticle,int _nCategory,int _nComp,int _nInsDel,QString _str,int _nGroup,int _nCommand,int _nFilterID = D_NOT_SELECT);
void DataBaseReplaceFilter(int _nArticle,int _nCategory,int _nFind,QString _strFind,QString _strReplace,int _nGroup,int _nCommand,int _nFilterID = D_NOT_SELECT);
bool isLock();
private:
enum E_DATABASE_COMMAND
{