diff --git a/src/main/java/neatlogic/framework/matrix/core/MatrixPrivateDataSourceHandlerFactory.java b/src/main/java/neatlogic/framework/matrix/core/MatrixPrivateDataSourceHandlerFactory.java index 3f8ae4601ac894d0e511eae3977cf09b4e67fc97..8e13656143dd31f898a74ae1074c8bf6a0170443 100644 --- a/src/main/java/neatlogic/framework/matrix/core/MatrixPrivateDataSourceHandlerFactory.java +++ b/src/main/java/neatlogic/framework/matrix/core/MatrixPrivateDataSourceHandlerFactory.java @@ -56,6 +56,21 @@ public class MatrixPrivateDataSourceHandlerFactory extends ModuleInitializedList return null; } + /** + * 根据label获取单个矩阵对象信息 + * + * @param label 唯一标识 + * @return 单个矩阵对象信息 + */ + public static MatrixVo getMatrixVoByLabel(String label) { + for (MatrixVo matrixVo : list) { + if (matrixVo.getLabel().equals(label)) { + return matrixVo; + } + } + return null; + } + /** * 根据搜索条件统计符合条件矩阵总数 * diff --git a/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java b/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java index 17e6cf33ebc2e2ccb4f2eb687d6d2c3b9e3da82c..36238719d582577f36aff81ca3315111f448088a 100644 --- a/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java +++ b/src/main/java/neatlogic/framework/matrix/dto/MatrixDataVo.java @@ -13,7 +13,13 @@ import java.util.List; **/ public class MatrixDataVo extends BasePageVo { private String matrixUuid; + + private String matrixLabel; + private List columnList; + + private List columnNameList; + @Deprecated private List sourceColumnList; /** @@ -22,6 +28,7 @@ public class MatrixDataVo extends BasePageVo { private List uuidList; private String uuidColumn; private String keywordColumn; + private String keywordColumnName; private String keywordExpression; private String uuid; private String attrType; @@ -207,4 +214,28 @@ public class MatrixDataVo extends BasePageVo { public void setNotNullColumnList(List notNullColumnList) { this.notNullColumnList = notNullColumnList; } + + public String getMatrixLabel() { + return matrixLabel; + } + + public void setMatrixLabel(String matrixLabel) { + this.matrixLabel = matrixLabel; + } + + public List getColumnNameList() { + return columnNameList; + } + + public void setColumnNameList(List columnNameList) { + this.columnNameList = columnNameList; + } + + public String getKeywordColumnName() { + return keywordColumnName; + } + + public void setKeywordColumnName(String keywordColumnName) { + this.keywordColumnName = keywordColumnName; + } } diff --git a/src/main/java/neatlogic/framework/matrix/dto/MatrixFilterVo.java b/src/main/java/neatlogic/framework/matrix/dto/MatrixFilterVo.java index c089278ea50ad2e11ab63bdc3bd49d306b4e90c9..5b8fd89b06b31c4a4aea2972c3ae600e6ee08805 100644 --- a/src/main/java/neatlogic/framework/matrix/dto/MatrixFilterVo.java +++ b/src/main/java/neatlogic/framework/matrix/dto/MatrixFilterVo.java @@ -4,10 +4,14 @@ import java.util.List; public class MatrixFilterVo { private String uuid; + private String name; private String type; private List valueList; private String expression; + public MatrixFilterVo() { + } + public MatrixFilterVo(String uuid, String expression, List valueList) { this.uuid = uuid; this.expression = expression; @@ -29,6 +33,14 @@ public class MatrixFilterVo { this.uuid = uuid; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getType() { return type; }