From d89b8e4f7826797e7d9c5c61bdaefd07178a6f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 30 Dec 2024 07:33:13 +0800 Subject: [PATCH] 'commit' --- WebRoot/html/pages/dataease/dataMod.html | 213 +++++++++--------- .../Controller/DataEaseController.java | 16 +- .../base/DataEase/Model/DataEaseModel.java | 14 +- 3 files changed, 128 insertions(+), 115 deletions(-) diff --git a/WebRoot/html/pages/dataease/dataMod.html b/WebRoot/html/pages/dataease/dataMod.html index 1ff0fa04..0595683f 100644 --- a/WebRoot/html/pages/dataease/dataMod.html +++ b/WebRoot/html/pages/dataease/dataMod.html @@ -68,135 +68,140 @@ -
-
- -
- - -
-
- - +
+
+ +
+ + +
+
+ -
+
- - - + + if (r != null) return unescape(r[2]); + return null; + } + }); + 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 d8ac127a..652acc51 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -9,6 +9,7 @@ import com.dsideal.base.DataEase.Util.Step3_CopyBigScreen; import com.dsideal.base.Interceptor.EmptyInterface; import com.dsideal.base.Interceptor.IsLoginInterface; import com.dsideal.base.Interceptor.IsNumericInterface; +import com.dsideal.base.Interceptor.LayUiPageInfoInterface; import com.dsideal.base.Res.Model.ResourceModel; import com.dsideal.base.Util.CommonUtil; import com.dsideal.base.Util.CookieUtil; @@ -18,6 +19,7 @@ import com.jfinal.ext.interceptor.GET; import com.jfinal.ext.interceptor.POST; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; +import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.upload.UploadFile; import io.github.yedaxia.apidocs.ApiDoc; @@ -74,6 +76,7 @@ public class DataEaseController extends Controller { /** * 省级路由，配合市州的大屏文档拷贝使用，每个市州大屏的仪表盘都拷贝一份出来，然后修改名称和数据源即可 + * * @param city_name 市州名称 */ @Before({GET.class}) @@ -215,7 +218,6 @@ public class DataEaseController extends Controller { } - /** * 下载指定数据集的Excel文件 * @@ -314,12 +316,16 @@ public class DataEaseController extends Controller { /** * 获取数据集下的数据表 * - * @param id 数据集id + * @param id 数据集id + * @param pageNumber 第几页 + * @param pageSize 每页多少条数据 */ @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContent(int id) { + public void getDataSetContent(int id, int pageNumber, int pageSize) { + if (pageNumber == 0) pageNumber = 1; + if (pageSize == 0) pageSize = 20; //登录的人员 int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id")); String person_id = CookieUtil.getValue(getRequest(), "person_id"); @@ -330,8 +336,8 @@ public class DataEaseController extends Controller { //根据区域码，获取区域名称 String area_name = rm.getAreaName(area_code); - List list = dm.getDataSetContent(id, identity_id, area_name); - renderJson(CommonUtil.renderJsonForLayUI(list)); + Page pageList = dm.getDataSetContent(id, identity_id, area_name, pageNumber, pageSize); + renderJson(CommonUtil.renderJsonForLayUI(pageList)); } /** 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 9d58b7a6..849f5e8c 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -5,6 +5,7 @@ import com.dsideal.base.Util.ExcelCommonUtil; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.SqlPara; import net.sf.json.JSONArray; @@ -584,17 +585,18 @@ public class DataEaseModel { * @param id 数据集id * @return */ - public List getDataSetContent(int id, int identity_id, String area_name) { + public Page getDataSetContent(int id, int identity_id, String area_name, int pageNumber, int pageSize) { Record record = Db.findById("t_dp_dataset", "id", id); String tableName = record.getStr("table_name"); - + Page p; if (identity_id > 1) { - String sql = "select * from `" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'"; - return Db.use(DB_NAME).find(sql); + p = Db.paginate(pageNumber, pageSize, + "SELECT *", "from "+DB_NAME+".`" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'"); } else { - String sql = "select * from `" + tableName + "`"; - return Db.use(DB_NAME).find(sql); + p = Db.paginate(pageNumber, pageSize, + "SELECT *", "from "+DB_NAME+".`" + tableName + "`"); } + return p; } /**