Merge pull request #9 from leafcoder/develop

Develop

Author: leafcoder

README.md

@@ -25,6 +25,10 @@
 
 </div>
 
+由于现在疫情高发地已从国内转向国外，所以本项目也会逐渐增加*数据源*以便提供关于*国外某国某州（某省）*的疫情数据接口。
+
+现已新增美国各州最新疫情以及各州每日疫情统计接口，可前往 [各国各州接口](#/?id=states) 查看接口文档。
+
 # 项目文档
 
 本项目使用开源文档工具 [docsify](https://docsify.js.org) 编写了一份开发文档。
@@ -52,6 +56,10 @@
 * 推荐使用评论方式提问；
 * 推荐使用 isuss 提交 bug；
 
+# 致谢
+
+* [ccjhpu](https://github.com/ccjhpu)：在 [issues-8](https://github.com/leafcoder/django-covid19/issues/8) 中提出了加入各国各州的需求以及数据来源。
+
 # 致各位
 
 如果本项目对你有所帮助，请在[此处](http://111.231.75.86:8000/docs/#/?id=detail-1)留下你的项目地址。

demo_proj/ncov/settings.py

@@ -147,6 +147,10 @@
     }
 }
 
+if DEBUG == True:
+    CACHES['default']['BACKEND'] = 'django.core.cache.backends.locmem.LocMemCache'
+    CACHES['default']['LOCATION'] = 'ncov'
+
 # 跨域增加忽略
 CORS_ALLOW_CREDENTIALS = True
 CORS_ORIGIN_ALLOW_ALL = True
@@ -180,7 +184,10 @@
 
 CRONTAB_LOCK_JOBS = True
 CRONJOBS = (
-    # 每分钟抓取一次
-    ('*/1 * * * *', 'django.core.management.call_command', ['crawl']),
+    # 每分钟抓取丁香园数据一次
+    ('*/1 * * * *', 'django.core.management.call_command', ['crawl', 'dxy']),
+
+    # 下午4点到6点间每10分钟抓取 covidtracking 数据一次
+    ('*/10 16-18 * * *', 'django.core.management.call_command', ['crawl', 'covidtracking'])
 )
 

django_covid19/admin.py

@@ -87,4 +87,15 @@ class CountryAdmin(BaseAdmin):
     )
     search_fields = (
         'continents', 'countryFullName', 'countryShortCode', 'countryName'
-    )
+    )
+
+
+@admin.register(models.State)
+class StateAdmin(BaseAdmin):
+
+    list_display = (
+        'countryShortCode', 'stateName', 'state',
+        'totalTestResults', 'positive', 'negative', 'pending',
+        'hospitalized', 'death', 'recovered', 'dateModified'
+    )
+    search_fields = ('countryShortCode', 'stateName', 'state')

django_covid19/filters.py

@@ -1,6 +1,6 @@
 import django_filters
 from django.db.models import Q
-from .models import City, Province, Country
+from . import models
 
 
 class CharInFilter(django_filters.BaseInFilter, django_filters.CharFilter):
@@ -24,7 +24,7 @@ class CityFilter(django_filters.rest_framework.FilterSet):
         field_name='cityName', lookup_expr='exact')
 
     class Meta:
-        model = City
+        model = models.City
         fields = ['provinceShortName', 'provinceName', 'cityName']
 
 
@@ -41,7 +41,7 @@ class ProvinceFilter(django_filters.rest_framework.FilterSet):
         field_name='provinceName', lookup_expr='exact')
 
     class Meta:
-        model = Province
+        model = models.Province
         fields = ['provinceName', 'provinceShortName']
 
 
@@ -55,7 +55,18 @@ class CountryFilter(django_filters.rest_framework.FilterSet):
         field_name='countryName', lookup_expr='in')
 
     class Meta:
-        model = Country
+        model = models.Country
         fields = [
             'continents', 'countryShortCode', 'countryName'
         ]
+
+
+class StateFilter(django_filters.rest_framework.FilterSet):
+
+    states = CharInFilter(field_name='state', lookup_expr='in')
+    stateNames = CharInFilter(
+        field_name='stateName', lookup_expr='in')
+
+    class Meta:
+        model = models.State
+        fields = ['state', 'stateName']

django_covid19/locale/zh_Hans/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-22 13:32+0800\n"
+"POT-Creation-Date: 2020-05-31 00:10+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,9 +34,9 @@ msgstr "国际疫情"
 msgid "django_covid19"
 msgstr "新冠肺炎疫情"
 
-#: management/commands/crawl.py:27
+#: management/commands/crawl.py:32
 msgid "Crawl data from DingXiangYuan."
-msgstr ""
+msgstr "从丁香园抓取数据"
 
 #: models.py:19
 msgid "remarks"
@@ -153,3 +153,231 @@ msgstr "国内城市"
 #: models.py:112 models.py:113
 msgid "Country"
 msgstr "国家或地区"
+
+#: models.py:152 models.py:153
+msgid "State"
+msgstr "州"
+
+#: spider/nCoV/spiders/covidtracking.py:24
+msgid "Alabama"
+msgstr "阿拉巴马州"
+
+#: spider/nCoV/spiders/covidtracking.py:25
+msgid "Alaska"
+msgstr "阿拉斯加州"
+
+#: spider/nCoV/spiders/covidtracking.py:26
+msgid "AmericanSamoa"
+msgstr "美属萨摩亚"
+
+#: spider/nCoV/spiders/covidtracking.py:27
+msgid "Arizona"
+msgstr "亚利桑那州"
+
+#: spider/nCoV/spiders/covidtracking.py:28
+msgid "Arkansas"
+msgstr "阿肯色州"
+
+#: spider/nCoV/spiders/covidtracking.py:29
+msgid "California"
+msgstr "加利福尼亚州"
+
+#: spider/nCoV/spiders/covidtracking.py:30
+msgid "Colorado"
+msgstr "科罗拉多州"
+
+#: spider/nCoV/spiders/covidtracking.py:31
+msgid "Connecticut"
+msgstr "康涅狄格州"
+
+#: spider/nCoV/spiders/covidtracking.py:32
+msgid "Delaware"
+msgstr "特拉华州"
+
+#: spider/nCoV/spiders/covidtracking.py:33
+msgid "DistrictOfColumbia"
+msgstr "哥伦比亚特区"
+
+#: spider/nCoV/spiders/covidtracking.py:34
+msgid "Florida"
+msgstr "佛罗里达州"
+
+#: spider/nCoV/spiders/covidtracking.py:35
+msgid "Georgia"
+msgstr "乔治亚州"
+
+#: spider/nCoV/spiders/covidtracking.py:36
+msgid "Guam"
+msgstr "关岛"
+
+#: spider/nCoV/spiders/covidtracking.py:37
+msgid "Hawaii"
+msgstr "夏威夷州"
+
+#: spider/nCoV/spiders/covidtracking.py:38
+msgid "Idaho"
+msgstr "爱达荷州"
+
+#: spider/nCoV/spiders/covidtracking.py:39
+msgid "Illinois"
+msgstr "伊利诺斯州"
+
+#: spider/nCoV/spiders/covidtracking.py:40
+msgid "Indiana"
+msgstr "印第安纳州"
+
+#: spider/nCoV/spiders/covidtracking.py:41
+msgid "Iowa"
+msgstr "爱荷华州"
+
+#: spider/nCoV/spiders/covidtracking.py:42
+msgid "Kansas"
+msgstr "堪萨斯州"
+
+#: spider/nCoV/spiders/covidtracking.py:43
+msgid "Kentucky"
+msgstr "肯塔基州"
+
+#: spider/nCoV/spiders/covidtracking.py:44
+msgid "Louisiana"
+msgstr "路易斯安那州"
+
+#: spider/nCoV/spiders/covidtracking.py:45
+msgid "Maine"
+msgstr "缅因州"
+
+#: spider/nCoV/spiders/covidtracking.py:46
+msgid "Maryland"
+msgstr "马里兰州"
+
+#: spider/nCoV/spiders/covidtracking.py:47
+msgid "Massachusetts"
+msgstr "马萨诸塞州"
+
+#: spider/nCoV/spiders/covidtracking.py:48
+msgid "Michigan"
+msgstr "密歇根州"
+
+#: spider/nCoV/spiders/covidtracking.py:49
+msgid "Minnesota"
+msgstr "明尼苏达州"
+
+#: spider/nCoV/spiders/covidtracking.py:50
+msgid "Mississippi"
+msgstr "密西西比州"
+
+#: spider/nCoV/spiders/covidtracking.py:51
+msgid "Missouri"
+msgstr "密苏里州"
+
+#: spider/nCoV/spiders/covidtracking.py:52
+msgid "Montana"
+msgstr "蒙大纳州"
+
+#: spider/nCoV/spiders/covidtracking.py:53
+msgid "Nebraska"
+msgstr "内布拉斯加州"
+
+#: spider/nCoV/spiders/covidtracking.py:54
+msgid "Nevada"
+msgstr "内华达州"
+
+#: spider/nCoV/spiders/covidtracking.py:55
+msgid "NewHampshire"
+msgstr "新罕布什尔州"
+
+#: spider/nCoV/spiders/covidtracking.py:56
+msgid "NewJersey"
+msgstr "新泽西州"
+
+#: spider/nCoV/spiders/covidtracking.py:57
+msgid "NewMexico"
+msgstr "新墨西哥州"
+
+#: spider/nCoV/spiders/covidtracking.py:58
+msgid "NewYork"
+msgstr "纽约州"
+
+#: spider/nCoV/spiders/covidtracking.py:59
+msgid "NorthCarolina"
+msgstr "北卡罗来纳州"
+
+#: spider/nCoV/spiders/covidtracking.py:60
+msgid "NorthDakota"
+msgstr "北达科他州"
+
+#: spider/nCoV/spiders/covidtracking.py:61
+msgid "NorthernMarianaIslands"
+msgstr "北马里亚纳群岛"
+
+#: spider/nCoV/spiders/covidtracking.py:62
+msgid "Ohio"
+msgstr "俄亥俄州"
+
+#: spider/nCoV/spiders/covidtracking.py:63
+msgid "Oklahoma"
+msgstr "俄克拉荷马州"
+
+#: spider/nCoV/spiders/covidtracking.py:64
+msgid "Oregon"
+msgstr "俄勒冈州"
+
+#: spider/nCoV/spiders/covidtracking.py:65
+msgid "Pennsylvania"
+msgstr "宾夕法尼亚州"
+
+#: spider/nCoV/spiders/covidtracking.py:66
+msgid "PuertoRico"
+msgstr "波多黎各"
+
+#: spider/nCoV/spiders/covidtracking.py:67
+msgid "RhodeIsland"
+msgstr "美国罗德岛州"
+
+#: spider/nCoV/spiders/covidtracking.py:68
+msgid "SouthCarolina"
+msgstr "美国南卡罗来纳州"
+
+#: spider/nCoV/spiders/covidtracking.py:69
+msgid "SouthDakota"
+msgstr "南达科塔"
+
+#: spider/nCoV/spiders/covidtracking.py:70
+msgid "Tennessee"
+msgstr "田纳西州"
+
+#: spider/nCoV/spiders/covidtracking.py:71
+msgid "Texas"
+msgstr "德克萨斯州"
+
+#: spider/nCoV/spiders/covidtracking.py:72
+msgid "USVirginIslands"
+msgstr "美属维尔京群岛"
+
+#: spider/nCoV/spiders/covidtracking.py:73
+msgid "Utah"
+msgstr "犹他州"
+
+#: spider/nCoV/spiders/covidtracking.py:74
+msgid "Vermont"
+msgstr "佛蒙特州"
+
+#: spider/nCoV/spiders/covidtracking.py:75
+msgid "Virginia"
+msgstr "弗吉尼亚州"
+
+#: spider/nCoV/spiders/covidtracking.py:76
+msgid "Washington"
+msgstr "华盛顿州"
+
+#: spider/nCoV/spiders/covidtracking.py:77
+msgid "WestVirginia"
+msgstr "西佛吉尼亚州"
+
+#: spider/nCoV/spiders/covidtracking.py:78
+msgid "Wisconsin"
+msgstr "威斯康星州"
+
+#: spider/nCoV/spiders/covidtracking.py:79
+msgid "Wyoming"
+msgstr "怀俄明州"

django_covid19/management/commands/crawl.py

@@ -6,6 +6,7 @@
 sys.path.insert(0, os.path.join(app_dir, 'spider'))
 
 from nCoV.spiders.dxy import DXYSpider
+from nCoV.spiders.covidtracking import CovidTrackingSpider
 from scrapy.crawler import CrawlerProcess
 from scrapy.utils.project import get_project_settings
 from django.core.management.base import BaseCommand
@@ -17,15 +18,23 @@ def __init__(self):
         os.environ.setdefault('SCRAPY_SETTINGS_MODULE', settings_file_path)
         self.process = CrawlerProcess(get_project_settings())
         self.spider = DXYSpider
+        self.covidtracking_spider = CovidTrackingSpider
 
-    def run_spiders(self):
-        self.process.crawl(self.spider)
+    def run_spiders(self, spider):
+        if spider == 'covidtracking':
+            self.process.crawl(self.covidtracking_spider)
+        else:
+            self.process.crawl(self.spider)
         self.process.start()
 
 class Command(BaseCommand):
 
     help = _('Crawl data from DingXiangYuan.')
 
+    def add_arguments(self, parser):
+        parser.add_argument('spider', type=str, help='spider name')
+
     def handle(self, *args, **options):
+        spider = options['spider']
         scraper = Scraper()
-        scraper.run_spiders()
+        scraper.run_spiders(spider)