dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9718 from dataease/pr@dev-v2@perf_user_origin

Browse Source 
Pr@dev v2@perf user origin
This commit is contained in:
fit2cloud-chenyw 2024-05-18 17:55:58 +08:00 committed by GitHub
commit b31fcbbff6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,20 +231,21 @@ public class DatasetDataManage {
map.put("allFields", fieldList);
}
map.put("sql", Base64.getEncoder().encodeToString(querySQL.getBytes()));
map.put("total", getDatasetTotal(datasetGroupInfoDTO, SqlUtils.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder), sqlMeta, crossDs, dsMap)));
String replaceSql = SqlUtils.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder), sqlMeta, crossDs, dsMap);
map.put("total", getDatasetTotal(datasetGroupInfoDTO, replaceSql, null));
return map;
}
public Long getDatasetTotal(Long datasetGroupId) throws Exception {
DatasetGroupInfoDTO dto = datasetGroupManage.getForCount(datasetGroupId);
if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) {
return getDatasetTotal(dto, null);
return getDatasetTotal(dto, null, new ChartExtRequest());
}
return 0L;
}
public Long getDatasetTotal(DatasetGroupInfoDTO datasetGroupInfoDTO, String s) throws Exception {
Map<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, null);
public Long getDatasetTotal(DatasetGroupInfoDTO datasetGroupInfoDTO, String s, ChartExtRequest request) throws Exception {
Map<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, request);
Map<Long, DatasourceSchemaDTO> dsMap = (Map<Long, DatasourceSchemaDTO>) sqlMap.get("dsMap");
String sql;

2
de-xpack

@ -1 +1 @@
Subproject commit b550857633fc2ce85f895a2953661fe3954ecf06
Subproject commit 84ddcd508b614bab67e08ca7bdc5e7a37573f59c

2
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java
View File

@ -28,4 +28,6 @@ public class UserGridVO {
private Long createTime;
@Schema(description = "系统变量")
private String sysVariable;
@Schema(description = "用户来源")
private Integer origin;
}