From c1e8707ccd5adb9cafb5214b997ca95f6df63a9b Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 17 Apr 2024 19:15:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=9F=A9=E9=98=B5?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81matrixLab?= =?UTF-8?q?el=E6=9B=BF=E4=BB=A3matrixUuid=EF=BC=8CattrName=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3attrUuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1136926608818176]矩阵两个接口支持matrixLabel替代matrixUuid，attrName替代attrUuid http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1136926608818176 --- .../MatrixColumnDataSearchForTableNewApi.java | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java index 47b233e3..abde6a03 100644 --- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java +++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java @@ -76,6 +76,7 @@ public class MatrixColumnDataSearchForTableNewApi extends PrivateApiComponentBas @Param(name = "matrixLabel", desc = "矩阵名", type = ApiParamType.STRING), @Param(name = "columnNameList", desc = "目标属性集合，数据按这个字段顺序返回", type = ApiParamType.JSONARRAY, minSize = 1), + @Param(name = "isAllColumn", desc = "是否返回所有属性", type = ApiParamType.INTEGER), }) @Description(desc = "矩阵属性数据查询-table接口") @Output({ @@ -194,30 +195,35 @@ public class MatrixColumnDataSearchForTableNewApi extends PrivateApiComponentBas List attributeUuidList = matrixAttributeList.stream().map(MatrixAttributeVo::getUuid).collect(Collectors.toList()); List columnNameList = dataVo.getColumnNameList(); - if (CollectionUtils.isNotEmpty(dataVo.getColumnList())) { - dataVo.setColumnNameList(null); - List notFoundColumnList = ListUtils.removeAll(dataVo.getColumnList(), attributeUuidList); - if (CollectionUtils.isNotEmpty(notFoundColumnList)) { - throw new MatrixAttributeNotFoundException(matrixVo.getName(), String.join(",", notFoundColumnList)); - } - } else if (CollectionUtils.isNotEmpty(columnNameList)) { - List columnList = new ArrayList<>(); - List notFoundColumnList = new ArrayList<>(); - for (String columnName : columnNameList) { - if (StringUtils.isBlank(columnName)) { - continue; + Integer isAllColumn = jsonObj.getInteger("isAllColumn"); + if (Objects.equals(isAllColumn, 1)) { + dataVo.setColumnList(attributeUuidList); + } else { + if (CollectionUtils.isNotEmpty(dataVo.getColumnList())) { + dataVo.setColumnNameList(null); + List notFoundColumnList = ListUtils.removeAll(dataVo.getColumnList(), attributeUuidList); + if (CollectionUtils.isNotEmpty(notFoundColumnList)) { + throw new MatrixAttributeNotFoundException(matrixVo.getName(), String.join(",", notFoundColumnList)); } - String column = nameToUuidMap.get(columnName); - if (StringUtils.isBlank(column)) { - notFoundColumnList.add(columnName); - } else { - columnList.add(column); + } else if (CollectionUtils.isNotEmpty(columnNameList)) { + List columnList = new ArrayList<>(); + List notFoundColumnList = new ArrayList<>(); + for (String columnName : columnNameList) { + if (StringUtils.isBlank(columnName)) { + continue; + } + String column = nameToUuidMap.get(columnName); + if (StringUtils.isBlank(column)) { + notFoundColumnList.add(columnName); + } else { + columnList.add(column); + } } + if (CollectionUtils.isNotEmpty(notFoundColumnList)) { + throw new MatrixAttributeNotFoundException(matrixVo.getName(), String.join(",", notFoundColumnList)); + } + dataVo.setColumnList(columnList); } - if (CollectionUtils.isNotEmpty(notFoundColumnList)) { - throw new MatrixAttributeNotFoundException(matrixVo.getName(), String.join(",", notFoundColumnList)); - } - dataVo.setColumnList(columnList); } List> tbodyList = matrixDataSourceHandler.searchTableDataNew(dataVo); if (CollectionUtils.isNotEmpty(columnNameList)) { -- Gitee