Skip to content

Commit ac5768e

Browse files
Dallas98Dallas98
authored
Merge pull request #5 from ModelEngine-Group/develop_930_gfl
feature:修改代码实现，数据管理不基于yaml进行代码生成
2 parents b6ea0a7 + 9c716b8 commit ac5768e

File tree

24 files changed

+615
-254
lines changed

24 files changed

+615
-254
lines changed

‎backend/services/data-management-service/pom.xml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,31 +75,6 @@
7575
<classifier>exec</classifier>
7676
</configuration>
7777
</plugin>
78-
<plugin>
79-
<groupId>org.openapitools</groupId>
80-
<artifactId>openapi-generator-maven-plugin</artifactId>
81-
<version>6.6.0</version>
82-
<executions>
83-
<execution>
84-
<goals>
85-
<goal>generate</goal>
86-
</goals>
87-
<configuration>
88-
<inputSpec>${project.basedir}/../../openapi/specs/data-management.yaml</inputSpec>
89-
<generatorName>spring</generatorName>
90-
<output>${project.build.directory}/generated-sources/openapi</output>
91-
<apiPackage>com.dataengine.datamanagement.interfaces.api</apiPackage>
92-
<modelPackage>com.dataengine.datamanagement.interfaces.dto</modelPackage>
93-
<configOptions>
94-
<interfaceOnly>true</interfaceOnly>
95-
<useTags>true</useTags>
96-
<useSpringBoot3>true</useSpringBoot3>
97-
<documentationProvider>springdoc</documentationProvider>
98-
</configOptions>
99-
</configuration>
100-
</execution>
101-
</executions>
102-
</plugin>
10378
</plugins>
10479
</build>
10580
</project>

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/application/service/DatasetApplicationService.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.dataengine.datamanagement.infrastructure.persistence.mapper.DatasetFileMapper;
77
import com.dataengine.datamanagement.infrastructure.persistence.mapper.DatasetMapper;
88
import com.dataengine.datamanagement.infrastructure.persistence.mapper.TagMapper;
9+
import com.dataengine.datamanagement.interfaces.dto.AllDatasetStatisticsResponse;
910
import org.apache.ibatis.session.RowBounds;
1011
import org.springframework.beans.factory.annotation.Autowired;
1112
import org.springframework.data.domain.Page;
@@ -240,4 +241,11 @@ public Map<String, Object> getDatasetStatistics(String datasetId) {
240241

241242
return statistics;
242243
}
244+
245+
/**
246+
* 获取所有数据集的汇总统计信息
247+
*/
248+
public AllDatasetStatisticsResponse getAllDatasetStatistics() {
249+
return datasetMapper.getAllDatasetStatistics();
250+
}
243251
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/infrastructure/persistence/mapper/DatasetMapper.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.dataengine.datamanagement.infrastructure.persistence.mapper;
22

33
import com.dataengine.datamanagement.domain.model.dataset.Dataset;
4+
import com.dataengine.datamanagement.interfaces.dto.AllDatasetStatisticsResponse;
45
import org.apache.ibatis.annotations.Mapper;
56
import org.apache.ibatis.annotations.Param;
67
import org.apache.ibatis.session.RowBounds;
@@ -29,4 +30,5 @@ long countByCriteria(@Param("typeCode") String typeCode,
2930
int insert(Dataset dataset);
3031
int update(Dataset dataset);
3132
int deleteById(@Param("id") String id);
33+
AllDatasetStatisticsResponse getAllDatasetStatistics();
3234
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/dto/AllDatasetStatisticsResponse.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.dataengine.datamanagement.interfaces.dto;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
6+
/**
7+
* 所有数据集统计信息响应DTO
8+
*/
9+
@Getter
10+
@Setter
11+
public class AllDatasetStatisticsResponse {
12+
/** 总数据集数 */
13+
private Integer totalDatasets;
14+
15+
/** 总文件数 */
16+
private Long totalSize;
17+
18+
/** 总大小（字节） */
19+
private Long totalFiles;
20+
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/dto/CreateDatasetRequest.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.dataengine.datamanagement.interfaces.dto;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
6+
import java.util.List;
7+
8+
/**
9+
* 创建数据集请求DTO
10+
*/
11+
@Getter
12+
@Setter
13+
public class CreateDatasetRequest {
14+
/** 数据集名称 */
15+
private String name;
16+
/** 数据集描述 */
17+
private String description;
18+
/** 数据集类型 */
19+
private String type;
20+
/** 标签列表 */
21+
private List<String> tags;
22+
/** 数据源 */
23+
private String dataSource;
24+
/** 目标位置 */
25+
private String targetLocation;
26+
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/dto/CreateTagRequest.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.dataengine.datamanagement.interfaces.dto;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
6+
/**
7+
* 创建标签请求DTO
8+
*/
9+
@Getter
10+
@Setter
11+
public class CreateTagRequest {
12+
/** 标签名称 */
13+
private String name;
14+
/** 标签颜色 */
15+
private String color;
16+
/** 标签描述 */
17+
private String description;
18+
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/dto/DatasetFileResponse.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.dataengine.datamanagement.interfaces.dto;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
import java.time.LocalDateTime;
6+
7+
/**
8+
* 数据集文件响应DTO
9+
*/
10+
@Getter
11+
@Setter
12+
public class DatasetFileResponse {
13+
/** 文件ID */
14+
private String id;
15+
/** 文件名 */
16+
private String fileName;
17+
/** 原始文件名 */
18+
private String originalName;
19+
/** 文件类型 */
20+
private String fileType;
21+
/** 文件大小（字节） */
22+
private Long size;
23+
/** 文件状态 */
24+
private String status;
25+
/** 文件描述 */
26+
private String description;
27+
/** 文件路径 */
28+
private String filePath;
29+
/** 上传时间 */
30+
private LocalDateTime uploadedAt;
31+
/** 上传者 */
32+
private String uploadedBy;
33+
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/dto/DatasetResponse.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.dataengine.datamanagement.interfaces.dto;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
6+
import java.time.LocalDateTime;
7+
import java.util.List;
8+
9+
/**
10+
* 数据集响应DTO
11+
*/
12+
@Getter
13+
@Setter
14+
public class DatasetResponse {
15+
/** 数据集ID */
16+
private String id;
17+
/** 数据集名称 */
18+
private String name;
19+
/** 数据集描述 */
20+
private String description;
21+
/** 数据集类型 */
22+
private DatasetTypeResponse type;
23+
/** 数据集状态 */
24+
private String status;
25+
/** 标签列表 */
26+
private List<TagResponse> tags;
27+
/** 数据源 */
28+
private String dataSource;
29+
/** 目标位置 */
30+
private String targetLocation;
31+
/** 文件数量 */
32+
private Integer fileCount;
33+
/** 总大小（字节） */
34+
private Long totalSize;
35+
/** 完成率（0-100） */
36+
private Float completionRate;
37+
/** 创建时间 */
38+
private LocalDateTime createdAt;
39+
/** 更新时间 */
40+
private LocalDateTime updatedAt;
41+
/** 创建者 */
42+
private String createdBy;
43+
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/dto/DatasetStatisticsResponse.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.dataengine.datamanagement.interfaces.dto;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
import java.util.Map;
6+
7+
/**
8+
* 数据集统计信息响应DTO
9+
*/
10+
@Getter
11+
@Setter
12+
public class DatasetStatisticsResponse {
13+
/** 总文件数 */
14+
private Integer totalFiles;
15+
/** 已完成文件数 */
16+
private Integer completedFiles;
17+
/** 总大小（字节） */
18+
private Long totalSize;
19+
/** 完成率（0-100） */
20+
private Float completionRate;
21+
/** 文件类型分布 */
22+
private Map<String, Integer> fileTypeDistribution;
23+
/** 状态分布 */
24+
private Map<String, Integer> statusDistribution;
25+
}

‎backend/services/data-management-service/src/main/java/com/dataengine/datamanagement/interfaces/dto/DatasetTypeResponse.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.dataengine.datamanagement.interfaces.dto;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
import java.util.List;
6+
7+
/**
8+
* 数据集类型响应DTO
9+
*/
10+
@Getter
11+
@Setter
12+
public class DatasetTypeResponse {
13+
/** 类型编码 */
14+
private String code;
15+
/** 类型名称 */
16+
private String name;
17+
/** 类型描述 */
18+
private String description;
19+
/** 支持的文件格式 */
20+
private List<String> supportedFormats;
21+
/** 图标 */
22+
private String icon;
23+
}

0 commit comments

Comments
 (0)