'commit'

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -18,7 +18,7 @@ public class DataEaseModel {
      * @return 数据集列表
      */
     public List<Record> getDataSet(int identity_id) {
-        String sql = "select * from t_dp_dataset where owner_id=? order by dataset_name";
+        String sql = "select * from t_dp_dataset where owner_id=? order by dataease_id desc";
         return Db.find(sql, identity_id);
     }
 

src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java

@@ -38,11 +38,11 @@ public class InitDataEaseDataSet {
      * @param table_name   表名
      * @param dataset_name 数据集名
      */
-    public static void addDataSet(String parent_name, String table_name, String dataset_name,long sort_id) {
+    public static void addDataSet(String parent_name, String table_name, String dataset_name,long dataease_id) {
         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("parent_name", parent_name.replace("-",""));
             record.set("table_name", table_name);
             record.set("dataset_name", dataset_name);
             if (parent_name.contains("省")) {
@@ -52,7 +52,7 @@ public class InitDataEaseDataSet {
             } else if (parent_name.contains("县")) {
                 record.set("owner_id", 3);
             }
-            record.set("sort_id",sort_id);
+            record.set("dataease_id",dataease_id);
             Db.save("t_dp_dataset", "id", record);
             System.out.println("添加数据集成功,parent_name=" + parent_name + ",table_name=" + table_name + ",dataset_name=" + dataset_name);
         }
@@ -186,16 +186,16 @@ public class InitDataEaseDataSet {
         List<Record> list = Db.find(sqlPara);
 
         for (Record record : list) {
-            long id = record.getLong("id");
+            long dataease_id = record.getLong("id");
             //数据集父名称
             String parent_name = record.getStr("parent_name");
             //数据集名称
             String dataset_name = record.getStr("name");
             //对应的表名
-            String table_name = getTableName(id);
+            String table_name = getTableName(dataease_id);
 
             //将这些数据集扫描到表中，然后标识这个数据集由谁来维护
-            addDataSet(parent_name, table_name, dataset_name,id);
+            addDataSet(parent_name, table_name, dataset_name,dataease_id);
         }
         //加上主键
         //addPrimaryKey();