Skip to content

Commit 95123dd

Browse files
hefanlihefanli
committed
Merge branch 'main' into dev_0119
2 parents 9e5951b + c0ddc15 commit 95123dd

22 files changed

Lines changed: 1093 additions & 539 deletions

File tree

‎backend/services/data-management-service/src/main/java/com/datamate/datamanagement/domain/model/dataset/DatasetFile.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class DatasetFile {
3232
private Long fileSize; // bytes
3333
private String checkSum;
3434
private String tags;
35+
private LocalDateTime tagsUpdatedAt;
3536
private String metadata;
3637
private String status; // UPLOADED, PROCESSING, COMPLETED, ERROR
3738
private LocalDateTime uploadTime;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ public class DatasetFileResponse {
2727
private String description;
2828
/** 文件路径 */
2929
private String filePath;
30+
/** 文件标签（JSON 字符串） */
31+
private String tags;
32+
/** 标签更新时间 */
33+
private LocalDateTime tagsUpdatedAt;
3034
/** 上传时间 */
3135
private LocalDateTime uploadTime;
3236
/** 最后更新时间 */

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

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3-
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4-
<mapper namespace="com.datamate.datamanagement.infrastructure.persistence.mapper.DatasetFileMapper">
5-
<sql id="Base_Column_List">
6-
id, dataset_id, file_name, file_path, file_type, file_size, check_sum, tags, metadata, status,
7-
upload_time, last_access_time, created_at, updated_at
8-
</sql>
9-
10-
<select id="findById" parameterType="string"
11-
resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
12-
SELECT <include refid="Base_Column_List"/>
13-
FROM t_dm_dataset_files
14-
WHERE id = #{id}
15-
</select>
16-
17-
<select id="findByDatasetId" parameterType="string"
18-
resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
19-
SELECT <include refid="Base_Column_List"/>
20-
FROM t_dm_dataset_files
21-
WHERE dataset_id = #{datasetId}
22-
ORDER BY upload_time DESC
23-
</select>
24-
25-
<select id="findByDatasetIdAndStatus" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
26-
SELECT <include refid="Base_Column_List"/>
27-
FROM t_dm_dataset_files
28-
WHERE dataset_id = #{datasetId}
29-
AND status = #{status}
30-
ORDER BY upload_time DESC
31-
</select>
32-
33-
<select id="findByDatasetIdAndFileType" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
34-
SELECT <include refid="Base_Column_List"/>
35-
FROM t_dm_dataset_files
36-
WHERE dataset_id = #{datasetId}
37-
AND file_type = #{fileType}
38-
ORDER BY upload_time DESC
39-
</select>
40-
41-
<select id="countByDatasetId" parameterType="string" resultType="long">
42-
SELECT COUNT(*) FROM t_dm_dataset_files WHERE dataset_id = #{datasetId}
43-
</select>
44-
45-
<select id="countCompletedByDatasetId" parameterType="string" resultType="long">
46-
SELECT COUNT(*) FROM t_dm_dataset_files WHERE dataset_id = #{datasetId} AND status = 'COMPLETED'
47-
</select>
48-
49-
<select id="sumSizeByDatasetId" parameterType="string" resultType="long">
50-
SELECT COALESCE(SUM(file_size), 0) FROM t_dm_dataset_files WHERE dataset_id = #{datasetId}
51-
</select>
52-
53-
<select id="findByDatasetIdAndFileName" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
54-
SELECT <include refid="Base_Column_List"/>
55-
FROM t_dm_dataset_files
56-
WHERE dataset_id = #{datasetId} AND file_name = #{fileName}
57-
LIMIT 1
58-
</select>
59-
60-
<select id="findAllByDatasetId" parameterType="string"
61-
resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
62-
SELECT <include refid="Base_Column_List"/>
63-
FROM t_dm_dataset_files
64-
WHERE dataset_id = #{datasetId}
65-
ORDER BY upload_time DESC
66-
</select>
67-
68-
<select id="findByCriteria" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
69-
SELECT <include refid="Base_Column_List"/>
70-
FROM t_dm_dataset_files
71-
WHERE dataset_id = #{datasetId}
72-
<!-- Replace invalid XML '&&' with 'and' for MyBatis OGNL -->
73-
<if test="fileType != null and fileType != ''">
74-
AND file_type = #{fileType}
75-
</if>
76-
<if test="status != null and status != ''">
77-
AND status = #{status}
78-
</if>
79-
ORDER BY upload_time DESC
80-
</select>
81-
82-
83-
<update id="update" parameterType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
84-
UPDATE t_dm_dataset_files
85-
SET file_name = #{fileName},
86-
file_path = #{filePath},
87-
file_type = #{fileType},
88-
file_size = #{fileSize},
89-
upload_time = #{uploadTime},
90-
last_access_time = #{lastAccessTime},
91-
status = #{status}
92-
WHERE id = #{id}
93-
</update>
94-
95-
<delete id="deleteById" parameterType="string">
96-
DELETE FROM t_dm_dataset_files WHERE id = #{id}
97-
</delete>
98-
</mapper>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3+
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4+
<mapper namespace="com.datamate.datamanagement.infrastructure.persistence.mapper.DatasetFileMapper">
5+
<sql id="Base_Column_List">
6+
id, dataset_id, file_name, file_path, file_type, file_size, check_sum, tags, tags_updated_at, metadata, status,
7+
upload_time, last_access_time, created_at, updated_at
8+
</sql>
9+
10+
<select id="findById" parameterType="string"
11+
resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
12+
SELECT <include refid="Base_Column_List"/>
13+
FROM t_dm_dataset_files
14+
WHERE id = #{id}
15+
</select>
16+
17+
<select id="findByDatasetId" parameterType="string"
18+
resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
19+
SELECT <include refid="Base_Column_List"/>
20+
FROM t_dm_dataset_files
21+
WHERE dataset_id = #{datasetId}
22+
ORDER BY upload_time DESC
23+
</select>
24+
25+
<select id="findByDatasetIdAndStatus" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
26+
SELECT <include refid="Base_Column_List"/>
27+
FROM t_dm_dataset_files
28+
WHERE dataset_id = #{datasetId}
29+
AND status = #{status}
30+
ORDER BY upload_time DESC
31+
</select>
32+
33+
<select id="findByDatasetIdAndFileType" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
34+
SELECT <include refid="Base_Column_List"/>
35+
FROM t_dm_dataset_files
36+
WHERE dataset_id = #{datasetId}
37+
AND file_type = #{fileType}
38+
ORDER BY upload_time DESC
39+
</select>
40+
41+
<select id="countByDatasetId" parameterType="string" resultType="long">
42+
SELECT COUNT(*) FROM t_dm_dataset_files WHERE dataset_id = #{datasetId}
43+
</select>
44+
45+
<select id="countCompletedByDatasetId" parameterType="string" resultType="long">
46+
SELECT COUNT(*) FROM t_dm_dataset_files WHERE dataset_id = #{datasetId} AND status = 'COMPLETED'
47+
</select>
48+
49+
<select id="sumSizeByDatasetId" parameterType="string" resultType="long">
50+
SELECT COALESCE(SUM(file_size), 0) FROM t_dm_dataset_files WHERE dataset_id = #{datasetId}
51+
</select>
52+
53+
<select id="findByDatasetIdAndFileName" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
54+
SELECT <include refid="Base_Column_List"/>
55+
FROM t_dm_dataset_files
56+
WHERE dataset_id = #{datasetId} AND file_name = #{fileName}
57+
LIMIT 1
58+
</select>
59+
60+
<select id="findAllByDatasetId" parameterType="string"
61+
resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
62+
SELECT <include refid="Base_Column_List"/>
63+
FROM t_dm_dataset_files
64+
WHERE dataset_id = #{datasetId}
65+
ORDER BY upload_time DESC
66+
</select>
67+
68+
<select id="findByCriteria" resultType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
69+
SELECT <include refid="Base_Column_List"/>
70+
FROM t_dm_dataset_files
71+
WHERE dataset_id = #{datasetId}
72+
<!-- Replace invalid XML '&&' with 'and' for MyBatis OGNL -->
73+
<if test="fileType != null and fileType != ''">
74+
AND file_type = #{fileType}
75+
</if>
76+
<if test="status != null and status != ''">
77+
AND status = #{status}
78+
</if>
79+
ORDER BY upload_time DESC
80+
</select>
81+
82+
83+
<update id="update" parameterType="com.datamate.datamanagement.domain.model.dataset.DatasetFile">
84+
UPDATE t_dm_dataset_files
85+
SET file_name = #{fileName},
86+
file_path = #{filePath},
87+
file_type = #{fileType},
88+
file_size = #{fileSize},
89+
upload_time = #{uploadTime},
90+
last_access_time = #{lastAccessTime},
91+
status = #{status}
92+
WHERE id = #{id}
93+
</update>
94+
95+
<delete id="deleteById" parameterType="string">
96+
DELETE FROM t_dm_dataset_files WHERE id = #{id}
97+
</delete>
98+
</mapper>

‎deployment/helm/datamate/charts/database/templates/deployment.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ spec:
3232
securityContext:
3333
{{- toYaml . | nindent 8 }}
3434
{{- end }}
35+
{{- with .Values.initContainers }}
36+
initContainers:
37+
{{- $root := $ }}
38+
{{- range . }}
39+
{{- $defaultImage := dict "image" (include "database.image" $root) }}
40+
{{- $containerConfig := merge (deepCopy .) $defaultImage }}
41+
- {{ toYaml $containerConfig | nindent 10 | trim }}
42+
{{- end }}
43+
{{- end }}
3544
containers:
3645
- name: {{ .Chart.Name }}
3746
{{- with .Values.securityContext }}

‎deployment/helm/datamate/charts/database/values.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,5 @@ nodeSelector: {}
106106
tolerations: []
107107

108108
affinity: {}
109+
110+
initContainers: []

‎deployment/helm/datamate/charts/frontend/templates/configmap.yaml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎deployment/helm/datamate/charts/frontend/templates/deployment.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ spec:
1414
template:
1515
metadata:
1616
annotations:
17-
checksum/nginx: {{ include (print .Template.BasePath "/configmap.yaml") . | sha256sum }}
1817
{{- with .Values.podAnnotations }}
1918
{{- toYaml . | nindent 8 }}
2019
{{- end }}

‎deployment/helm/datamate/values.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,19 @@ operatorVolume: &operatorVolume
6868
claimName: datamate-operator-pvc
6969

7070
database:
71+
initContainers:
72+
- name: init-chown
73+
imagePullPolicy: IfNotPresent
74+
command:
75+
- sh
76+
- -c
77+
- "chown -R 999:999 /var/log/datamate/database && chmod 750 /var/log/datamate/database"
78+
securityContext:
79+
runAsUser: 0
80+
volumeMounts:
81+
- name: log-volume
82+
mountPath: /var/log/datamate/database
83+
subPath: database
7184
env:
7285
- name: POSTGRES_USER
7386
value: postgres

0 commit comments

Comments
 (0)