Merge remote-tracking branch 'origin/develop_930' into develop_930

Author: hefanli

backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/application/service/CleaningTaskService.java

@@ -9,6 +9,7 @@
 import com.dataengine.cleaning.domain.model.OperatorInstancePo;
 import com.dataengine.cleaning.domain.model.PagedDatasetFileResponse;
 import com.dataengine.cleaning.domain.model.TaskProcess;
+import com.dataengine.cleaning.infrastructure.persistence.mapper.CleaningResultMapper;
 import com.dataengine.cleaning.infrastructure.persistence.mapper.CleaningTaskMapper;
 import com.dataengine.cleaning.infrastructure.persistence.mapper.OperatorInstanceMapper;
 import com.dataengine.cleaning.interfaces.dto.CleaningTask;
@@ -44,6 +45,8 @@ public class CleaningTaskService {
 
     private final OperatorInstanceMapper operatorInstanceMapper;
 
+    private final CleaningResultMapper cleaningResultMapper;
+
     private final CleaningTaskScheduler taskScheduler;
 
     private final String DATASET_PATH = "/dataset";
@@ -94,6 +97,8 @@ public CleaningTask getTask(String taskId) {
     @Transactional
     public void deleteTask(String taskId) {
         cleaningTaskMapper.deleteTask(taskId);
+        operatorInstanceMapper.deleteByInstanceId(taskId);
+        cleaningResultMapper.deleteByInstanceId(taskId);
     }
 
     public void executeTask(String taskId) {

backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/application/service/CleaningTemplateService.java

@@ -90,5 +90,6 @@ public CleaningTemplate updateTemplate(String templateId, UpdateCleaningTemplate
     @Transactional
     public void deleteTemplate(String templateId) {
         cleaningTemplateMapper.deleteTemplate(templateId);
+        operatorInstanceMapper.deleteByInstanceId(templateId);
     }
 }

backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/infrastructure/persistence/mapper/CleaningResultMapper.java

@@ -0,0 +1,9 @@
+package com.dataengine.cleaning.infrastructure.persistence.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface CleaningResultMapper {
+    void deleteByInstanceId(@Param("instanceId") String instanceId);
+}

backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/infrastructure/persistence/mapper/OperatorInstanceMapper.java

@@ -10,6 +10,8 @@
 @Mapper
 public interface OperatorInstanceMapper {
 
-    void insertInstance(@Param("instance_id") String instance_id,
+    void insertInstance(@Param("instanceId") String instanceId,
                         @Param("instances") List<OperatorInstancePo> instances);
+
+    void deleteByInstanceId(@Param("instanceId") String instanceId);
 }

backend/services/data-cleaning-service/src/main/java/com/dataengine/cleaning/interfaces/api/CleaningTemplateController.java

@@ -35,12 +35,13 @@ public ResponseEntity<Response<PagedResponse<CleaningTemplate>>> cleaningTemplat
             @RequestParam(value = "keywords", required = false) String keyword) {
         List<CleaningTemplate> templates = cleaningTemplateService.getTemplates(keyword);
         if (page == null || size == null) {
-            return ResponseEntity.ok(Response.ok(PagedResponse.of(templates)));
+            return ResponseEntity.ok(Response.ok(PagedResponse.of(templates.stream()
+                    .sorted(Comparator.comparing(CleaningTemplate::getCreatedAt).reversed()).toList())));
         }
         int count = templates.size();
         int totalPages = (count + size + 1) / size;
         List<CleaningTemplate> limitTemplates = templates.stream()
-                .sorted(Comparator.comparing(CleaningTemplate::getCreatedAt))
+                .sorted(Comparator.comparing(CleaningTemplate::getCreatedAt).reversed())
                 .skip((long) page * size)
                 .limit(size).toList();
         return ResponseEntity.ok(Response.ok(PagedResponse.of(limitTemplates, page, count, totalPages)));

backend/services/data-cleaning-service/src/main/resources/mappers/CleaningResultMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dataengine.cleaning.infrastructure.persistence.mapper.CleaningResultMapper">
+    <delete id="deleteByInstanceId">
+        DELETE FROM t_clean_result WHERE instance_id = #{instanceId}
+    </delete>
+
+</mapper>

backend/services/data-cleaning-service/src/main/resources/mappers/CleaningTaskMapper.xml

@@ -16,7 +16,7 @@
                 AND name LIKE CONCAT('%', #{keywords}, '%')
             </if>
         </where>
-        ORDER BY created_at
+        ORDER BY created_at DESC
         <if test="size != null and offset != null">
             LIMIT ${size} OFFSET ${offset}
         </if>

backend/services/data-cleaning-service/src/main/resources/mappers/CleaningTemplateMapper.xml

@@ -10,7 +10,7 @@
                 AND name LIKE CONCAT('%', #{keywords}, '%')
             </if>
         </where>
-        ORDER BY created_at
+        ORDER BY created_at DESC
     </select>
 
     <select id="findAllOperators" resultType="com.dataengine.cleaning.interfaces.dto.OperatorResponse">

backend/services/data-cleaning-service/src/main/resources/mappers/OperatorInstanceMapper.xml

@@ -4,9 +4,13 @@
     <insert id="insertInstance">
         INSERT INTO t_operator_instance(instance_id, operator_id, op_index, settings_override)
         VALUES
-        <foreach collection="instances" item="instance" separator="," index="index">
-            (#{instance_id}, #{instance.id}, #{index} + 1, #{instance.overrides})
+        <foreach collection="instances" item="operator" separator="," index="index">
+            (#{instanceId}, #{operator.id}, #{index} + 1, #{operator.overrides})
         </foreach>
     </insert>
 
+    <delete id="deleteByInstanceId">
+        DELETE FROM t_operator_instance
+        WHERE instance_id = #{instanceId};
+    </delete>
 </mapper>