From f9ffd8c80424c5854d41e762492bd4e1921ab904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 25 Oct 2024 13:42:39 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/base/Test/TestDataSet.java    | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/dsBase/src/main/java/com/dsideal/base/Test/TestDataSet.java b/dsBase/src/main/java/com/dsideal/base/Test/TestDataSet.java
index 434a7213..b7e573b6 100644
--- a/dsBase/src/main/java/com/dsideal/base/Test/TestDataSet.java
+++ b/dsBase/src/main/java/com/dsideal/base/Test/TestDataSet.java
@@ -34,11 +34,22 @@ public class TestDataSet {
      * @param table_name 表名
      * @return 表的信息
      */
-    public static List<Record> getColumns(String table_name) {
+    public static List<Record> getTableColumns(String table_name) {
         String sql = "desc `" + table_name + "`";
         return Db.find(sql);
     }
 
+    /**
+     * 获取数据表中的数据
+     *
+     * @param table_name 表名
+     * @return 表中的数据
+     */
+    public static List<Record> getTableData(String table_name) {
+        String sql = "select * from `" + table_name+"`";
+        return Db.find(sql);
+    }
+
     /**
      * 将数据集填充到数据库表中，用于配置此数据集让谁来维护
      *
@@ -108,17 +119,21 @@ public class TestDataSet {
             String dataset_name = record.getStr("name");
             //对应的表名
             String table_name = getTableName(id);
-            //表的信息
-            List<Record> columns = getColumns(table_name);
 
+            //将这些数据集扫描到表中，然后标识这个数据集由谁来维护
+            addDataSet(parent_name, table_name, dataset_name);
+
+            //获取表有哪些列
+            List<Record> columns = getTableColumns(table_name);
             System.out.println(parent_name + " " + dataset_name + "   " + table_name);
             List<String> cols = new ArrayList<>();
             for (Record column : columns) {
                 cols.add(column.getStr("Field"));
             }
             System.out.println(cols);
-            //将这些数据集扫描到表中，然后标识这个数据集由谁来维护
-            addDataSet(parent_name, table_name, dataset_name);
+            //获取表中的数据
+            List<Record> data = getTableData(table_name);
+            System.out.println(data);
         }
     }
 }