feature: 清洗任务详情

hhhhsc701 · hhhhsc701 · commit e656935adbc5 · 2025-11-10T14:40:36.000+08:00
diff --git a/backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/application/CleaningTaskService.java b/backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/application/CleaningTaskService.java
@@ -48,7 +48,7 @@
 @Service
 @RequiredArgsConstructor
 public class CleaningTaskService {
-    private final CleaningTaskRepository CleaningTaskRepo;
+    private final CleaningTaskRepository cleaningTaskRepo;
 
     private final OperatorInstanceRepository operatorInstanceRepo;
 
@@ -67,7 +67,7 @@ public class CleaningTaskService {
     private final String FLOW_PATH = "/flow";
 
     public List<CleaningTaskDto> getTasks(String status, String keywords, Integer page, Integer size) {
-        List<CleaningTaskDto> tasks = CleaningTaskRepo.findTasks(status, keywords, page, size);
+        List<CleaningTaskDto> tasks = cleaningTaskRepo.findTasks(status, keywords, page, size);
         tasks.forEach(this::setProcess);
         return tasks;
     }
@@ -78,7 +78,7 @@ private void setProcess(CleaningTaskDto task) {
     }
 
     public int countTasks(String status, String keywords) {
-        return CleaningTaskRepo.findTasks(status, keywords, null, null).size();
+        return cleaningTaskRepo.findTasks(status, keywords, null, null).size();
     }
 
     @Transactional
@@ -105,7 +105,7 @@ public CleaningTaskDto createTask(CreateCleaningTaskRequest request) {
         task.setDestDatasetName(destDataset.getName());
         task.setBeforeSize(srcDataset.getSizeBytes());
         task.setFileCount(srcDataset.getFileCount().intValue());
-        CleaningTaskRepo.insertTask(task);
+        cleaningTaskRepo.insertTask(task);
 
         operatorInstanceRepo.insertInstance(taskId, request.getInstance());
 
@@ -116,14 +116,15 @@ public CleaningTaskDto createTask(CreateCleaningTaskRequest request) {
     }
 
     public CleaningTaskDto getTask(String taskId) {
-        CleaningTaskDto task = CleaningTaskRepo.findTaskById(taskId);
+        CleaningTaskDto task = cleaningTaskRepo.findTaskById(taskId);
+        operatorInstanceRepo.
         setProcess(task);
         return task;
     }
 
     @Transactional
     public void deleteTask(String taskId) {
-        CleaningTaskRepo.deleteTaskById(taskId);
+        cleaningTaskRepo.deleteTaskById(taskId);
         operatorInstanceRepo.deleteByInstanceId(taskId);
         cleaningResultRepo.deleteByInstanceId(taskId);
     }
diff --git a/backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/infrastructure/persistence/Impl/OperatorInstanceRepositoryImpl.java b/backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/infrastructure/persistence/Impl/OperatorInstanceRepositoryImpl.java
@@ -37,4 +37,11 @@ public void deleteByInstanceId(String instanceId) {
         lambdaWrapper.eq(OperatorInstance::getInstanceId, instanceId);
         mapper.delete(lambdaWrapper);
     }
+
+    public void findByInstanceId(String instanceId) {
+        LambdaQueryWrapper<OperatorInstance> lambdaWrapper = new LambdaQueryWrapper<>();
+        lambdaWrapper.eq(OperatorInstance::getInstanceId, instanceId);
+        List<OperatorInstance> operatorInstances = mapper.selectList(lambdaWrapper);
+
+    }
 }
diff --git a/frontend/src/pages/DataCleansing/Detail/components/BasicInfo.tsx b/frontend/src/pages/DataCleansing/Detail/components/BasicInfo.tsx
@@ -3,6 +3,7 @@ import { OperatorI } from "@/pages/OperatorMarket/operator.model";
 import { Button, Card, Descriptions, Progress, Tag } from "antd";
 import { Activity, AlertCircle, CheckCircle, Clock } from "lucide-react";
 import { useNavigate } from "react-router";
+import {formatExecutionDuration} from "@/utils/unit.ts";
 
 export default function BasicInfo({ task }: { task: CleansingTask }) {
   const navigate = useNavigate();
@@ -11,14 +12,15 @@ export default function BasicInfo({ task }: { task: CleansingTask }) {
     {
       key: "id",
       label: "任务ID",
-      children: <span className="font-mono">#{task?.id}</span>,
+      children: <span className="font-mono">{task?.id}</span>,
     },
     { key: "name", label: "任务名称", children: task?.name },
     {
       key: "dataset",
       label: "源数据集",
       children: (
         <Button
+          style={{ paddingLeft: 0, marginLeft: 0 }}
           type="link"
           size="small"
           onClick={() =>
@@ -34,6 +36,7 @@ export default function BasicInfo({ task }: { task: CleansingTask }) {
       label: "目标数据集",
       children: (
         <Button
+          style={{ paddingLeft: 0, marginLeft: 0 }}
           type="link"
           size="small"
           onClick={() =>
@@ -44,26 +47,13 @@ export default function BasicInfo({ task }: { task: CleansingTask }) {
         </Button>
       ),
     },
-    { key: "template", label: "使用模板", children: task?.template },
+    { key: "template", label: "使用模板", children: ( task?.description || "--" ) },
     { key: "startTime", label: "开始时间", children: task?.startedAt },
-    { key: "estimatedTime", label: "预计用时", children: task?.estimatedTime },
     {
       key: "description",
       label: "任务描述",
       children: (
-        <span className="text-gray-600">{task?.description || "暂无描述"}</span>
-      ),
-      span: 2,
-    },
-    {
-      key: "rules",
-      label: "处理算子",
-      children: (
-        <div className="flex flex-wrap gap-1">
-          {task?.instance?.map?.((op: OperatorI) => (
-            <Tag key={op.id}>{op.name}</Tag>
-          ))}
-        </div>
+        <span className="text-gray-600">{task?.description || "--"}</span>
       ),
       span: 2,
     },
@@ -77,28 +67,28 @@ export default function BasicInfo({ task }: { task: CleansingTask }) {
           <div className="text-center p-4 bg-gradient-to-br from-blue-50 to-blue-100 rounded-lg">
             <Clock className="w-8 h-8 text-blue-500 mb-2 mx-auto" />
             <div className="text-xl font-bold text-blue-500">
-              {task?.duration || "--"}
+              {formatExecutionDuration(task?.startedAt, task?.finishedAt) || "--"}
             </div>
             <div className="text-sm text-gray-600">总耗时</div>
           </div>
           <div className="text-center p-4 bg-gradient-to-br from-green-50 to-green-100 rounded-lg">
             <CheckCircle className="w-8 h-8 text-green-500 mb-2 mx-auto" />
             <div className="text-xl font-bold text-green-500">
-              {task?.successFiles || "--"}
+              {task?.progress?.finishedFileNum || "0"}
             </div>
             <div className="text-sm text-gray-600">成功文件</div>
           </div>
           <div className="text-center p-4 bg-gradient-to-br from-red-50 to-red-100 rounded-lg">
             <AlertCircle className="w-8 h-8 text-red-500 mb-2 mx-auto" />
             <div className="text-xl font-bold text-red-500">
-              {task?.failedFiles || "--"}
+              {task?.progress?.totalFileNum - task?.progress?.finishedFileNum || "0"}
             </div>
             <div className="text-sm text-gray-600">失败文件</div>
           </div>
           <div className="text-center p-4 bg-gradient-to-br from-purple-50 to-purple-100 rounded-lg">
             <Activity className="w-8 h-8 text-purple-500 mb-2 mx-auto" />
             <div className="text-xl font-bold text-purple-500">
-              {task?.progress || "--"}
+              {task?.progress?.process || "--"}
             </div>
             <div className="text-sm text-gray-600">成功率</div>
           </div>
@@ -120,21 +110,15 @@ export default function BasicInfo({ task }: { task: CleansingTask }) {
         {/* 处理进度 */}
         <div>
           <h3 className="text-lg font-semibold text-gray-900 mb-4">处理进度</h3>
-          <Progress percent={task?.progress} showInfo />
+          <Progress percent={task?.progress?.process} showInfo />
           <div className="grid grid-cols-2 gap-4 text-sm mt-4">
             <div className="flex items-center gap-2">
               <span className="w-3 h-3 bg-green-500 rounded-full inline-block" />
-              <span>已完成: {task?.processedFiles || "--"}</span>
+              <span>已完成: {task?.progress?.finishedFileNum || "0"}</span>
             </div>
             <div className="flex items-center gap-2">
               <span className="w-3 h-3 bg-blue-500 rounded-full inline-block" />
-              <span>处理中: {task?.processingFiles || "--"}</span>
-            </div>
-            <div className="flex items-center gap-2">
-              <span className="w-3 h-3 bg-gray-300 rounded-full inline-block" />
-              <span>
-                待处理: {task?.totalFiles - task?.processedFiles || "--"}
-              </span>
+              <span>处理中: {task?.progress?.totalFileNum - task?.progress?.finishedFileNum || "0"}</span>
             </div>
             <div className="flex items-center gap-2">
               <span className="w-3 h-3 bg-red-500 rounded-full inline-block" />
diff --git a/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx b/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx
@@ -106,6 +106,18 @@ export default function TaskList() {
       fixed: "left",
       width: 150,
       ellipsis: true,
+      render: (_, task: CleansingTask) => {
+        return (
+          <Button
+            type="link"
+            onClick={() =>
+              navigate("/data/cleansing/task-detail/" + task.id)
+            }
+          >
+            {task.name}
+          </Button>
+        );
+      },
     },
     {
       title: "任务ID",
@@ -273,6 +285,9 @@ export default function TaskList() {
           data={tableData}
           operations={taskOperations}
           pagination={pagination}
+          onView={(tableData) => {
+            navigate("/data/cleansing/task-detail/" + tableData.id)
+          }}
         />
       ) : (
         <Card>
diff --git a/frontend/src/pages/OperatorMarket/Home/components/List.tsx b/frontend/src/pages/OperatorMarket/Home/components/List.tsx
@@ -110,9 +110,6 @@ export function ListView({ operators = [], pagination, operations }) {
                   {operator.name}
                 </span>
                 <Tag color="default">v{operator.version}</Tag>
-                <Badge color={getStatusBadge(operator.status).color}>
-                  {getStatusBadge(operator.status).label}
-                </Badge>
               </div>
             }
             description={

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,11 @@ public void deleteByInstanceId(String instanceId) {`
`37`	`37`	`lambdaWrapper.eq(OperatorInstance::getInstanceId, instanceId);`
`38`	`38`	`mapper.delete(lambdaWrapper);`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ public void findByInstanceId(String instanceId) {`
	`42`	`+ LambdaQueryWrapper<OperatorInstance> lambdaWrapper = new LambdaQueryWrapper<>();`
	`43`	`+ lambdaWrapper.eq(OperatorInstance::getInstanceId, instanceId);`
	`44`	`+ List<OperatorInstance> operatorInstances = mapper.selectList(lambdaWrapper);`
	`45`	`+`
	`46`	`+ }`
`40`	`47`	`}`