'commit'

dsBase/src/main/java/com/dsideal/base/Test/TestDataSet.java

@@ -41,15 +41,25 @@ public class TestDataSet {
 
     /**
      * 将数据集填充到数据库表中，用于配置此数据集让谁来维护
-     * @param table_name 表名
+     *
+     * @param parent_name  数据集的父名称
+     * @param table_name   表名
      * @param dataset_name 数据集名
      */
-    public static void addDataSet(String table_name, String dataset_name) {
+    public static void addDataSet(String parent_name, String table_name, String dataset_name) {
         String sql = "select count(1) from t_dp_dataset where table_name=?";
         if (Db.queryInt(sql, table_name) == 0) {
             Record record = new Record();
+            record.set("parent_name", parent_name);
             record.set("table_name", table_name);
             record.set("dataset_name", dataset_name);
+            if (parent_name.contains("省")) {
+                record.set("owner_id", 1);
+            } else if (parent_name.contains("市") || parent_name.contains("州")) {
+                record.set("owner_id", 2);
+            } else if (parent_name.contains("县")) {
+                record.set("owner_id", 3);
+            }
             Db.save("t_dp_dataset", "id", record);
         }
     }
@@ -92,6 +102,8 @@ public class TestDataSet {
 
         for (Record record : list) {
             long id = record.getLong("id");
+            //数据集父名称
+            String parent_name = record.getStr("parent_name");
             //数据集名称
             String dataset_name = record.getStr("name");
             //对应的表名
@@ -99,14 +111,14 @@ public class TestDataSet {
             //表的信息
             List<Record> columns = getColumns(table_name);
 
-            System.out.println(dataset_name + "   " + 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(table_name, dataset_name);
+            addDataSet(parent_name, table_name, dataset_name);
         }
     }
 }

dsBase/src/main/resources/Sql/dataease.sql

@@ -14,9 +14,10 @@
           FROM core_dataset_group c
           INNER JOIN tree_cte t ON c.pid = t.id
       )
-    SELECT id  ,name ,pid,node_type FROM tree_cte
+    SELECT t1.id  ,t1.name ,t1.pid,t1.node_type,t2.name as parent_name FROM tree_cte as t1 inner join core_dataset_group as t2
+        on t1.pid=t2.id
         #if(dataset)
-            where node_type='dataset'
+            where t1.node_type='dataset'
         #end
     #end
     -- 获取表名