From 01f711557be4da7d14d9a5730b8a8b987b4e37f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 15 Jan 2025 09:21:09 +0800 Subject: [PATCH] 'commit' --- .../YunXiao/Controller/YunXiaoController.java | 11 +++--- .../base/YunXiao/Model/YunXiaoModel.java | 39 ++++++------------- src/main/resources/Sql/YunXiao.sql | 4 +- 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/dsideal/base/YunXiao/Controller/YunXiaoController.java b/src/main/java/com/dsideal/base/YunXiao/Controller/YunXiaoController.java index b1eb662f..45961cbe 100644 --- a/src/main/java/com/dsideal/base/YunXiao/Controller/YunXiaoController.java +++ b/src/main/java/com/dsideal/base/YunXiao/Controller/YunXiaoController.java @@ -22,10 +22,11 @@ public class YunXiaoController extends Controller { * 获取数据集树 */ @Before(GET.class) - @IsLoginInterface({}) + //@IsLoginInterface({}) public void getDatasetTree() { List list = ym.getDatasetTree(); - renderJson(CommonUtil.renderJsonForLayUI(list)); + System.out.println(list); + renderJson(list); } /** @@ -35,8 +36,8 @@ public class YunXiaoController extends Controller { * @param limit 每页显示多少条数据 */ @Before(GET.class) - @IsLoginInterface({}) - public void getDataSetContent(long datasetId, int page, int limit) { + //@IsLoginInterface({}) + public void getDataSetContent(String datasetId, int page, int limit) { Page p = ym.getDataSetContent(datasetId, page, limit); renderJson(CommonUtil.renderJsonForLayUI(p)); } @@ -52,7 +53,7 @@ public class YunXiaoController extends Controller { */ @Before(POST.class) @IsLoginInterface({}) - public void saveDataSet(int dataset_id, int id, String field, String value) { + public void saveDataSet(String dataset_id, String id, String field, String value) { ym.saveDataSet(dataset_id, id, field, value); renderJson(CommonUtil.returnMessageJson(true, "保存成功")); } diff --git a/src/main/java/com/dsideal/base/YunXiao/Model/YunXiaoModel.java b/src/main/java/com/dsideal/base/YunXiao/Model/YunXiaoModel.java index baf1b717..02a3ac70 100644 --- a/src/main/java/com/dsideal/base/YunXiao/Model/YunXiaoModel.java +++ b/src/main/java/com/dsideal/base/YunXiao/Model/YunXiaoModel.java @@ -14,23 +14,6 @@ public class YunXiaoModel { //DataEase数据库名称 public static String DB_NAME = "dataease"; - /** - * 获取当前人员可以看到哪些数据集 - * - * @return 数据集列表 - */ - public List getDataSet() { - String sql = "select t1.* from t_dp_yx_dataset as t1 where t1.b_use=1 order by t1.dataset_group_id"; - List list = Db.find(sql); - for (Record record : list) { - String table_name = record.getStr("table_name"); - sql = "select count(1) as c from `" + table_name + "`"; - int cnt = Db.use(DB_NAME).queryInt(sql); - record.set("fill_count", cnt); - } - return list; - } - /** * 获取数据集的表名 * @@ -56,7 +39,7 @@ public class YunXiaoModel { * @param table_name 表名 * @param dataset_name 数据集名 */ - public void collectDataSet(String parent_name, String table_name, String dataset_name, long dataset_group_id) { + public void collectDataSet(String parent_name, String table_name, String dataset_name, String dataset_group_id) { String sql = "select count(1) from t_dp_yx_dataset where dataset_group_id=?"; if (Db.queryInt(sql, dataset_group_id) > 0) { System.out.println("数据集已经存在，无需再次添加"); @@ -165,7 +148,7 @@ public class YunXiaoModel { //1、获取树根 String sql = "select * from dataease.core_dataset_group where name='长春云校'"; Record rRoot = Db.findFirst(sql); - long rootId = rRoot.getLong("id"); + String rootId = rRoot.getStr("id"); if (clear) { //清空数据集表 @@ -180,13 +163,13 @@ public class YunXiaoModel { List list = Db.find(sqlPara); for (Record record : list) { - long dataset_group_id = record.getLong("id"); + String dataset_group_id = record.getStr("id"); //数据集父名称 String parent_name = record.getStr("parent_name"); //数据集名称 String dataset_name = record.getStr("name"); //对应的表名 - String table_name = getTableName(String.valueOf(dataset_group_id)); + String table_name = getTableName(dataset_group_id); if (!StrKit.isBlank(table_name)) { //将这些数据集扫描到表中，然后标识这个数据集由谁来维护 collectDataSet(parent_name, table_name, dataset_name, dataset_group_id); @@ -212,13 +195,13 @@ public class YunXiaoModel { * @param id 节点id * @return */ - public List getChildren(long id) { - List list = new ArrayList<>(); + public List getChildren(String id) { + List list = new ArrayList<>(); list.add(id); String sql = "select * from data_visualization_info where pid=?"; List children = Db.use(DB_NAME).find(sql, id); for (Record r : children) { - list.addAll(getChildren(r.getLong("id"))); + list.addAll(getChildren(r.getStr("id"))); } return list; } @@ -228,9 +211,10 @@ public class YunXiaoModel { * * @return */ - public Page getDataSetContent(long datasetId, int pageNumber, int pageSize) { + public Page getDataSetContent(String datasetId, int pageNumber, int pageSize) { String sql = "select * from t_dp_yx_dataset where dataset_group_id=?"; Record record = Db.findFirst(sql, datasetId); + if(record == null) return null; String tableName = record.getStr("table_name"); Page p = Db.paginate(pageNumber, pageSize, "SELECT *", "from " + DB_NAME + ".`" + tableName); @@ -241,7 +225,7 @@ public class YunXiaoModel { /** * 保存数据集对应的表 */ - public void saveDataSet(int dataset_id, int id, String field, String value) { + public void saveDataSet(String dataset_id, String id, String field, String value) { Record record = Db.findById("t_dp_yx_dataset", "id", dataset_id); String tableName = record.getStr("table_name"); String sql = "update `" + tableName + "` set `" + field + "`=? where id=?"; @@ -264,6 +248,7 @@ public class YunXiaoModel { */ public List getDatasetTree() { SqlPara sqlPara = Db.getSqlPara("YunXiao.datasetTree"); - return Db.find(sqlPara); + List list=Db.find(sqlPara); + return list; } } diff --git a/src/main/resources/Sql/YunXiao.sql b/src/main/resources/Sql/YunXiao.sql index 91e78d84..7f8ea92d 100644 --- a/src/main/resources/Sql/YunXiao.sql +++ b/src/main/resources/Sql/YunXiao.sql @@ -3,13 +3,13 @@ WITH RECURSIVE tree_cte AS ( SELECT * FROM dataease.core_dataset_group - WHERE id = 1072161072829566976 -- 上线 + WHERE id = '1072161072829566976' -- 上线 UNION ALL SELECT c.* FROM dataease.core_dataset_group c INNER JOIN tree_cte t ON c.pid = t.id ) - SELECT t1.id ,t1.name ,t1.pid,t1.node_type,t2.name as parent_name FROM tree_cte as t1 + SELECT CAST(t1.id AS CHAR(18)) as id ,t1.name ,CAST(t1.pid AS CHAR(18)) as pid,t1.node_type,t2.name as parent_name FROM tree_cte as t1 inner join dataease.core_dataset_group as t2 on t1.pid=t2.id #end