diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java index ae2a8a5e..31715d49 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -63,7 +63,7 @@ public class DataEaseController extends Controller { // identity_id=2 市 // identity_id=3 县 int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id")); - List list = dm.getDataSet(identity_id); + List list = dm.getDataSetByIdentityId(identity_id); renderJson(CommonUtil.renderJsonForLayUI(list)); } diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java index 5848696c..1adb2168 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -21,7 +21,7 @@ public class DataEaseModel { * @param identity_id 身份id * @return 数据集列表 */ - public List getDataSet(int identity_id) { + public List getDataSetByIdentityId(int identity_id) { String sql = "select * from t_dp_dataset where owner_id=? order by dataease_id desc"; return Db.find(sql, identity_id); } diff --git a/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java b/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java index 676ffdc9..4d98a105 100644 --- a/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java +++ b/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java @@ -6,8 +6,10 @@ import com.jfinal.kit.Prop; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.plugin.hikaricp.HikariCpPlugin; +import com.jfinal.plugin.activerecord.Record; import java.io.File; +import java.util.List; public class InitDataEaseDataSet { @@ -54,5 +56,31 @@ public class InitDataEaseDataSet { dm.addPrimaryKey(); //3、将所有非空列去掉不允许为空的限制 dm.updateNotNullColumns(); + + //4、遍历所有数据集的表 + int total = 0; + for (int i = 1; i <= 3; i++) {//1:省管理员,2:市州管理员,3:县区管理员 + switch (i) { + case 1: + System.out.println("正在处理省管理员需要看到的数据集~"); + break; + case 2: + System.out.println("正在处理市州管理员需要看到的数据集~"); + break; + case 3: + System.out.println("正在处理县区管理员需要看到的数据集~"); + break; + } + + List list = dm.getDataSetByIdentityId(i); + System.out.println("数据集个数=" + list.size()); + total += list.size(); + for (Record record : list) { + int id = record.getInt("id"); + String tableName = record.getStr("table_name"); + System.out.println("正在处理数据集:" + tableName); + } + } + System.out.println("恭喜,所有数据处理完毕,共生成数据集数量=" + total + "个。"); } }