From b7790f589d0c54e90e9a2a25405965acf23877ae Mon Sep 17 00:00:00 2001
From: "Autumn.home" <autumn@home.com>
Date: Sat, 6 Jul 2024 23:11:27 +0800
Subject: [PATCH] add

---
 api/asset_info.py      | 12 ++----------
 api/page_monitoring.py | 14 ++------------
 api/project.py         | 24 ++++++++++++++----------
 core/util.py           | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/api/asset_info.py b/api/asset_info.py
index 3411d17..9bfddb2 100644
--- a/api/asset_info.py
+++ b/api/asset_info.py
@@ -371,19 +371,11 @@ async def url_data(request_data: dict, db=Depends(get_mongo_db), _: dict = Depen
 @router.post("/crawler/data")
 async def crawler_data(request_data: dict, db=Depends(get_mongo_db), _: dict = Depends(verify_token)):
     try:
-        search_query = request_data.get("search", "")
         page_index = request_data.get("pageIndex", 1)
         page_size = request_data.get("pageSize", 10)
-        keyword = {
-            'url': 'url',
-            'method': 'method',
-            'body': 'body',
-            'project': 'project'
-        }
-        query = await search_to_mongodb(search_query, keyword)
-        if query == "" or query is None:
+        query = await get_search_query("crawler", request_data)
+        if query == "":
             return {"message": "Search condition parsing error", "code": 500}
-        query = query[0]
         total_count = await db['crawler'].count_documents(query)
         cursor: AsyncIOMotorCursor = ((db['crawler'].find(query, {"_id": 0,
                                                                   "id": {"$toString": "$_id"},
diff --git a/api/page_monitoring.py b/api/page_monitoring.py
index eb3c729..944c79b 100644
--- a/api/page_monitoring.py
+++ b/api/page_monitoring.py
@@ -31,21 +31,11 @@ async def get_page_monitoring_data(db, all):
 
 @router.post("/page/monitoring/result")
 async def page_monitoring_result(request_data: dict, db=Depends(get_mongo_db), _: dict = Depends(verify_token)):
-    search_query = request_data.get("search", "")
     page_index = request_data.get("pageIndex", 1)
     page_size = request_data.get("pageSize", 10)
-    keyword = {
-        'url': 'url',
-        'project': 'project',
-        'hash': 'hash',
-        'diff': 'diff',
-        'response': 'response'
-    }
-    query = await search_to_mongodb(search_query, keyword)
-    if query == "" or query is None:
+    query = await get_search_query("page", request_data)
+    if query == "":
         return {"message": "Search condition parsing error", "code": 500}
-    query = query[0]
-    # Get the total count of documents matching the search criteria
     query["diff"] = {"$ne": []}
     total_count = await db.PageMonitoring.count_documents(query)
     # Perform pagination query and sort by time
diff --git a/api/project.py b/api/project.py
index 4ce2285..a07a58a 100644
--- a/api/project.py
+++ b/api/project.py
@@ -84,16 +84,20 @@ async def get_projects_data(request_data: dict, db=Depends(get_mongo_db), _: dic
 async def get_projects_all(db=Depends(get_mongo_db), _: dict = Depends(verify_token)):
     try:
         pipeline = [
-            {"$group": {
-                "_id": "$tag",  # 根据 tag 字段分组
-                "children": {"$push": {"value": {"$toString": "$_id"}, "label": "$name"}}  # 将每个文档的 _id 和 name 放入 children 集合中
-            }},
-            {"$project": {
-                "_id": 0,
-                "label": "$_id",
-                "value": {"$literal": ""},
-                "children": 1
-            }}
+            {
+                "$group": {
+                    "_id": "$tag",  # 根据 tag 字段分组
+                    "children": {"$push": {"value": {"$toString": "$_id"}, "label": "$name"}}  # 将每个文档的 _id 和 name 放入 children 集合中
+                }
+            },
+            {
+                "$project": {
+                    "_id": 0,
+                    "label": "$_id",
+                    "value": {"$literal": ""},
+                    "children": 1
+                }
+            }
         ]
         result = await db['project'].aggregate(pipeline).to_list(None)
         return {
diff --git a/core/util.py b/core/util.py
index b34b67f..2ecca04 100644
--- a/core/util.py
+++ b/core/util.py
@@ -321,6 +321,7 @@ async def search_to_mongodb(expression_raw, keyword):
         logger.error(e)
         return ""
 
+
 async def get_search_query(name, request_data):
     search_query = request_data.get("search", "")
     search_key_v = {
@@ -382,6 +383,19 @@ async def get_search_query(name, request_data):
             'input': 'input',
             'source': 'source',
             "type": "outputtype"
+        },
+        'page': {
+            'url': 'url',
+            'project': 'project',
+            'hash': 'hash',
+            'diff': 'diff',
+            'response': 'response'
+        },
+        'crawler': {
+            'url': 'url',
+            'method': 'method',
+            'body': 'body',
+            'project': 'project'
         }
     }
     keyword = search_key_v[name]