|
|
@ -12,6 +12,8 @@ class City:
|
|
|
|
|
|
|
|
|
|
|
|
def __str__(self):
|
|
|
|
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)
|
|
|
|
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:
|
|
|
|
class Province:
|
|
|
@ -40,4 +42,11 @@ class Province:
|
|
|
|
self.curConfirmRelative, self.icuDisable, self.pub_date)
|
|
|
|
self.curConfirmRelative, self.icuDisable, self.pub_date)
|
|
|
|
|
|
|
|
|
|
|
|
def get_info_tuple(self):
|
|
|
|
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))
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|