'commit'

WebRoot/html/pages/dataease/dataMod.html

@@ -85,7 +85,6 @@
         </script>
 
 
-
     </div>
 </div>
 
@@ -129,7 +128,13 @@
         table.render({
             elem: '#ID-table-demo-data',
             id: 'ID-table-demo-data',
-                page: false,
+            page: true            //开启分页
+            , limit: 10            //每页显示的条数
+            , limits: [10, 20, 30]
+            , request: {
+                pageName: 'pageNumber' //页码的参数名称，默认：page
+                , limitName: 'pageSize' //每页数据量的参数名，默认：limit
+            },
             cols: [_cols],
             data: _data
         });

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文件
      *
@@ -315,11 +317,15 @@ public class DataEaseController extends Controller {
      * 获取数据集下的数据表
      *
      * @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<Record> list = dm.getDataSetContent(id, identity_id, area_name);
+        Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name, pageNumber, pageSize);
-        renderJson(CommonUtil.renderJsonForLayUI(list));
+        renderJson(CommonUtil.renderJsonForLayUI(pageList));
     }
 
     /**

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<Record> getDataSetContent(int id, int identity_id, String area_name) {
+    public Page<Record> 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<Record> p;
         if (identity_id > 1) {
-            String sql = "select * from `" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'";
+            p = Db.paginate(pageNumber, pageSize,
-            return Db.use(DB_NAME).find(sql);
+                    "SELECT *", "from "+DB_NAME+".`" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'");
         } else {
-            String sql = "select * from `" + tableName + "`";
+            p = Db.paginate(pageNumber, pageSize,
-            return Db.use(DB_NAME).find(sql);
+                    "SELECT *", "from "+DB_NAME+".`" + tableName + "`");
         }
+        return p;
     }
 
     /**