From a7bb6873baf5cde828afce0dd9f1046b14406a07 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 9 Aug 2024 16:47:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=BC=95=E7=94=A8=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=9F=A9=E9=98=B5=E5=92=8C=E8=A7=86=E5=9B=BE=E7=9F=A9?= =?UTF-8?q?=E9=98=B5=E6=97=B6=EF=BC=8C=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=80=BC=E5=A4=AA=E5=A4=9A=E4=BC=9A=E5=BC=95=E5=8F=91=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1213024554156032]表单下拉框引用自定义矩阵和视图矩阵时，字段重复值太多会引发循环查询数据库 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1213024554156032 --- .../MatrixColumnDataSearchForSelectApi.java | 90 ++++++++++++------- 1 file changed, 60 insertions(+), 30 deletions(-) diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java index 5f757ba7..658dbfea 100644 --- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java +++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java @@ -322,42 +322,28 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase // } // } List previousPageList = new ArrayList<>(); - List valueList = new ArrayList<>(); dataVo.setColumnList(Collections.singletonList(valueField)); dataVo.setIsDistinct(true); int startPage = dataVo.getCurrentPage(); int pageSize = dataVo.getPageSize(); int currentPage = 0; - while (valueList.size() < pageSize) { + while (resultList.size() < pageSize) { currentPage++; dataVo.setCurrentPage(currentPage); List> dataList = matrixDataSourceHandler.searchTableDataNew(dataVo); - List list = deduplicateData(previousPageList, valueField, textField, dataList); + List list = deduplicateData(previousPageList, valueField, dataList); if (currentPage >= startPage) { - valueList.addAll(list); + for (String value: list) { + Map options = getOptionsByValue(matrixVo, columnList, new ArrayList<>(notNullColumnSet), valueField, textField, value); + if (options != null) { + resultList.add(options); + } + } } if (currentPage >= dataVo.getPageCount()) { break; } } - dataVo.setIsDistinct(false); - dataVo.setColumnList(columnList); - dataVo.setNotNullColumnList(new ArrayList<>(notNullColumnSet)); - dataVo.setDefaultValue(null); - dataVo.setPageSize(1); - for (String value : valueList) { - List defaultValueFilterList = new ArrayList<>(); - MatrixDefaultValueFilterVo matrixDefaultValueFilterVo = new MatrixDefaultValueFilterVo( - new MatrixKeywordFilterVo(valueField, SearchExpression.EQ.getExpression(), value), - new MatrixKeywordFilterVo(textField, SearchExpression.NOTNULL.getExpression(), null) - ); - defaultValueFilterList.add(matrixDefaultValueFilterVo); - dataVo.setDefaultValueFilterList(defaultValueFilterList); - List> dataList = matrixDataSourceHandler.searchTableDataNew(dataVo); - if (CollectionUtils.isNotEmpty(dataList)) { - resultList.add(dataList.get(0)); - } - } } JSONArray dataList = new JSONArray(); if (CollectionUtils.isNotEmpty(resultList)) { @@ -474,14 +460,36 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase // } // } + private Map getOptionsByValue(MatrixVo matrixVo, List columnList, List notNullColumnList, String valueField, String textField, String value) { + MatrixDataVo dataVo = new MatrixDataVo(); + dataVo.setMatrixUuid(matrixVo.getUuid()); + dataVo.setIsDistinct(false); + dataVo.setColumnList(columnList); + dataVo.setNotNullColumnList(notNullColumnList); + dataVo.setDefaultValue(null); + dataVo.setPageSize(1); + List defaultValueFilterList = new ArrayList<>(); + MatrixDefaultValueFilterVo matrixDefaultValueFilterVo = new MatrixDefaultValueFilterVo( + new MatrixKeywordFilterVo(valueField, SearchExpression.EQ.getExpression(), value), + new MatrixKeywordFilterVo(textField, SearchExpression.NOTNULL.getExpression(), null) + ); + defaultValueFilterList.add(matrixDefaultValueFilterVo); + dataVo.setDefaultValueFilterList(defaultValueFilterList); + IMatrixDataSourceHandler matrixDataSourceHandler = MatrixDataSourceHandlerFactory.getHandler(matrixVo.getType()); + List> dataList = matrixDataSourceHandler.searchTableDataNew(dataVo); + return getFirstElement(dataList, valueField, textField); + } + /** - * 只根据value值去重 - * @param previousPageList - * @param valueField + * 找出第一个符合value不为空且text不为空的元素 * @param dataList + * @param valueField + * @param textField */ - private List deduplicateData(List previousPageList, String valueField, String textField, List> dataList) { - List resultList = new ArrayList<>(); + private Map getFirstElement(List> dataList, String valueField, String textField) { + if (CollectionUtils.isEmpty(dataList)) { + return null; + } for (Map resultObj : dataList) { JSONObject firstObj = resultObj.get(valueField); if (MapUtils.isEmpty(firstObj)) { @@ -491,9 +499,6 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase if (StringUtils.isBlank(value)) { continue; } - if (previousPageList.contains(value)) { - continue; - } JSONObject secondObj = resultObj.get(textField); if (MapUtils.isEmpty(secondObj)) { continue; @@ -502,6 +507,31 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase if (StringUtils.isBlank(text)) { continue; } + return resultObj; + } + return null; + } + + /** + * 只根据value值去重 + * @param previousPageList + * @param valueField + * @param dataList + */ + private List deduplicateData(List previousPageList, String valueField, List> dataList) { + List resultList = new ArrayList<>(); + for (Map resultObj : dataList) { + JSONObject firstObj = resultObj.get(valueField); + if (MapUtils.isEmpty(firstObj)) { + continue; + } + String value = firstObj.getString("value"); + if (StringUtils.isBlank(value)) { + continue; + } + if (previousPageList.contains(value)) { + continue; + } previousPageList.add(value); resultList.add(value); } -- Gitee