From cb2aa6e54c2fd4ba01d5e3f52cb14ebd37780079 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 17 Apr 2024 15:55:15 +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
---
 ...MatrixPrivateDataSourceHandlerFactory.java | 15 +++++++++
 .../framework/matrix/dto/MatrixDataVo.java    | 31 +++++++++++++++++++
 .../framework/matrix/dto/MatrixFilterVo.java  | 12 +++++++
 3 files changed, 58 insertions(+)

diff --git a/src/main/java/neatlogic/framework/matrix/core/MatrixPrivateDataSourceHandlerFactory.java b/src/main/java/neatlogic/framework/matrix/core/MatrixPrivateDataSourceHandlerFactory.java
index 3f8ae4601..8e1365614 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 17e6cf33e..36238719d 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<String> columnList;
+
+    private List<String> columnNameList;
+
     @Deprecated
     private List<MatrixColumnVo> sourceColumnList;
     /**
@@ -22,6 +28,7 @@ public class MatrixDataVo extends BasePageVo {
     private List<String> 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<String> notNullColumnList) {
         this.notNullColumnList = notNullColumnList;
     }
+
+    public String getMatrixLabel() {
+        return matrixLabel;
+    }
+
+    public void setMatrixLabel(String matrixLabel) {
+        this.matrixLabel = matrixLabel;
+    }
+
+    public List<String> getColumnNameList() {
+        return columnNameList;
+    }
+
+    public void setColumnNameList(List<String> 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 c089278ea..5b8fd89b0 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<String> valueList;
     private String expression;
 
+    public MatrixFilterVo() {
+    }
+
     public MatrixFilterVo(String uuid, String expression, List<String> 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;
     }
-- 
Gitee