diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index 68a866f5b0..04a056d06a 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -3,6 +3,7 @@ package io.dataease.exportCenter.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; +import com.google.gson.Gson; import io.dataease.api.chart.dto.ViewDetailField; import io.dataease.api.chart.request.ChartExcelRequest; import io.dataease.api.chart.request.ChartExcelRequestInner; @@ -10,6 +11,7 @@ import io.dataease.api.dataset.dto.DataSetExportRequest; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.api.dataset.union.UnionDTO; import io.dataease.extensions.datasource.api.PluginManageApi; +import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; import io.dataease.model.ExportTaskDTO; import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; import io.dataease.auth.bo.TokenUserBO; @@ -78,22 +80,24 @@ public class ExportCenterManage { DataVisualizationServer dataVisualizationServer; @Resource private CoreChartViewMapper coreChartViewMapper; + @Resource + private PermissionManage permissionManage; @Autowired private WsService wsService; @Autowired(required = false) private PluginManageApi pluginManage; @Resource private SysParameterManage sysParameterManage; - @Value("${export.core.size:10}") + @Value("${dataease.export.core.size:10}") private int core; - @Value("${export.max.size:10}") + @Value("${dataease.export.max.size:10}") private int max; - @Value("${export.dataset.limit:100000}") + @Value("${dataease.export.dataset.limit:100000}") private int limit; private final static String DATA_URL_TITLE = "data:image/jpeg;base64,"; private static final String exportData_path = "/opt/dataease2.0/data/exportData/"; - @Value("${extract.page.size:50000}") + @Value("${dataease.export.page.size:50000}") private Integer extractPageSize; static private List STATUS = Arrays.asList("SUCCESS", "FAILED", "PENDING", "IN_PROGRESS", "ALL"); private ScheduledThreadPoolExecutor scheduledThreadPoolExecutor; @@ -108,8 +112,6 @@ public class ExportCenterManage { @Resource private DatasetSQLManage datasetSQLManage; @Resource - private PermissionManage permissionManage; - @Resource private DatasetTableFieldManage datasetTableFieldManage; @Resource private DatasetDataManage datasetDataManage; @@ -347,7 +349,7 @@ public class ExportCenterManage { datasetTableFieldDTO.setFieldShortName(ele.getDataeaseName()); return datasetTableFieldDTO; }).collect(Collectors.toList()); - dto.setAllFields(allFields); + Map sqlMap = datasetSQLManage.getUnionSQLForEdit(dto, null); String sql = (String) sqlMap.get("sql"); if (ObjectUtils.isEmpty(allFields)) { @@ -358,6 +360,7 @@ public class ExportCenterManage { if (ObjectUtils.isEmpty(allFields)) { DEException.throwException(Translator.get("i18n_no_column_permission")); } + dto.setAllFields(allFields); datasetDataManage.buildFieldName(sqlMap, allFields); Map dsMap = (Map) sqlMap.get("dsMap"); DatasourceUtils.checkDsStatus(dsMap); @@ -373,12 +376,19 @@ public class ExportCenterManage { } sql = Utils.replaceSchemaAlias(sql, dsMap); } - List rowPermissionsTree = new ArrayList<>(); TokenUserBO user = AuthUtils.getUser(); if (user != null) { rowPermissionsTree = permissionManage.getRowPermissionsTree(dto.getId(), user.getUserId()); } + if (StringUtils.isNotEmpty(request.getExpressionTree())) { + Gson gson = new Gson(); + DatasetRowPermissionsTreeObj datasetRowPermissionsTreeObj = gson.fromJson(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class); + permissionManage.getField(datasetRowPermissionsTreeObj); + DataSetRowPermissionsTreeDTO dataSetRowPermissionsTreeDTO = new DataSetRowPermissionsTreeDTO(); + dataSetRowPermissionsTreeDTO.setTree(datasetRowPermissionsTreeObj); + rowPermissionsTree.add(dataSetRowPermissionsTreeDTO); + } Provider provider; if (crossDs) { @@ -410,7 +420,7 @@ public class ExportCenterManage { datasourceRequest.setDsList(dsMap); Map previewData = datasetDataManage.buildPreviewData(provider.fetchResultField(datasourceRequest), allFields, desensitizationList); List> data = (List>) previewData.get("data"); - if (p == 1L) { + if (p == 0L) { CellStyle cellStyle = wb.createCellStyle(); Font font = wb.createFont(); font.setFontHeightInPoints((short) 12); diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ConnectionObj.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ConnectionObj.java index f36c4c2ca6..3fb2e005ce 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ConnectionObj.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/ConnectionObj.java @@ -23,7 +23,6 @@ public class ConnectionObj implements AutoCloseable { } if (session != null) { - System.out.println("session.disconnect()"); session.disconnect(); }