Daily Commit

xialei123456 · Jan 30, 2020 · 1bc4b28 · 1bc4b28
1 parent 1d7f4b0
commit 1bc4b28
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 35 deletions.
diff --git a/README.MD b/README.MD
@@ -1 +1,7 @@
-#### 武汉2019新型冠状病毒疫情可视化(全国疫情地图及时间轴变化)
+#### 武汉2019新型冠状病毒疫情可视化(全国疫情地图及时间轴变化)
+
+#### 数据来源
+- 数据来源，腾讯新闻：https://news.qq.com/zt2020/page/feiyan.htm
+- 经过解析后的数据地址(json格式数据)：https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5
+- json格式在线数据可能会失效，我已经下载保存到项目文件中(可以直接读取本地文件)：getOnsInfo.json
+
diff --git a/getOnsInfo.json b/getOnsInfo.json
diff --git a/nCov_data_analysis/china_data_analysis.py b/nCov_data_analysis/china_data_analysis.py
@@ -19,7 +19,7 @@ def __init__(self):
         self.all_data = self.ncovdata.get_html_text()
 
     def china_total_data(self):
-        # 累积数据汇总(实际该累积数据包含其它国家的数据)
+        # 累积数据汇总(实际该累积数据包含其它国家的数据),chinaTotal键对应的值就是累积数据
         chinaTotal = self.all_data['chinaTotal']
         print(chinaTotal)
         return chinaTotal

diff --git a/nCov_data_analysis/province_data_analysis.py b/nCov_data_analysis/province_data_analysis.py
@@ -18,45 +18,46 @@ def __init__(self):
         self.ncovdata = a_get_html.nCovData()
         self.all_data = self.ncovdata.get_html_text()
 
-    def world_total_data(self):
+    def province_total_data(self):
         '''获取世界各国累积数据'''
-        areaTree = self.all_data['areaTree']
-        country_name = list()
-        country_total_confirm = list()
-        country_total_suspect = list()
-        country_total_dead = list()
-        country_total_heal = list()
-        for country in areaTree:
-            country_name.append(country['name'])
-            country_total_confirm.append(country['total']['confirm'])
-            country_total_suspect.append(country['total']['suspect'])
-            country_total_dead.append(country['total']['dead'])
-            country_total_heal.append(country['total']['heal'])
-        print(country_name)
-        print(country_total_confirm)
-
-    def world_today_data(self):
+        # areaTree对应的第一个数据就是中国，下面的children对应的就是每个省份的数据，是一个列表
+        areaTree = self.all_data['areaTree'][0]['children']
+        province_name = list()
+        province_total_confirm = list()
+        province_total_suspect = list()
+        province_total_dead = list()
+        province_total_heal = list()
+        for province in areaTree:
+            province_name.append(province['name'])
+            province_total_confirm.append(province['total']['confirm'])
+            province_total_suspect.append(province['total']['suspect'])
+            province_total_dead.append(province['total']['dead'])
+            province_total_heal.append(province['total']['heal'])
+        print(province_name)
+        print(province_total_confirm)
+
+    def province_today_data(self):
         '''获取各国今日数据'''
-        areaTree = self.all_data['areaTree']
-        country_name = list()
-        country_today_confirm = list()
-        country_today_suspect = list()
-        country_today_dead = list()
-        country_today_heal = list()
-        for country in areaTree:
-            country_name.append(country['name'])
-            country_today_confirm.append(country['today']['confirm'])
-            country_today_suspect.append(country['today']['suspect'])
-            country_today_dead.append(country['total']['dead'])
-            country_today_heal.append(country['total']['heal'])
-        print(country_today_confirm)
+        areaTree = self.all_data['areaTree'][0]['children']
+        province_name = list()
+        province_today_confirm = list()
+        province_today_suspect = list()
+        province_today_dead = list()
+        province_today_heal = list()
+        for province in areaTree:
+            province_name.append(province['name'])
+            province_today_confirm.append(province['today']['confirm'])
+            province_today_suspect.append(province['today']['suspect'])
+            province_today_dead.append(province['total']['dead'])
+            province_today_heal.append(province['total']['heal'])
+        print(province_today_confirm)
 
     def main(self):
-        self.world_total_data()
-        self.world_today_data()
+        self.province_total_data()
+        self.province_today_data()
 
 if __name__ == '__main__':
-    world_data= WorldData()
+    world_data= ProvinceData()
     world_data.main()
 
 
diff --git a/nCov_data_analysis/world_data_analysis.py b/nCov_data_analysis/world_data_analysis.py
@@ -20,6 +20,7 @@ def __init__(self):
 
     def world_total_data(self):
         '''获取世界各国累积数据'''
+        # areaTree键对应的值就是各个国家的数据
         areaTree = self.all_data['areaTree']
         country_name = list()
         country_total_confirm = list()