Merge branch 'develop'

leafcoder · leafcoder · commit 9f3ff39ae625 · 2020-04-25T23:11:28.000+08:00
diff --git a/ncovapi/admin.py b/ncovapi/admin.py
@@ -37,6 +37,49 @@ class StatisticsAdmin(BaseAdmin):
     list_filter = ('countryType', )
 
 
+@admin.register(models.Notice)
+class NoticeAdmin(BaseAdmin):
+
+    list_display = (
+        'id', 'crawler', 'remarks', 'notes', 'generalRemark'
+    )
+
+@admin.register(models.WHOArticle)
+class WHOArticleAdmin(BaseAdmin):
+
+    list_display = ('id', 'title', 'linkUrl', 'imgUrl')
+
+@admin.register(models.Recommend)
+class RecommendAdmin(BaseAdmin):
+
+    list_display = (
+        'id', 'title', 'linkUrl', 'imgUrl', 'contentType',
+        'countryType', 'recordStatus')
+
+@admin.register(models.Timeline)
+class TimelineAdmin(BaseAdmin):
+
+    list_display = (
+        'id', 'title', 'summary', 'pubDateStr', 'infoSource', 'sourceUrl')
+
+@admin.register(models.Wiki)
+class WikiAdmin(BaseAdmin):
+
+    list_display = ('id', 'title', 'linkUrl', 'imgUrl', 'description')
+
+@admin.register(models.GoodsGuide)
+class GoodsGuideAdmin(BaseAdmin):
+
+    list_display = (
+        'categoryName', 'title', 'recordStatus', 'contentImgUrls')
+
+@admin.register(models.Rumor)
+class RumorAdmin(BaseAdmin):
+
+    list_display = (
+        'title', 'mainSummary', 'summary', 'body',
+        'sourceUrl', 'score', 'rumorType')
+
 @admin.register(models.City)
 class CityAdmin(BaseAdmin):
 
diff --git a/ncovapi/models.py b/ncovapi/models.py
@@ -20,12 +20,13 @@ class Statistics(models.Model):
     GLOBAL = 0
     DOMESTIC = 1
     INTERNATIONAL = 2
-
-    countryType = models.IntegerField(choices=(
+    COUNTRY_TYPES = (
         (GLOBAL, '全球'),
         (DOMESTIC, '国内'),
         (INTERNATIONAL, '国外')
-    ))
+    )
+
+    countryType = models.IntegerField(choices=COUNTRY_TYPES)
     currentConfirmedCount = models.IntegerField(default=0)
     confirmedCount = models.IntegerField(default=0)
     suspectedCount = models.IntegerField(default=0)
@@ -57,6 +58,121 @@ class Meta:
         verbose_name = '注意信息'
         verbose_name_plural = '注意信息'
 
+class WHOArticle(models.Model):
+
+    title = models.CharField(max_length=100)
+    linkUrl = models.URLField(max_length=200)
+    imgUrl = models.URLField(max_length=200)
+    crawler = models.OneToOneField(
+        "Crawler", on_delete=models.CASCADE, related_name="WHO_article",
+        db_column="crawlerId"
+    )
+
+    class Meta:
+        verbose_name = 'WHO 文章'
+        verbose_name_plural = 'WHO 文章'
+
+class Recommend(models.Model):
+
+    CONTENT_TYPES = [
+        (1, '我要出行'),
+        (2, '家有小孩'),
+        (3, '未知'),
+        (4, '我宅在家'),
+        (5, '未知'),
+        (6, '未知'),
+        (7, '未知')
+    ]
+    GLOBAL = 0
+    DOMESTIC = 1
+    INTERNATIONAL = 2
+    COUNTRY_TYPES = (
+        (GLOBAL, '全球'),
+        (DOMESTIC, '国内'),
+        (INTERNATIONAL, '国外')
+    )
+
+    title = models.CharField(max_length=100)
+    linkUrl = models.URLField(max_length=200)
+    imgUrl = models.URLField(max_length=200)
+    contentType = models.IntegerField(choices=CONTENT_TYPES)
+    recordStatus = models.IntegerField()
+    countryType = models.IntegerField(choices=COUNTRY_TYPES)
+    sort = models.IntegerField()
+    crawler = models.ForeignKey(
+        "Crawler", on_delete=models.CASCADE, related_name="recommends",
+        db_column="crawlerId"
+    )
+
+    class Meta:
+        verbose_name = '防护知识'
+        verbose_name_plural = '防护知识'
+
+class Timeline(models.Model):
+
+    pubDate = models.IntegerField()
+    pubDateStr = models.CharField(max_length=50)
+    title = models.CharField(max_length=100)
+    summary = models.TextField()
+    infoSource = models.CharField(max_length=50)
+    sourceUrl = models.URLField(max_length=200)
+    crawler = models.ForeignKey(
+        "Crawler", on_delete=models.CASCADE, related_name="timelines",
+        db_column="crawlerId"
+    )
+
+    class Meta:
+        verbose_name = '时间线事件'
+        verbose_name_plural = '时间线事件'
+
+class Wiki(models.Model):
+
+    title = models.CharField(max_length=100)
+    linkUrl = models.URLField(max_length=200)
+    imgUrl = models.URLField(max_length=200)
+    description = models.TextField()
+    crawler = models.ForeignKey(
+        "Crawler", on_delete=models.CASCADE, related_name="wikis",
+        db_column="crawlerId"
+    )
+
+    class Meta:
+        verbose_name = 'Wiki'
+        verbose_name_plural = 'Wiki'
+
+class GoodsGuide(models.Model):
+
+    title = models.CharField(max_length=100)
+    categoryName = models.CharField(max_length=50)
+    recordStatus = models.IntegerField()
+    contentImgUrls = ListCharField(
+        models.CharField(max_length=100), size=10, max_length=100*11)
+    crawler = models.ForeignKey(
+        "Crawler", on_delete=models.CASCADE, related_name="goods_guides",
+        db_column="crawlerId"
+    )
+
+    class Meta:
+        verbose_name = '购物指南'
+        verbose_name_plural = '购物指南'
+
+class Rumor(models.Model):
+
+    title = models.CharField(max_length=100)
+    mainSummary = models.TextField()
+    summary = models.TextField()
+    body = models.TextField()
+    sourceUrl = models.URLField(max_length=200)
+    score = models.IntegerField()
+    rumorType = models.IntegerField()
+    crawler = models.ForeignKey(
+        "Crawler", on_delete=models.CASCADE, related_name="rumors",
+        db_column="crawlerId"
+    )
+
+    class Meta:
+        verbose_name = '辟谣与防护'
+        verbose_name_plural = '辟谣与防护'
 
 class Province(models.Model):
 
diff --git a/ncovapi/serializers.py b/ncovapi/serializers.py
@@ -11,6 +11,58 @@ class StatisticsGroupSerializer(serializers.Serializer):
     curedCount = serializers.IntegerField()
     deadCount = serializers.IntegerField()
 
+
+class WHOArticleSerializer(serializers.Serializer):
+
+    title = serializers.CharField(max_length=100)
+    linkUrl = serializers.URLField()
+    imgUrl = serializers.URLField()
+
+
+class RecommendSerializer(serializers.Serializer):
+
+    title = serializers.CharField()
+    linkUrl = serializers.URLField()
+    imgUrl = serializers.URLField()
+    contentType = serializers.IntegerField()
+    recordStatus = serializers.IntegerField()
+    countryType = serializers.IntegerField()
+
+
+class TimelineSerializer(serializers.Serializer):
+
+    pubDate = serializers.IntegerField()
+    pubDateStr = serializers.CharField()
+    title = serializers.CharField()
+    summary = serializers.CharField()
+    infoSource = serializers.CharField()
+    sourceUrl = serializers.URLField()
+
+class WikiSerializer(serializers.Serializer):
+
+    title = serializers.CharField()
+    linkUrl = serializers.URLField()
+    imgUrl = serializers.URLField()
+    description = serializers.CharField()
+
+class GoodsGuideSerializer(serializers.Serializer):
+
+    title = serializers.CharField()
+    categoryName = serializers.CharField()
+    recordStatus = serializers.IntegerField()
+    contentImgUrls = serializers.ListField(
+        serializers.URLField(max_length=200), max_length=10)
+
+class RumorSerializer(serializers.Serializer):
+
+    title = serializers.CharField()
+    mainSummary = serializers.CharField()
+    summary = serializers.CharField()
+    body = serializers.CharField()
+    sourceUrl = serializers.URLField()
+    score = serializers.IntegerField()
+    rumorType = serializers.IntegerField()
+
 class StatisticsSerializer(serializers.Serializer):
 
     globalStatistics = StatisticsGroupSerializer()
@@ -23,6 +75,12 @@ class StatisticsSerializer(serializers.Serializer):
        child=serializers.CharField(max_length=100), max_length=10
     )
     generalRemark = serializers.CharField()
+    WHOArticle = WHOArticleSerializer()
+    recommends = RecommendSerializer(many=True)
+    timelines = TimelineSerializer(many=True)
+    wikis = WikiSerializer(many=True)
+    goodsGuides = GoodsGuideSerializer(many=True)
+    rumors = RumorSerializer(many=True)
     modifyTime = serializers.IntegerField()
     createTime = serializers.IntegerField()
 
diff --git a/ncovapi/views.py b/ncovapi/views.py
@@ -13,8 +13,10 @@
 from rest_framework_extensions.cache.decorators import cache_response
 
 from .serializers import StatisticsSerializer, CitySerializer, \
-                         ProvinceSerializer, CountrySerializer
-from .models import Crawler, Statistics, City, Province, Country
+                         ProvinceSerializer, CountrySerializer, \
+                         RecommendSerializer, TimelineSerializer
+from .models import Crawler, Statistics, WHOArticle, Recommend, \
+                    City, Province, Country
 from .filters import CityFilter, ProvinceFilter, CountryFilter
 
 
@@ -55,6 +57,21 @@ def get_object(self):
             result['remarks'] = notice.remarks
             result['notes'] = notice.notes
             result['generalRemark'] = notice.generalRemark
+        try:
+            article = crawler.WHO_article
+        except WHOArticle.DoesNotExist:
+            result['WHOArticle'] = None
+        else:
+            result['WHOArticle'] = {
+                'title': article.title,
+                'linkUrl': article.linkUrl,
+                'imgUrl': article.imgUrl
+            }
+        result['recommends'] = crawler.recommends.all()
+        result['timelines'] = crawler.timelines.all()
+        result['wikis'] = crawler.wikis.all()
+        result['goodsGuides'] = crawler.goods_guides.all()
+        result['rumors'] = crawler.rumors.all()
         return result
 
     @method_decorator(cache_page(TIMEOUT))
diff --git a/spider/nCoV/items.py b/spider/nCoV/items.py
@@ -25,6 +25,37 @@ class NoticeItem(DjangoItem):
 
     django_model = models.Notice
 
+
+class WHOArticleItem(DjangoItem):
+
+    django_model = models.WHOArticle
+
+
+class RecommendItem(DjangoItem):
+
+    django_model = models.Recommend
+
+
+class TimelineItem(DjangoItem):
+
+    django_model = models.Timeline
+
+
+class WikiItem(DjangoItem):
+
+    django_model = models.Wiki
+
+
+class GoodsGuideItem(DjangoItem):
+
+    django_model = models.GoodsGuide
+
+
+class RumorItem(DjangoItem):
+
+    django_model = models.Rumor
+
+
 class ProvinceItem(DjangoItem):
 
     django_model = models.Province
diff --git a/spider/nCoV/pipelines.py b/spider/nCoV/pipelines.py
diff --git a/spider/nCoV/spiders/dxy.py b/spider/nCoV/spiders/dxy.py
