github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-23 19:12:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(数据集): 数据集增加分组字段功能

Browse Source
This commit is contained in:
junjun 2025-02-14 11:15:27 +08:00 committed by dataeaseShu
parent 24117ad424
commit b3ba91c728
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java
View File

@ -189,9 +189,7 @@ public class DatasetTableFieldManage {
public DatasetTableFieldDTO selectById(Long id) {
CoreDatasetTableField coreDatasetTableField = coreDatasetTableFieldMapper.selectById(id);
if (coreDatasetTableField == null) return null;
DatasetTableFieldDTO dto = new DatasetTableFieldDTO();
BeanUtils.copyBean(dto, coreDatasetTableField);
return dto;
return transObj(coreDatasetTableField);
}
/**
@ -282,30 +280,31 @@ public class DatasetTableFieldManage {
return tmp;
}
public DatasetTableFieldDTO transObj(CoreDatasetTableField ele) {
DatasetTableFieldDTO dto = new DatasetTableFieldDTO();
if (ele == null) return null;
BeanUtils.copyBean(dto, ele);
if (StringUtils.isNotEmpty(ele.getParams())) {
TypeReference<List<CalParam>> tokenType = new TypeReference<>() {
};
List<CalParam> calParams = JsonUtil.parseList(ele.getParams(), tokenType);
dto.setParams(calParams);
}
if (StringUtils.isNotEmpty(ele.getGroupList())) {
TypeReference<List<FieldGroupDTO>> groupTokenType = new TypeReference<>() {
};
List<FieldGroupDTO> fieldGroups = JsonUtil.parseList(ele.getGroupList(), groupTokenType);
dto.setGroupList(fieldGroups);
}
return dto;
}
public List<DatasetTableFieldDTO> transDTO(List<CoreDatasetTableField> list) {
if (!CollectionUtils.isEmpty(list)) {
return list.stream().map(ele -> {
DatasetTableFieldDTO dto = new DatasetTableFieldDTO();
if (ele == null) return null;
BeanUtils.copyBean(dto, ele);
if (StringUtils.isNotEmpty(ele.getParams())) {
TypeReference<List<CalParam>> tokenType = new TypeReference<>() {
};
List<CalParam> calParams = JsonUtil.parseList(ele.getParams(), tokenType);
dto.setParams(calParams);
}
if (StringUtils.isNotEmpty(ele.getGroupList())) {
TypeReference<List<FieldGroupDTO>> groupTokenType = new TypeReference<>() {
};
List<FieldGroupDTO> fieldGroups = JsonUtil.parseList(ele.getGroupList(), groupTokenType);
dto.setGroupList(fieldGroups);
}
return dto;
}).collect(Collectors.toList());
return list.stream().map(this::transObj).collect(Collectors.toList());
} else {
return new ArrayList<>();
}
}
private CoreDatasetTableField transDTO2Record(DatasetTableFieldDTO dto) {