dataset改动

DAPlatform/Dao/data_set.py

@@ -4,13 +4,19 @@ host = '47.92.1.107'  # 服务器url
 client = MongoClient(host, 8081)  # 服务器端口
 db = client.da  # 数据库=test
 db.authenticate("admin", "admin")  # 账号密码
-collection_data_set = db.dataset
+collection = db.dataset
 
 
 # 添加用户的数据单
-def insert_data_set(data_set):
+def insert_data_set(user_id, date, data_list):
     try:
-        re = collection_data_set.insert_one(data_set)
+        data_set = {
+            'user_id': user_id,
+            'date': date,
+            'data_list': data_list,
+            'complete': 0,
+        }
+        re = collection.insert_one(data_set)
         return re
     except Exception as e:
         print(e)
@@ -20,10 +26,9 @@ def insert_data_set(data_set):
 # 查找某用户对应的数据单列表
 def find_data_set(user_id):
     try:
-        results = collection_data_set.find({'user_id':user_id})
+        results = collection.find({'user_id': user_id})
         dictionary = []
         for i in results:
-            i.pop("_id")
             dictionary.append(i)
         return dictionary
     except Exception as e:
@@ -31,25 +36,5 @@ def find_data_set(user_id):
         return None
 
 
-# 删除某数据单列表
-def delete_data_set(_id):
-    try:
-        result = collection_data_set.find_one({'data_set_id':_id})
-        collection_data_set.delete_one({'data_set_id': _id})
-        return result
-    except Exception as e:
-        print(e)
-        return None
-
-
 if __name__ == '__main__':
-    data_set1 = {
-        'set_id': 1,
-        'user_id': 1,
-        'name': '2020年08月10日',
-        'document': {
-            'brief_title': '北京河北天津等地出现大到暴雨',
-            'brief_detail': '昨日，北京、天津南部、河北中部及东部、山东南部、内蒙古东部出现大到暴雨'
-        }
-    }
-    insert_data_set(data_set1)
+    print(find_data_set('1007'))