From b4128ef7ebf756c84c4e15c5d0bc1b9bafcf2b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=81=A5?= <812541820@qq.com>
Date: Mon, 17 Aug 2020 10:25:48 +0800
Subject: [PATCH] aaa

---
 业务逻辑类.txt                |  5 +++--
 数据库实体类.txt             | 33 ++++++++++++++++++++++++++++++
 省份和地级市的实体类.txt | 11 +++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/业务逻辑类.txt b/业务逻辑类.txt
index a7f7c81..7b51d7e 100644
--- a/业务逻辑类.txt
+++ b/业务逻辑类.txt
@@ -90,8 +90,9 @@ class DataService:
         
         # 保存省份数据
         self.db.save_province_datas(all_provinces)
-        
+        # 保存地级市数据
+        self.db.save_city_datas(all_provinces)
         
 # 创建Dataservice对象
 ds = DataService()
-ds.process_data()
\ No newline at end of file
+ds.process_data()
diff --git a/数据库实体类.txt b/数据库实体类.txt
index 44b5370..e3c790b 100644
--- a/数据库实体类.txt
+++ b/数据库实体类.txt
@@ -11,6 +11,12 @@ class MyDB:
             info_tuple.append(item.get_info_tuple())
         return info_tuple
     
+    def get_city_list_tuple(self):
+        city_info_tuple = []
+        for city in self.subList:
+            city_info_tuple.append((city.city,city.confirmedRelative,city.confirmed,city.died,city.crued,city.pub_date,city.province))
+        return city_info_tuple
+    
     # 保存省份数据
     def save_province_datas(self, all_provinces):
         curdate = all_provinces[0].pub_date
@@ -33,6 +39,33 @@ class MyDB:
         except Exception as e:
             print(e)
         print('+++ save_province_datas is over.')
+     
+    # 保存地级市数据
+    def save_city_datas(self, all_provinces):
+        curdate = all_provinces[0].pub_date
+        sql = 'delete from city_daily_datas where pub_date like "%s"'%(curdate[:10] + '%')
+        
+        try:
+            self.cursor.execute(sql)
+            self.conn.commit()
+        except Exception as e:
+            print(e)
+        
+        
+        sql = 'insert into city_daily_datas(city,confirmedRelative,curConfirm,confirmed,died,crued,pub_date,province) values(%s,%s,%s,%s,%s,%s,%s,%s)'
+        res = all_city_infos = []
+        for province in all_provinces:
+            city_info = province.get_city_info_tuple()
+            all_city_infos += city_info
+        
+        print('+++ save_city_datas, data len: %d' % len(res))
+        try:
+            self.cursor.executemany(sql, res)
+            self.conn.commit()
+        except Exception as e:
+            print(e)
+        print('+++ save_city_datas is over.')
+
             
         
     def __del__(self):
diff --git a/省份和地级市的实体类.txt b/省份和地级市的实体类.txt
index dd52978..ef2d803 100644
--- a/省份和地级市的实体类.txt
+++ b/省份和地级市的实体类.txt
@@ -12,6 +12,8 @@ class City:
         
     def __str__(self):
         return 'city: %s,confirmed: %d,died: %d,crued: %d,confirmedRelative: %d,curConfirm: %d,pub_date:%s' % (self.city, self.confirmed, self.died, self.crued, self.confirmedRelative, self.curConfirm, self.pub_date)
+    
+    
 
 # 国内省份疫情实体类
 class Province:
@@ -40,4 +42,11 @@ class Province:
      self.curConfirmRelative, self.icuDisable,  self.pub_date)
     
     def get_info_tuple(self):
-        return ((self.curConfirm,self.curConfirmRelative,self.confirmed,self.confirmedRelative,self.died,self.diedRelative,self.crued,self.curedRelative,self.area,self.asymptomatic,self.asymptomaticRelative,self.pub_date))
\ No newline at end of file
+        return ((self.curConfirm,self.curConfirmRelative,self.confirmed,self.confirmedRelative,self.died,self.diedRelative,self.crued,self.curedRelative,self.area,self.asymptomatic,self.asymptomaticRelative,self.pub_date))
+    
+    def get_city_info_tuple(self):
+        city_info_list = []
+        for city in self.subList:
+            city_info_list.append((city.city,city.confirmedRelative,city.curConfirm,city.confirmed,city.died,city.crued,city.pub_date,city.province))
+        return city_info_list
+