From b3b3cff5050a17051175c4d2df09cbf77bd0e6aa Mon Sep 17 00:00:00 2001
From: juanboy <2980526980@qq.com>
Date: Thu, 4 Jul 2024 15:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=AC=E8=99=AB=E7=BB=93=E6=9D=9F=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=89=93=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spider/saveData.py                     | 2 ++
 utils/{predict_demo1.py => predict.py} | 0
 utils/yuqingpredict.py                 | 9 +++++++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 rename utils/{predict_demo1.py => predict.py} (100%)

diff --git a/spider/saveData.py b/spider/saveData.py
index 08f5d14..3bc00d7 100644
--- a/spider/saveData.py
+++ b/spider/saveData.py
@@ -2,6 +2,7 @@ import os
 from sqlalchemy import create_engine
 import pandas as pd
 from spiderDataPackage.settings import articleAddr,commentsAddr
+from model.topicDefine import *
 
 engine = create_engine('mysql+pymysql://XiaoXueQi:XiaoXueQi@47.92.235.6/Weibo_PublicOpinion_AnalysisSystem?charset=utf8mb4')
 
@@ -28,6 +29,7 @@ def saveData():
 
     os.remove(articleAddr)
     os.remove(commentsAddr)
+    update_data()
 
 if __name__ == '__main__':
     saveData()
\ No newline at end of file
diff --git a/utils/predict_demo1.py b/utils/predict.py
similarity index 100%
rename from utils/predict_demo1.py
rename to utils/predict.py
diff --git a/utils/yuqingpredict.py b/utils/yuqingpredict.py
index 4b3aa89..8062d75 100644
--- a/utils/yuqingpredict.py
+++ b/utils/yuqingpredict.py
@@ -1,4 +1,5 @@
 from utils.getPublicData import *
+from utils.predict import *
 articleList = getAllArticleData()
 commentList = getAllCommentsData()
 import csv
@@ -53,7 +54,7 @@ def getTopicData():
     yData = top_10_topics['value'].tolist()
     return xData, yData
 
-def getTopicPageCreatedAtCharData(topic):# 统计特定话题的评论在每个日期的数量，并返回日期和对应的评论数量
+def getTopicCreatedAtandpredictData(topic):# 统计特定话题的评论在每个日期的数量，并返回日期和对应的评论数量
     createdAt = {}
     for i in articleList:
         if i[14]==topic:
@@ -67,6 +68,10 @@ def getTopicPageCreatedAtCharData(topic):# 统计特定话题的评论在每个
                 createdAt[i[1]] += 1
             else:
                 createdAt[i[1]] = 1
+    createdAt = {k: createdAt[k] for k in sorted(createdAt, key=lambda date: datetime.datetime.strptime(date, "%Y-%m-%d"))}
+    print(createdAt)
+    createdAt.update(predict_future_values(createdAt))
+    print(createdAt)
     sorted_data = {k: createdAt[k] for k in sorted(createdAt, key=lambda date: datetime.datetime.strptime(date, "%Y-%m-%d"))}
     return topic,sorted_data
     # return topic,list(createdAt.keys()),list(createdAt.values())
@@ -90,4 +95,4 @@ if __name__ == '__main__':
     # 将话题数据写入 CSV 文件
     # merged_topics = mergeTopics(getTopicByArticle(), getTopicByComments())
     # writeTopicsToCSV(merged_topics, 'merged_topics.csv')
-    print(getTopicPageCreatedAtCharData("生活"))
+    print(getTopicCreatedAtandpredictData("生活"))