Merge remote-tracking branch 'origin/master'

comData/negative_news/ccpg.py

@@ -141,8 +141,8 @@ def runspider(keyword):
             'source':'中国政府采购网',
             'publishtime':publishtime,
             'detailurl':detailurl,
-            'mapType':'1', #是否有结构化数据
-            'mapmsg':mapmsgList, #结构化数据
+            'ynStructure':'1', #1：是结构化    0：非结构化
+            'structuredData':mapmsgList, #结构化数据
         }
         processitem=getProcessitem(detailmsg)
         sendkafka(processitem)
@@ -165,8 +165,8 @@ def getProcessitem(bdetail):
             "origin":bdetail['source'],
             "publishDate":bdetail['publishtime'],
             "sourceAddress":bdetail['detailurl'],
-            "mapType":bdetail['mapType'],
-            "mapmsg":bdetail['mapmsg'],
+            "ynStructure":bdetail['ynStructure'],
+            "structuredData":bdetail['structuredData'],
             "createDate":nowDate
         }