'commit'

src/main/java/com/dsideal/base/Base/Controller/BaseController.java

@@ -1,6 +1,7 @@
 package com.dsideal.base.Base.Controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.dsideal.base.Util.CookieUtil;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
@@ -822,9 +823,29 @@ public class BaseController extends Controller {
         renderJson(record);
     }
 
+    /**
+     * 根据当前登录人员的identity_id,获取此人员可以维护的数据集名称
+     */
     @Before({GET.class})
-    public void getData(){
-        List<Record> list=model.getData();
+    @IsLoginInterface({})
+    public void getDataSet() {
+        // 人员身份
+        // identity_id=1 省
+        // identity_id=2 市
+        // identity_id=3 县
+        int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id"));
+        List<Record> list = model.getDataSet(identity_id);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
+
+    /**
+     * 获取数据集下的数据表
+     * @param dataset_id 数据集id
+     */
+    @Before(GET.class)
+    @IsLoginInterface({})
+    public void getDataSetTable(int dataset_id) {
+        List<Record> list= model.getDataSetTable(dataset_id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 }

src/main/java/com/dsideal/base/Base/Model/BaseModel.java

@@ -971,6 +971,7 @@ public class BaseModel {
         String sql = Db.getSql("Base.getZyyxClassTree");
         return Db.find(sql, bureau_id, bureau_id);
     }
+
     /*
     功能：获取单位属性
      */
@@ -983,9 +984,28 @@ public class BaseModel {
         return record;
     }
 
-    public List<Record> getData(){
-        String sql="select * from dataease.`excel_报告-教育资源配置发展预测_cbd431c461`";
-        List<Record> list=Db.find(sql);
-        return list;
+    /**
+     * 获取当前人员可以看到哪些数据集
+     *
+     * @param identity_id 身份id
+     * @return 数据集列表
+     */
+    public List<Record> getDataSet(int identity_id) {
+        String sql = "select * from t_dp_dataset where owner_id=? order by dataset_name";
+        return Db.find(sql, identity_id);
+    }
+
+    /**
+     * 获取数据集对应的表
+     *
+     * @param dataset_id 数据集id
+     * @return
+     */
+    public List<Record> getDataSetTable(int dataset_id) {
+        String sql = "select * from t_dp_dataset where id=?";
+        Record record = Db.findFirst(sql, dataset_id);
+        if (record == null) return null;
+        sql = "select * from dataease.`" + record.getStr("table_name") + "`";
+        return Db.find(sql);
     }
 }

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

@@ -1,4 +1,4 @@
-package com.dsideal.base.Test;
+package com.dsideal.base.Tools;
 
 import com.dsideal.base.Plugin.YamlProp;
 import com.jfinal.kit.Kv;
@@ -14,7 +14,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class TestDataSet {
+public class InitDataEaseDataSet {
 
     /**
      * 获取数据集的表名
@@ -35,7 +35,7 @@ public class TestDataSet {
      * @return 表的信息
      */
     public static List<Record> getTableColumns(String table_name) {
-        String sql = "desc `dataease." + table_name + "`";
+        String sql = "desc dataease.`" + table_name + "`";
         return Db.find(sql);
     }
 
@@ -46,7 +46,7 @@ public class TestDataSet {
      * @return 表中的数据
      */
     public static List<Record> getTableData(String table_name) {
-        String sql = "select * from `dataease." + table_name+"`";
+        String sql = "select * from dataease.`" + table_name+"`";
         return Db.find(sql);
     }
 
@@ -89,7 +89,7 @@ public class TestDataSet {
 
         //遍历sql目录下所有的sql文件
         File sqlDir;
-        String basePath = TestDataSet.class.getResource("/").getPath();
+        String basePath = InitDataEaseDataSet.class.getResource("/").getPath();
         sqlDir = new File(basePath + "/Sql");
         File[] sqlFiles = sqlDir.listFiles();
         for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {