center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(仪表板): 文本下拉组件支持显示字段和排序字段设置

Browse Source
This commit is contained in:
junjun 2024-04-16 10:25:52 +08:00
parent 7400b6748d
commit c281003199
5 changed files with 167 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
View File

@ -2,8 +2,10 @@ package io.dataease.dataset.manage;
import io.dataease.api.chart.dto.ChartViewDTO;
import io.dataease.api.chart.dto.ColumnPermissionItem;
import io.dataease.api.chart.dto.DeSortField;
import io.dataease.api.chart.request.ChartExtRequest;
import io.dataease.api.dataset.dto.DatasetTableDTO;
import io.dataease.api.dataset.dto.EnumValueRequest;
import io.dataease.api.dataset.dto.PreviewSqlDTO;
import io.dataease.api.dataset.dto.SqlLogDTO;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
@ -29,7 +31,6 @@ import io.dataease.dto.dataset.DatasetTableFieldDTO;
import io.dataease.engine.constant.ExtFieldConstant;
import io.dataease.engine.constant.SQLConstants;
import io.dataease.engine.constant.SqlPlaceholderConstants;
import io.dataease.engine.func.FunctionConstant;
import io.dataease.engine.sql.SQLProvider;
import io.dataease.engine.trans.Field2SQLObj;
import io.dataease.engine.trans.Order2SQLObj;
@ -436,18 +437,6 @@ public class DatasetDataManage {
// build query sql
SQLMeta sqlMeta = new SQLMeta();
Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs);
// 计算字段先完成内容替换
if (Objects.equals(field.getExtField(), ExtFieldConstant.EXT_CALC)) {
String originField = Utils.calcFieldRegex(field.getOriginName(), sqlMeta.getTable(), allFields, crossDs, dsMap);
// 此处是数据集预览，获取数据库原始字段枚举值等操作使用，如果遇到聚合函数则将originField设置为null
for (String func : FunctionConstant.AGG_FUNC) {
if (Utils.matchFunction(func, originField)) {
originField = null;
break;
}
}
field.setOriginName(originField);
}
// 获取allFields
List<DatasetTableFieldDTO> fields = Collections.singletonList(field);
@ -507,4 +496,127 @@ public class DatasetDataManage {
}
return result.stream().toList();
}
public List<Map<String, Object>> getFieldEnumObj(EnumValueRequest request) throws Exception {
List<Long> ids = new ArrayList<>();
if (ObjectUtils.isNotEmpty(request.getQueryId())) {
ids.add(request.getQueryId());
}
if (ObjectUtils.isNotEmpty(request.getDisplayId())) {
ids.add(request.getDisplayId());
}
if (CollectionUtils.isEmpty(ids)) {
return Collections.emptyList();
}
if (ids.size() == 2 && Objects.equals(ids.get(0), ids.get(1))) {
ids.remove(1);
}
SQLMeta sqlMeta = new SQLMeta();
DatasetGroupInfoDTO datasetGroupInfoDTO = null;
List<DatasetTableFieldDTO> fields = new ArrayList<>();
Map<String, Object> sqlMap = null;
boolean crossDs = false;
Map<Long, DatasourceSchemaDTO> dsMap = null;
for (Long id : ids) {
DatasetTableFieldDTO field = datasetTableFieldManage.selectById(id);
if (field == null) {
DEException.throwException(Translator.get("i18n_no_field"));
}
List<DatasetTableFieldDTO> allFields = new ArrayList<>();
// 根据图表计算字段，获取数据集
Long datasetGroupId;
if (field.getDatasetGroupId() == null && field.getChartId() != null) {
ChartViewDTO chart = chartViewManege.getChart(field.getChartId());
datasetGroupId = chart.getTableId();
allFields.addAll(datasetTableFieldManage.getChartCalcFields(field.getChartId()));
} else {
datasetGroupId = field.getDatasetGroupId();
}
datasetGroupInfoDTO = datasetGroupManage.get(datasetGroupId, null);
sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, new ChartExtRequest());
String sql = (String) sqlMap.get("sql");
allFields.addAll(datasetGroupInfoDTO.getAllFields());
dsMap = (Map<Long, DatasourceSchemaDTO>) sqlMap.get("dsMap");
crossDs = Utils.isCrossDs(dsMap);
if (!crossDs) {
sql = Utils.replaceSchemaAlias(sql, dsMap);
}
// build query sql
Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs);
fields.add(field);
}
// 获取allFields
Map<String, ColumnPermissionItem> desensitizationList = new HashMap<>();
fields = permissionManage.filterColumnPermissions(fields, desensitizationList, datasetGroupInfoDTO.getId(), null);
if (ObjectUtils.isEmpty(fields)) {
DEException.throwException(Translator.get("i18n_no_column_permission"));
}
buildFieldName(sqlMap, fields);
List<String> dsList = new ArrayList<>();
for (Map.Entry<Long, DatasourceSchemaDTO> next : dsMap.entrySet()) {
dsList.add(next.getValue().getType());
}
boolean needOrder = Utils.isNeedOrder(dsList);
List<DataSetRowPermissionsTreeDTO> rowPermissionsTree = new ArrayList<>();
TokenUserBO user = AuthUtils.getUser();
if (user != null) {
rowPermissionsTree = permissionManage.getRowPermissionsTree(datasetGroupInfoDTO.getId(), user.getUserId());
}
// 排序
if (ObjectUtils.isNotEmpty(request.getSortId())) {
DatasetTableFieldDTO field = datasetTableFieldManage.selectById(request.getSortId());
if (field == null) {
DEException.throwException(Translator.get("i18n_no_field"));
}
DeSortField deSortField = new DeSortField();
BeanUtils.copyBean(deSortField, field);
deSortField.setOrderDirection(request.getSort());
datasetGroupInfoDTO.setSortFields(Collections.singletonList(deSortField));
}
Field2SQLObj.field2sqlObj(sqlMeta, fields, crossDs, dsMap);
WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap);
Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, true, 0, 1000);
querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap);
logger.info("calcite data enum sql: " + querySQL);
// 通过数据源请求数据
// 调用数据源的calcite获得data
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setQuery(querySQL);
datasourceRequest.setDsList(dsMap);
Map<String, Object> data = calciteProvider.fetchResultField(datasourceRequest);
List<String[]> dataList = (List<String[]>) data.get("data");
List<Map<String, Object>> previewData = new ArrayList<>();
if (ObjectUtils.isNotEmpty(dataList)) {
for (String[] ele : dataList) {
Map<String, Object> map = new LinkedHashMap<>();
for (int i = 0; i < ele.length; i++) {
String val = ele[i];
DatasetTableFieldDTO field = fields.get(i);
if (desensitizationList.containsKey(field.getDataeaseName())) {
String str = ChartDataBuild.desensitizationValue(desensitizationList.get(field.getDataeaseName()), val);
map.put(field.getId() + "", str);
} else {
map.put(field.getId() + "", val);
}
}
previewData.add(map);
}
}
return previewData;
}
}

17
core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java
View File

@ -2,6 +2,7 @@ package io.dataease.dataset.server;
import io.dataease.api.dataset.DatasetDataApi;
import io.dataease.api.dataset.dto.DatasetTableDTO;
import io.dataease.api.dataset.dto.EnumValueRequest;
import io.dataease.api.dataset.dto.PreviewSqlDTO;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.dataset.manage.DatasetDataManage;
@ -45,14 +46,24 @@ public class DatasetDataServer implements DatasetDataApi {
@Override
public List<String> getFieldEnum(List<Long> ids) {
try{
return datasetDataManage.getFieldEnum(ids);
}catch (Exception e){
try {
return datasetDataManage.getFieldEnum(ids);
} catch (Exception e) {
e.printStackTrace();
LogUtil.error(e);
return null;
}
}
@Override
public List<Map<String, Object>> getFieldEnumObj(EnumValueRequest request) throws Exception {
try {
return datasetDataManage.getFieldEnumObj(request);
} catch (Exception e) {
e.printStackTrace();
LogUtil.error(e);
return null;
}
}
@Override

5
sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java
View File

@ -2,6 +2,7 @@ package io.dataease.api.dataset;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.api.dataset.dto.DatasetTableDTO;
import io.dataease.api.dataset.dto.EnumValueRequest;
import io.dataease.api.dataset.dto.PreviewSqlDTO;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.dto.dataset.DatasetTableFieldDTO;
@ -39,6 +40,10 @@ public interface DatasetDataApi {
@PostMapping("enumValue")
List<String> getFieldEnum(@RequestBody List<Long> ids) throws Exception;
@Operation(summary = "获取字段枚举值(多字段)")
@PostMapping("enumValueObj")
List<Map<String, Object>> getFieldEnumObj(@RequestBody EnumValueRequest request) throws Exception;
@Operation(summary = "获取数据集总数据量", hidden = true)
@PostMapping("getDatasetCount")
Long getDatasetCount(@RequestBody DatasetGroupInfoDTO datasetGroupInfoDTO) throws Exception;

14
sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java Normal file
View File

@ -0,0 +1,14 @@
package io.dataease.api.dataset.dto;
import lombok.Data;
/**
* @Author Junjun
*/
@Data
public class EnumValueRequest {
private Long queryId;
private Long displayId;
private Long sortId;
private String sort;
}

9
sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/Sorted.java Normal file
View File

@ -0,0 +1,9 @@
package io.dataease.api.dataset.dto;
/**
* @Author Junjun
*/
public class Sorted {
private Long id;
private String sort;
}