git-svn-id: svn://192.168.0.12/source@347 8346c931-da38-4b9b-9d4c-e48b93cbd075

This commit is contained in:
admin
2017-05-30 01:35:44 +00:00
parent fab5f51c85
commit dad0365a79
26 changed files with 813 additions and 506 deletions

View File

@@ -49,12 +49,6 @@ QString getReplyBuzz(const EffectData& _data)
QDate firstDate = QDateTime::fromString(_data.body.data[ARTICLE_DATE].trimmed().replace("T", " ").replace(".","-").replace("- "," "), "yyyy-MM-dd hh:mm:ss").date();
QDate lastDate = QDate::currentDate();
qDebug() << _data.body.data[ARTICLE_DATE];
qDebug() << "firstDate:" << firstDate.toString("yyyy-MM-dd");
qDebug() << "lastDate:" << lastDate.toString("yyyy-MM-dd");
for (QDate date = firstDate; date <= lastDate; date = date.addDays(1))
{
mapDate.insert(date, 0);
@@ -83,19 +77,13 @@ QString getReplyBuzz(const EffectData& _data)
return result;
}
QString getReplyBuzz(const EffectData& _data, const QString& _startdate)
QJsonArray getReplyBuzz(const EffectData& _data, const QString& _startdate)
{
QMap<QDate, int> mapDate;
QDate firstDate = QDateTime::fromString(_startdate, "yyyy-MM-dd").date();
QDate lastDate = QDate::currentDate();
qDebug() << _data.body.data[ARTICLE_DATE];
qDebug() << "firstDate:" << firstDate.toString("yyyy-MM-dd");
qDebug() << "lastDate:" << lastDate.toString("yyyy-MM-dd");
for (QDate date = firstDate; date <= lastDate; date = date.addDays(1))
{
mapDate.insert(date, 0);
@@ -110,16 +98,77 @@ QString getReplyBuzz(const EffectData& _data, const QString& _startdate)
continue;
mapDate[date]++;
}
QJsonArray jArray;
QJsonArray jArray;
int nAccReplyCount = 0;
for (auto iter = mapDate.cbegin(); iter != mapDate.cend(); ++iter)
{
int nValue = iter.value();
nAccReplyCount += nValue;
QJsonObject jObj;
jObj["date"] = iter.key().toString("MM-dd-yyyy");
jObj["value"] = iter.value();
jObj["date"] = iter.key().toString("yyyyMMdd");
jObj["reply_day"] = nValue;
jObj["reply_acc"] = nAccReplyCount;
jArray.append(jObj);
}
return jArray;
}
QJsonArray getLikeBuzz(const EffectData& _data, const QString& _startdate)
{
QMap<QString, int> mapDate;
QDate firstDate = QDateTime::fromString(_startdate, "yyyy-MM-dd").date();
QDate lastDate = QDate::currentDate();
for (QDate date = firstDate; date <= lastDate; date = date.addDays(1))
{
mapDate.insert(date.toString("yyyyMMdd"), 0);
}
QMapIterator<QString, int> iter(_data.like);
while (iter.hasNext())
{
iter.next();
QString date = iter.key();
mapDate[date] = iter.value();
}
QJsonArray jArray;
int nAccLikeCount = 0;
for (auto iter = mapDate.cbegin(); iter != mapDate.cend(); ++iter)
{
int nValue = iter.value();
nAccLikeCount += nValue;
QJsonObject jObj;
jObj["date"] = iter.key();
jObj["like_day"] = nValue;
jObj["like_acc"] = nAccLikeCount;
jArray.append(jObj);
}
return jArray;
}
QString summaryLikeAndReply(QJsonArray _replyBuzz, QJsonArray _likeBuzz)
{
QJsonArray jArray;
for (int i=0; i<_replyBuzz.count(); i++)
{
QJsonObject jObj;
jObj["date"] = _replyBuzz.at(i).toObject()["date"];
jObj["reply_day"] = _replyBuzz.at(i).toObject()["reply_day"];
jObj["reply_acc"] = _replyBuzz.at(i).toObject()["reply_acc"];
jObj["like_day"] = _likeBuzz.at(i).toObject()["like_day"];
jObj["like_acc"] = _likeBuzz.at(i).toObject()["like_acc"];
jArray.append(jObj);
}
QJsonDocument jDoc(jArray);
QString result = jDoc.toJson(QJsonDocument::Compact);
return result;
}