From da3f9324b6f38e3105ac7bc0129d512c38da9f8b Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 18 Jan 2019 10:16:23 +0800
Subject: [PATCH] .

---
 chapter2/init.sql                                |  8 ++++++++
 chapter2/mysite/myapp/models.py                  | 11 ++++++++++-
 chapter2/mysite/myapp/templates/myapp/crawl.html | 16 +++-------------
 chapter2/mysite/myapp/views.py                   |  5 ++++-
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/chapter2/init.sql b/chapter2/init.sql
index 92efa8f..fb3465a 100644
--- a/chapter2/init.sql
+++ b/chapter2/init.sql
@@ -33,4 +33,12 @@ create table platform_infos (
 ) comment='平台信息';
 
  
+create table news (
+`id` int(11) NOT NULL AUTO_INCREMENT,
 
+comment_time varchar(255) comment '评论时间',
+content varchar(1024) comment '评论内容',
+comment_id varchar(255) comment '评论ID',
+
+PRIMARY KEY (`id`)
+)comment='最新抓取的20条信息';
diff --git a/chapter2/mysite/myapp/models.py b/chapter2/mysite/myapp/models.py
index db96617..05f7df4 100644
--- a/chapter2/mysite/myapp/models.py
+++ b/chapter2/mysite/myapp/models.py
@@ -27,4 +27,13 @@ class PlatformInfos(models.Model):
 
     class Meta:
         managed = False
-        db_table = 'platform_infos'
\ No newline at end of file
+        db_table = 'platform_infos'
+
+class News(models.Model):
+    comment_time = models.CharField(max_length=255, blank=True, null=True)
+    content = models.CharField(max_length=1024, blank=True, null=True)
+    comment_id = models.CharField(max_length=255, blank=True, null=True)
+
+    class Meta:
+        managed = False
+        db_table = 'news'
\ No newline at end of file
diff --git a/chapter2/mysite/myapp/templates/myapp/crawl.html b/chapter2/mysite/myapp/templates/myapp/crawl.html
index 00b7ce5..7b1aed6 100644
--- a/chapter2/mysite/myapp/templates/myapp/crawl.html
+++ b/chapter2/mysite/myapp/templates/myapp/crawl.html
@@ -120,19 +120,9 @@
                             </tr>
                             </thead>
                             <tbody>
-                            <tr><td>1</td><td>9月21日感染性腹泻发病：123人次</td><td>2018-11-05</td></tr>
-                            <tr><td>2</td><td>9月20日流行性感冒：57人次</td><td>2018-11-03</td></tr>
-                            <tr><td>3</td><td>9月19日:手足口病发病同比增长220%</td><td>2018-11-01</td></tr>
-                            <tr><td>4</td><td>9月18日登革热死亡:2人</td><td>2018-10-29</td></tr>
-                            <tr><td>5</td><td>9月17日流行性感冒：157人次</td><td>2018-10-27</td></tr>
-                            <tr><td>6</td><td>9月15日全区传染病发病人数较低</td><td>2018-10-25</td></tr>
-                            <tr><td>7</td><td>9月14日流行性感冒：157人次</td><td>2018-10-23</td></tr>
-                            <tr><td>8</td><td>9月13日全区传染病发病人数较低</td><td>2018-10-21</td></tr>
-                            <tr><td>9</td><td>9月12日流行性感冒：157人次</td><td>2018-10-20</td></tr>
-                            <tr><td>10</td><td>9月17日流行性感冒：157人次</td><td>2018-10-27</td></tr>
-                            <tr><td>11</td><td>9月15日全区传染病发病人数较低</td><td>2018-10-25</td></tr>
-                            <tr><td>12</td><td>9月14日流行性感冒：157人次</td><td>2018-10-23</td></tr>
-                            <tr><td>13</td><td>9月13日全区传染病发病人数较低</td><td>2018-10-21</td></tr>
+                            	{% for new in news %}
+                            <tr><td>{{new.comment_id}}</td><td>{{new.content}}</td><td>{{new.comment_time}}</td></tr>
+                            	{% endfor %}
                             </tbody>
                         </table>
                     </div>
diff --git a/chapter2/mysite/myapp/views.py b/chapter2/mysite/myapp/views.py
index 754d63a..f398e96 100644
--- a/chapter2/mysite/myapp/views.py
+++ b/chapter2/mysite/myapp/views.py
@@ -13,7 +13,10 @@ def crawl(request):
 	# info = scrapy_client.get_scrapy_info()
 	crawl_info = CrawlInfos.objects.order_by('-id').first()
 	platform_info = get_platform_info()
-	return render(request, 'myapp/crawl.html', {"crawl_info": crawl_info, "platform_info":json.dumps(platform_info)})	
+  news = News.objects.all()
+	return render(request, 'myapp/crawl.html', {"crawl_info": crawl_info, 
+    "platform_info":json.dumps(platform_info),
+    "news": news})	
 
 def result(request):
 	return render(request, 'myapp/result.html')	
\ No newline at end of file