Merge remote-tracking branch 'gitea/lsf' into lsf

backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/mapper/DatasetFileMapper.java

@@ -46,4 +46,13 @@ public interface DatasetFileMapper extends BaseMapper<DatasetFile> {
      * @return 文件数统计列表
      */
     List<DatasetFileCount> countNonDerivedByDatasetIds(@Param("datasetIds") List<String> datasetIds);
+
+    /**
+     * 查询指定逻辑路径的所有文件（包括所有状态）
+     *
+     * @param datasetId 数据集ID
+     * @param logicalPath 逻辑路径
+     * @return 文件列表
+     */
+    List<DatasetFile> findAllByDatasetIdAndLogicalPath(@Param("datasetId") String datasetId, @Param("logicalPath") String logicalPath);
 }

backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/DatasetFileRepository.java

@@ -37,6 +37,15 @@ public interface DatasetFileRepository extends IRepository<DatasetFile> {
      */
     DatasetFile findLatestByDatasetIdAndLogicalPath(String datasetId, String logicalPath);
 
+    /**
+     * 查询指定逻辑路径的所有文件（包括所有状态）
+     *
+     * @param datasetId 数据集ID
+     * @param logicalPath 逻辑路径
+     * @return 文件列表
+     */
+    List<DatasetFile> findAllByDatasetIdAndLogicalPath(String datasetId, String logicalPath);
+
     IPage<DatasetFile> findByCriteria(String datasetId, String fileType, String status, String name,
                                       Boolean hasAnnotation, IPage<DatasetFile> page);
 

backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/persistence/repository/impl/DatasetFileRepositoryImpl.java

@@ -84,6 +84,11 @@ public class DatasetFileRepositoryImpl extends CrudRepository<DatasetFileMapper,
             .last("LIMIT 1"));
     }
 
+    @Override
+    public List<DatasetFile> findAllByDatasetIdAndLogicalPath(String datasetId, String logicalPath) {
+        return datasetFileMapper.findAllByDatasetIdAndLogicalPath(datasetId, logicalPath);
+    }
+
     public IPage<DatasetFile> findByCriteria(String datasetId, String fileType, String status, String name,
                                              Boolean hasAnnotation, IPage<DatasetFile> page) {
         LambdaQueryWrapper<DatasetFile> wrapper = new LambdaQueryWrapper<DatasetFile>()

backend/services/data-management-service/src/main/resources/mappers/DatasetFileMapper.xml

@@ -64,7 +64,7 @@
           AND (status IS NULL OR status <> 'ARCHIVED')
     </select>
 
-  <select id="findByDatasetIdAndFileName" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
+   <select id="findByDatasetIdAndFileName" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
         SELECT <include refid="Base_Column_List"/>
         FROM t_dm_dataset_files
         WHERE dataset_id = #{datasetId}
@@ -74,8 +74,16 @@
         LIMIT 1
     </select>
 
-  <select id="findAllByDatasetId" parameterType="string"
+   <select id="findAllByDatasetIdAndLogicalPath" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
-          resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
+        SELECT <include refid="Base_Column_List"/>
+        FROM t_dm_dataset_files
+        WHERE dataset_id = #{datasetId}
+          AND logical_path = #{logicalPath}
+        ORDER BY version DESC, upload_time DESC
+    </select>
+
+   <select id="findAllByDatasetId" parameterType="string"
+           resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
         SELECT <include refid="Base_Column_List"/>
         FROM t_dm_dataset_files
         WHERE dataset_id = #{datasetId}