diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java index 30c1051e7d..609208cefa 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java @@ -219,6 +219,10 @@ public class DatasetTableFieldManage { wrapper.eq("checked", true); wrapper.eq("ext_field", 0); List list = transDTO(coreDatasetTableFieldMapper.selectList(wrapper)); + + Map desensitizationList = new HashMap<>(); + list = permissionManage.filterColumnPermissions(list, desensitizationList, id, null); + List dimensionList = list.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getGroupType(), "d")).collect(Collectors.toList()); List quotaList = list.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getGroupType(), "q")).collect(Collectors.toList()); Map> map = new LinkedHashMap<>(); diff --git a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java index cdc2abc6c4..7c7a74cc83 100755 --- a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java +++ b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java @@ -32,10 +32,7 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import static io.dataease.result.ResultCode.SYSTEM_INNER_ERROR; @@ -222,6 +219,41 @@ public class HttpClientUtil { } } + public static HttpResponse postWithHeaders(String url, String json, HttpClientConfig config) { + CloseableHttpClient httpClient = null; + try { + httpClient = buildHttpClient(url); + HttpPost httpPost = new HttpPost(url); + if (config == null) { + config = new HttpClientConfig(); + } + httpPost.setConfig(config.buildRequestConfig()); + Map header = config.getHeader(); + for (String key : header.keySet()) { + httpPost.addHeader(key, header.get(key)); + } + EntityBuilder entityBuilder = EntityBuilder.create(); + entityBuilder.setText(json); + entityBuilder.setContentType(ContentType.APPLICATION_JSON); + HttpEntity requestEntity = entityBuilder.build(); + httpPost.setEntity(requestEntity); + + HttpResponse response = httpClient.execute(httpPost); + return response; + } catch (Exception e) { + logger.error("HttpClient查询失败", e); + throw new DEException(SYSTEM_INNER_ERROR.code(), "HttpClient查询失败: " + e.getMessage()); + } finally { + try { + if (httpClient != null) { + httpClient.close(); + } + } catch (Exception e) { + logger.error("HttpClient关闭连接失败", e); + } + } + } + public static String put(String url, String json, HttpClientConfig config) { CloseableHttpClient httpClient = null; try {