Skip to content

Commit 94d732c

Browse files
committed
feature: realize that data sets, data cleaning, and knowledge bases are isolated according to the creator, and operators are not isolated.
1 parent 501275a commit 94d732c

14 files changed

Lines changed: 36 additions & 11 deletions

File tree

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/domain/model/entity/CleaningTask.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.baomidou.mybatisplus.annotation.TableName;
44
import com.datamate.cleaning.common.enums.CleaningTaskStatusEnum;
5+
import com.datamate.common.domain.model.base.BaseEntity;
56
import lombok.Getter;
67
import lombok.Setter;
78

@@ -14,9 +15,7 @@
1415
@Getter
1516
@Setter
1617
@TableName(value = "t_clean_task", autoResultMap = true)
17-
public class CleaningTask {
18-
private String id;
19-
18+
public class CleaningTask extends BaseEntity<String> {
2019
private String name;
2120

2221
private String description;
@@ -37,8 +36,6 @@ public class CleaningTask {
3736

3837
private Integer fileCount;
3938

40-
private LocalDateTime createdAt;
41-
4239
private LocalDateTime startedAt;
4340

4441
private LocalDateTime finishedAt;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
44
import com.datamate.cleaning.domain.model.entity.CleaningResult;
5+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
56
import org.apache.ibatis.annotations.Mapper;
67

78
@Mapper
9+
@IgnoreDataScopeAnnotation
810
public interface CleaningResultMapper extends BaseMapper<CleaningResult> {
911
}

backend/services/data-cleaning-service/src/main/java/com/datamate/cleaning/infrastructure/persistence/mapper/CleaningTemplateMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
import com.baomidou.mybatisplus.core.toolkit.Constants;
66
import com.datamate.cleaning.domain.model.entity.TemplateWithInstance;
77
import com.datamate.cleaning.domain.model.entity.CleaningTemplate;
8+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
89
import org.apache.ibatis.annotations.Mapper;
910
import org.apache.ibatis.annotations.Param;
1011
import org.apache.ibatis.annotations.Select;
1112

1213
import java.util.List;
1314

1415
@Mapper
16+
@IgnoreDataScopeAnnotation
1517
public interface CleaningTemplateMapper extends BaseMapper<CleaningTemplate> {
1618
@Select("SELECT t.id AS id, name, description, created_at, updated_at, created_by, operator_id, op_index, " +
1719
"settings_override FROM t_clean_template t LEFT JOIN t_operator_instance o ON t.id = o.instance_id " +

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
44
import com.datamate.cleaning.domain.model.entity.OperatorInstance;
5+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
56
import com.datamate.operator.domain.model.OperatorView;
67
import org.apache.ibatis.annotations.Mapper;
78
import org.apache.ibatis.annotations.Select;
@@ -10,6 +11,7 @@
1011

1112

1213
@Mapper
14+
@IgnoreDataScopeAnnotation
1315
public interface OperatorInstanceMapper extends BaseMapper<OperatorInstance> {
1416
@Select("SELECT o.operator_id as id, o.operator_name as name, o.description, o.version, o.inputs, o.outputs, " +
1517
"o.runtime, o.settings, o.created_at, o.updated_at, " +

backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetFileApplicationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public PagedResponse<DatasetFile> getDatasetFilesWithDirectory(String datasetId,
137137

138138
return new PagedResponse<>(page, size, total, totalPages, datasetFiles);
139139
} catch (IOException e) {
140-
log.error("list dataset path error", e);
140+
log.warn("list dataset path error");
141141
return PagedResponse.of(new Page<>(page, size));
142142
}
143143
}

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

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

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
45
import com.datamate.datamanagement.domain.model.dataset.DatasetFile;
56
import org.apache.ibatis.annotations.Mapper;
67
import org.apache.ibatis.annotations.Param;
@@ -9,6 +10,7 @@
910
import java.util.List;
1011

1112
@Mapper
13+
@IgnoreDataScopeAnnotation
1214
public interface DatasetFileMapper extends BaseMapper<DatasetFile> {
1315
DatasetFile findById(@Param("id") String id);
1416
List<DatasetFile> findByDatasetId(@Param("datasetId") String datasetId, RowBounds rowBounds);
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.datamate.operator.infrastructure.persistence.mapper;
22

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
45
import com.datamate.operator.domain.model.Category;
56
import org.apache.ibatis.annotations.Mapper;
67

78
@Mapper
9+
@IgnoreDataScopeAnnotation
810
public interface CategoryMapper extends BaseMapper<Category> {
911
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.datamate.operator.infrastructure.persistence.mapper;
22

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
45
import com.datamate.operator.domain.model.CategoryRelation;
56
import org.apache.ibatis.annotations.Mapper;
67

78
@Mapper
9+
@IgnoreDataScopeAnnotation
810
public interface CategoryRelationMapper extends BaseMapper<CategoryRelation> {
911
}

backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/mapper/OperatorMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.datamate.operator.infrastructure.persistence.mapper;
22

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
45
import com.datamate.operator.domain.model.Operator;
56
import org.apache.ibatis.annotations.Mapper;
67
import org.apache.ibatis.annotations.Select;
78

89
@Mapper
10+
@IgnoreDataScopeAnnotation
911
public interface OperatorMapper extends BaseMapper<Operator> {
1012

1113
@Select("SELECT count(1) FROM t_operator_instance oi JOIN t_clean_template t ON oi.instance_id = t.id " +

backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/mapper/OperatorViewMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
55
import com.baomidou.mybatisplus.core.metadata.IPage;
66
import com.baomidou.mybatisplus.core.toolkit.Constants;
7+
import com.datamate.common.infrastructure.config.IgnoreDataScopeAnnotation;
78
import com.datamate.operator.domain.model.OperatorView;
89
import org.apache.ibatis.annotations.Mapper;
910
import org.apache.ibatis.annotations.Param;
1011
import org.apache.ibatis.annotations.Select;
1112

1213

1314
@Mapper
15+
@IgnoreDataScopeAnnotation
1416
public interface OperatorViewMapper extends BaseMapper<OperatorView> {
1517
@Select("SELECT operator_id AS id, operator_name AS name, description, version, inputs, outputs, runtime, " +
1618
"settings, is_star, created_at, updated_at, " +

0 commit comments

Comments
 (0)