添加后端任务相关的搜索接口

DAPlatform/Dao/Task.py

 from peewee import *
 from Dao import User
 import datetime
+import math
 
 mysql = MySQLDatabase(
     'sys',
@@ -17,11 +18,13 @@ class Result:
     code: int
     message: []
     data: {}
+    pages: int
 
-    def __init__(self, code, message, data):
+    def __init__(self, code, message, data, pages):
         self.code = code
         self.message = message
         self.data = data
+        self.pages = pages
 
 
 class Task(Model):
@@ -44,31 +47,55 @@ def create_task(publish_id, slice_number, task_name):
             task = Task(publish_id=publish_id, slice_number=slice_number, task_name=task_name)
             task.save()
         else:
-            return Result(0, "User not exist", {})
+            return Result(0, "User not exist", {}, 0)
     except:
-        return Result(0, "create failed", {})
+        return Result(0, "create failed", {}, 0)
     else:
-        return Result(1, "create success", {})
+        return Result(1, "create success", {}, 0)
 
 
 # 根据任务名称查找任务
-def find_task_by_name(task_name):
+def find_task_by_name(task_name, start, num):
     try:
-        query = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time).where(Task.task_name.contains(task_name)).dicts()
+        find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time).where(Task.task_name.contains(task_name))
+        index = 0
+        list = []
+        while index < len(find) and index < num:
+            list.append(
+                {
+                    'id': find[index+start].task_id,
+                    'creator': find[index+start].publish_id,
+                    'name': find[index+start].task_name,
+                    'date': find[index+start].publish_time.strftime("%Y-%m-%d %H:%M:%S")
+                }
+            )
+            index += 1
     except:
-        return Result(0, "find failed", {})
+        return Result(0, "find failed", {}, 0)
     else:
-        return Result(1, "find success", query)
+        return Result(1, "find success", list, math.ceil(len(find)/num))
 
 
 # 查找所有任务
-def find_task():
+def find_task(start, num):
     try:
-        query = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time).dicts()
+        find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time)
+        index = 0
+        list = []
+        while index < len(find) and index < num:
+            list.append(
+                {
+                    'id': find[index+start].task_id,
+                    'creator': find[index+start].publish_id,
+                    'name': find[index+start].task_name,
+                    'date': find[index+start].publish_time.strftime("%Y-%m-%d %H:%M:%S")
+                }
+            )
+            index += 1
     except:
-        return Result(0, "find failed", {})
+        return Result(0, "find failed", {}, 0)
     else:
-        return Result(1, "find success", query)
+        return Result(1, "find success", list, math.ceil(len(find)/num))
 
 
 # 删除任务
@@ -76,13 +103,14 @@ def delete_task(task_id):
     try:
         Task.delete().where(Task.id == task_id)
     except:
-        return Result(0, "delete failed", {})
+        return Result(0, "delete failed", {}, 0)
     else:
-        return Result(1, "delete success", {})
+        return Result(1, "delete success", {}, 0)
 
 
 if __name__ == '__main__':
+    # 建表
+    # Task.create_table()
     r = find_task()
     for row in r.data:
         print(row)
-    print(len(r.data))

DAPlatform/views/task.py

@@ -14,15 +14,13 @@ def get_tasks():
     pagesize = int(pageSize)
     currentpage = int(currentPage)
     if keyword:
-        ret = Task.find_task_by_name(keyword)
+        ret = Task.find_task_by_name(keyword, pagesize*(currentpage-1), pagesize)
     else:
-        ret = Task.find_task()
-    num = len(ret.data)
-    Num = math.ceil(num/pagesize)
+        ret = Task.find_task(pagesize*(currentpage-1), pagesize)
     res = {
         'code': ret.code,
         'message': ret.message,
-        'tasks': json.dumps(ret.data),
-        'pageNum': Num
+        'tasks': ret.data,
+        'pageNum': ret.pages
     }
     return json.dumps(res)
\ No newline at end of file