fix: fix the collection task creation

hefanli · hefanli · commit 26810cf635ea · 2025-12-30T18:37:15.000+08:00
diff --git a/frontend/src/pages/DataCollection/Create/CreateTask.tsx b/frontend/src/pages/DataCollection/Create/CreateTask.tsx
@@ -182,7 +182,7 @@ export default function CollectionTaskCreate() {
     });
 
     return (
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-x-6">
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-2">
         {items}
       </div>
     );
@@ -211,10 +211,11 @@ export default function CollectionTaskCreate() {
       </div>
 
       <div className="flex-overflow-auto border-card">
-        <div className="flex-1 overflow-auto p-6">
+        <div className="flex-1 overflow-auto p-4">
           <Form
             form={form}
             layout="vertical"
+            className="[&_.ant-form-item]:mb-3 [&_.ant-form-item-label]:pb-1"
             initialValues={newTask}
             onValuesChange={(_, allValues) => {
               setNewTask({ ...newTask, ...allValues });
@@ -223,33 +224,36 @@ export default function CollectionTaskCreate() {
             {/* 基本信息 */}
             <h2 className="font-medium text-gray-900 text-lg mb-2">基本信息</h2>
 
-            <Form.Item
-              label="名称"
-              name="name"
-              rules={[{ required: true, message: "请输入任务名称" }]}
-            >
-              <Input placeholder="请输入任务名称" />
-            </Form.Item>
-            <Form.Item label="描述" name="description">
-              <TextArea placeholder="请输入任务描述" rows={3} />
-            </Form.Item>
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-2">
+              <Form.Item
+                label="名称"
+                name="name"
+                rules={[{ required: true, message: "请输入任务名称" }]}
+              >
+                <Input placeholder="请输入任务名称" />
+              </Form.Item>
 
-            <Form.Item
-              label="超时时间（秒）"
-              name="timeoutSeconds"
-              rules={[{ required: true, message: "请输入超时时间" }]}
-              initialValue={3600}
-            >
-              <InputNumber
-                className="w-full"
-                min={1}
-                precision={0}
-                placeholder="默认 3600"
-              />
-            </Form.Item>
+              <Form.Item
+                label="超时时间（秒）"
+                name="timeoutSeconds"
+                rules={[{ required: true, message: "请输入超时时间" }]}
+                initialValue={3600}
+              >
+                <InputNumber
+                  className="w-full"
+                  min={1}
+                  precision={0}
+                  placeholder="默认 3600"
+                />
+              </Form.Item>
+
+              <Form.Item className="md:col-span-2" label="描述" name="description">
+                <TextArea placeholder="请输入任务描述" rows={2} />
+              </Form.Item>
+            </div>
 
             {/* 同步配置 */}
-            <h2 className="font-medium text-gray-900 pt-6 mb-2 text-lg">
+            <h2 className="font-medium text-gray-900 pt-2 mb-1 text-lg">
               同步配置
             </h2>
             <Form.Item name="syncMode" label="同步方式">
@@ -275,7 +279,7 @@ export default function CollectionTaskCreate() {
                 rules={[{ required: true, message: "请输入Cron表达式" }]}
               >
                 <SimpleCronScheduler
-                  className="px-2 rounded"
+                  className="px-2 py-1 rounded"
                   value={scheduleExpression}
                   onChange={(value) => {
                     setScheduleExpression(value);
@@ -289,7 +293,7 @@ export default function CollectionTaskCreate() {
             )}
 
             {/* 模板配置 */}
-            <h2 className="font-medium text-gray-900 pt-6 mb-2 text-lg">
+            <h2 className="font-medium text-gray-900 pt-4 mb-2 text-lg">
               模板配置
             </h2>
 
@@ -372,7 +376,7 @@ export default function CollectionTaskCreate() {
             ) : null}
           </Form>
         </div>
-        <div className="flex gap-2 justify-end border-top p-6">
+        <div className="flex gap-2 justify-end border-top p-4">
           <Button onClick={() => navigate("/data/collection")}>取消</Button>
           <Button type="primary" onClick={handleSubmit}>
             创建任务
diff --git a/runtime/datamate-python/app/module/collection/client/datax_client.py b/runtime/datamate-python/app/module/collection/client/datax_client.py
@@ -155,7 +155,7 @@ def _run_process(self, cmd: list[str], log_f) -> int:
 
         # 创建读取线程
         stdout_thread = threading.Thread(target=lambda stream=process.stdout: self.read_stream(stream, log_f))
-        stderr_thread = threading.Thread(target=lambda stream=process.stdout: self.read_stream(stream, log_f))
+        stderr_thread = threading.Thread(target=lambda stream=process.stderr: self.read_stream(stream, log_f))
 
         stdout_thread.start()
         stderr_thread.start()
diff --git a/runtime/datamate-python/app/module/collection/interface/collection.py b/runtime/datamate-python/app/module/collection/interface/collection.py
@@ -2,7 +2,7 @@
 import uuid
 from typing import Optional
 
-from fastapi import APIRouter, Depends, HTTPException, Query, BackgroundTasks
+from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy import select, func
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -25,7 +25,6 @@
 @router.post("", response_model=StandardResponse[CollectionTaskBase])
 async def create_task(
     request: CollectionTaskCreate,
-    background_tasks: BackgroundTasks,
     db: AsyncSession = Depends(get_db)
 ):
     """创建归集任务"""
@@ -40,7 +39,7 @@ async def create_task(
         task = convert_for_create(request, task_id)
         task.template_name = template.name
 
-        task_service = CollectionTaskService(db, background_tasks)
+        task_service = CollectionTaskService(db)
         task = await task_service.create_task(task)
 
         task = await db.execute(select(CollectionTask).where(CollectionTask.id == task.id))
diff --git a/runtime/datamate-python/app/module/collection/service/collection.py b/runtime/datamate-python/app/module/collection/service/collection.py
@@ -1,6 +1,7 @@
 import asyncio
+from dataclasses import dataclass
+from typing import Any, Optional
 
-from fastapi import BackgroundTasks
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -13,10 +14,29 @@
 
 logger = get_logger(__name__)
 
+
+@dataclass
+class _RuntimeTask:
+    id: str
+    config: str
+    timeout_seconds: int
+    sync_mode: str
+    status: Optional[str] = None
+
+
+@dataclass
+class _RuntimeExecution:
+    id: str
+    log_path: str
+    started_at: Optional[Any] = None
+    completed_at: Optional[Any] = None
+    duration_seconds: Optional[float] = None
+    error_message: Optional[str] = None
+    status: Optional[str] = None
+
 class CollectionTaskService:
-    def __init__(self, db: AsyncSession, background_tasks: BackgroundTasks = None):
+    def __init__(self, db: AsyncSession):
         self.db = db
-        self.background_tasks = background_tasks
 
     async def create_task(self, task: CollectionTask) -> CollectionTask:
         self.db.add(task)
@@ -25,7 +45,7 @@ async def create_task(self, task: CollectionTask) -> CollectionTask:
         if task.sync_mode == SyncMode.ONCE:
             task.status = TaskStatus.RUNNING.name
             await self.db.commit()
-            asyncio.create_task(self.run_async(task.id))
+            asyncio.create_task(CollectionTaskService.run_async(task.id))
         return task
 
     @staticmethod
@@ -44,5 +64,7 @@ async def run_async(task_id: str):
             task_execution = create_execute_record(task)
             session.add(task_execution)
             await session.commit()
-            DataxClient(execution=task_execution, task=task).run_datax_job()
+            await asyncio.to_thread(
+                DataxClient(execution=task_execution, task=task).run_datax_job
+            )
             await session.commit()
