From 9cf9b5367181535768c093bf0f48c1b5d3bd13ff Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 5 Nov 2024 00:46:25 +0800
Subject: [PATCH] update

---
 web/admin/task/__init__.py | 10 +++++-----
 web/thisdb/tasks.py        | 28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py
index d0cff30e3..e06404184 100644
--- a/web/admin/task/__init__.py
+++ b/web/admin/task/__init__.py
@@ -47,15 +47,15 @@ def get_exec_log():
 @blueprint.route('/get_task_speed', endpoint='get_task_speed', methods=['POST'])
 @panel_login_required
 def get_task_speed():
-    count = model.getTaskUnexecutedCount()
+    count = thisdb.getTaskUnexecutedCount()
     if count == 0:
         return mw.returnData(False, '当前没有任务队列在执行-2!')
     
-    row = model.getTaskFirstByRun()
+    row = thisdb.getTaskFirstByRun()
     if row is None:
         return mw.returnData(False, '当前没有任务队列在执行-3!')
 
-    task_logfile = mw.getPanelTaskLog()
+    task_logfile = thisdb.getPanelTaskLog()
 
     data = {}
     data['name'] = row['name']
@@ -72,7 +72,7 @@ def get_task_speed():
                     break
             except Exception as e:
                 if i == 2:
-                    model.setTaskStatus(row['id'],0)
+                    thisdb.setTaskStatus(row['id'],0)
                     return mw.returnData(False, '当前没有任务队列在执行-4:' + str(e))
             time.sleep(0.5)
     else:
@@ -80,7 +80,7 @@ def get_task_speed():
         data['isDownload'] = False
 
 
-    data['task'] = model.getTaskRunList()
+    data['task'] = thisdb.getTaskRunList()
     return data
 
 @blueprint.route('/remove_task', endpoint='remove_task', methods=['POST'])
diff --git a/web/thisdb/tasks.py b/web/thisdb/tasks.py
index 59168762d..2f551204a 100644
--- a/web/thisdb/tasks.py
+++ b/web/thisdb/tasks.py
@@ -10,6 +10,12 @@
 
 import core.mw as mw
 
+def getTaskCount(
+        status: int | None = -1
+    ) -> int:
+    return mw.M('tasks').where('status=?',(1,)).count()
+
+
 # 未执行任务总数
 def getTaskUnexecutedCount() -> int:
     return mw.M('tasks').where('status!=?',(1,)).count()
@@ -60,6 +66,28 @@ def getTaskList(
     rdata['count'] = count
     return rdata
 
+def getTaskFirstByRun() -> None:
+    field = 'id,name,type,start,end,status,add_time'
+    data = mw.M('tasks').where('status=?', (-1,)).field(field).order('id asc').find()
+    if item is None:
+        return None
+    return data
+
+def getTaskRunList(
+    page: int | None = 1,
+    size: int | None = 10,
+):
+    start = (page - 1) * size
+    limit = str(start) + ',' + str(size)
+
+    field = 'id,name,type,start,end,status,add_time'
+    task_list = mw.M('tasks').where('', ()).field(field).limit(limit).order('id desc').select()
+    count = mw.M('tasks').where('', ()).count()
+
+    rdata = {}
+    rdata['list'] = task_list
+    rdata['count'] = count
+    return rdata
 
 
 def setTaskStatus(id,