update excel

lib/db.py

@@ -124,7 +124,7 @@ def clearKeyword():
 def getAllKeywordList():
     arr = []
     try:
-        for i in col('keyword').find({},{'keywords':1,'content':1}):
+        for i in col('keyword').find():
             arr.append(i)
     except Exception as e:
         return {'errcode': 901, 'errmsg': 'keyword表获取失败'}

lib/excel.py

@@ -87,7 +87,7 @@ def loadData(file_name, sheet_index):
             # 图文链接
             data["news"]["url"] = row[8].value
             # 图文类型
-            data["news"]["type"] = strToArr(row[9].value)
+            data["news"]["type"] = strToArr(row[9].value) if isinstance(row[9].value,str) else []
             data_list.append(data)
         index += 1
     return data_list
@@ -136,25 +136,25 @@ def createWorkBook(data_list):
         # 遍历数据表
         for keywords in data_list:
             # 第一列放关键词
-            ws.cell(row=index, column= 1).value = data_list['keywords']
+            ws.cell(row=index, column= 1).value = keywords['keywords']
             # 第二列放内容
-            ws.cell(row=index, column= 2).value = data_list['content']
+            ws.cell(row=index, column= 2).value = keywords['content']
             # 浏览量
-            ws.cell(row=index, column= 3).value = data_list["num"]
+            ws.cell(row=index, column= 3).value = keywords["num"]
             # 日期
-            ws.cell(row=index, column= 4).value = data_list["date"]
+            ws.cell(row=index, column= 4).value = keywords["date"]
             # 标题
-            ws.cell(row=index, column= 5).value = data_list["news"]["title"]
+            ws.cell(row=index, column= 5).value = keywords["news"]["title"]
             # 摘要
-            ws.cell(row=index, column= 6).value = data_list["news"]["digest"]
+            ws.cell(row=index, column= 6).value = keywords["news"]["digest"]
             # 更新时间
-            ws.cell(row=index, column= 7).value = data_list["news"]["update_time"]
+            ws.cell(row=index, column= 7).value = keywords["news"]["update_time"]
             # 封面图
-            ws.cell(row=index, column= 8).value = data_list["news"]["cover"]
+            ws.cell(row=index, column= 8).value = keywords["news"]["cover"]
             # 链接
-            ws.cell(row=index, column= 9).value = data_list["news"]["url"]
+            ws.cell(row=index, column= 9).value = keywords["news"]["url"]
             # 类型
-            ws.cell(row=index, column= 10).value = data_list["news"]["type"]
+            ws.cell(row=index, column= 10).value = ' '.join(keywords["news"]["type"])
             index += 1
         # 获取一个唯一的文件名
         new_filename = create_uuid() + '.xlsx'
@@ -164,6 +164,7 @@ def createWorkBook(data_list):
         # 返回给前端的相对地址
         addr = '/excel/get/' + new_filename
     except Exception as e:
+        print(e)
         return {'errcode': 900, 'errmsg': '创建工作簿失败'}
     return {'errcode': 200, 'errmsg': 'ok', 'addr': addr}