From 819d0cad8ae867c2b3e0c2eb50fe7dd6b156d73a 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 08:38:02 +0800 Subject: [PATCH 1/5] 'commit' --- .../base/DataEase/Controller/DataEaseController.java | 5 +++-- .../com/dsideal/base/DataEase/Model/DataEaseModel.java | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 df0136c8..c9901dba 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -318,12 +318,13 @@ public class DataEaseController extends Controller { * * @param id 数据集id * @param pageNumber 第几页 + * @param keyword 关键字 * @param pageSize 每页多少条数据 */ @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContent(int id, int pageNumber, int pageSize) { + public void getDataSetContent(int id, String keyword, int pageNumber, int pageSize) { if (pageNumber == 0) pageNumber = 1; if (pageSize == 0) pageSize = 20; //登录的人员 @@ -336,7 +337,7 @@ public class DataEaseController extends Controller { //根据区域码，获取区域名称 String area_name = rm.getAreaName(area_code); - Page pageList = dm.getDataSetContent(id, identity_id, area_name, pageNumber, pageSize); + Page pageList = dm.getDataSetContent(id, identity_id, area_name,keyword, 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 ffdf94c4..11a954fa 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -585,16 +585,16 @@ public class DataEaseModel { * @param id 数据集id * @return */ - public Page getDataSetContent(int id, int identity_id, String area_name, int pageNumber, int pageSize) { + public Page getDataSetContent(int id, int identity_id, String area_name, String keyword, 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) { p = Db.paginate(pageNumber, pageSize, - "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'"); + "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where (`行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "') and `行政区划` like '%" + keyword + "%'"); } else { p = Db.paginate(pageNumber, pageSize, - "SELECT *", "from " + DB_NAME + ".`" + tableName + "`"); + "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划` like '%" + keyword + "%'"); } return p; } @@ -640,7 +640,6 @@ public class DataEaseModel { } - /** * 导出Excel * From 995a1bd463c852bafb68a542f0af33fd3f945392 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 08:40:11 +0800 Subject: [PATCH 2/5] 'commit' --- .../base/DataEase/Controller/DataEaseController.java | 4 ++-- .../java/com/dsideal/base/DataEase/Model/DataEaseModel.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 25308492..6a5272f6 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -516,10 +516,10 @@ public class DataEaseController extends Controller { @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContentByProvince(int id, int pageNumber, int pageSize) { + public void getDataSetContentByProvince(int id,String keyword, int pageNumber, int pageSize) { if (pageNumber == 0) pageNumber = 1; if (pageSize == 0) pageSize = 20; - Page list = dm.getDataSetContentByProvince(id, pageNumber, pageSize); + Page list = dm.getDataSetContentByProvince(id, keyword,pageNumber, pageSize); 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 aa3cd429..945d1dfe 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -611,7 +611,7 @@ public class DataEaseModel { String tableName = record.getStr("table_name"); Page p = Db.paginate(pageNumber, pageSize, - "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "' and `行政区划` like `%"+keyword+"%`"); + "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "' and `行政区划` like `%" + keyword + "%`"); return p; } @@ -621,12 +621,12 @@ public class DataEaseModel { * @param id * @return */ - public Page getDataSetContentByProvince(int id, int pageNumber, int pageSize) { + public Page getDataSetContentByProvince(int id, String keyword, int pageNumber, int pageSize) { Record record = Db.findById("t_dp_dataset", "id", id); String tableName = record.getStr("table_name"); return Db.paginate(pageNumber, pageSize, - "SELECT *", "from " + DB_NAME + ".`" + tableName + "`"); + "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划` like '%" + keyword + "%'"); } /** From ca310e10eade271e62c23aa15a469350936be996 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 08:41:24 +0800 Subject: [PATCH 3/5] 'commit' --- .../DataEase/Controller/DataEaseController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 6a5272f6..a889467c 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -337,7 +337,7 @@ public class DataEaseController extends Controller { //根据区域码，获取区域名称 String area_name = rm.getAreaName(area_code); - Page pageList = dm.getDataSetContent(id, identity_id, area_name,keyword, pageNumber, pageSize); + Page pageList = dm.getDataSetContent(id, identity_id, area_name, keyword, pageNumber, pageSize); renderJson(CommonUtil.renderJsonForLayUI(pageList)); } @@ -394,7 +394,7 @@ public class DataEaseController extends Controller { @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContentByCity(int id,String keyword, int pageNumber, int pageSize) { + public void getDataSetContentByCity(int id, String keyword, int pageNumber, int pageSize) { if (pageNumber == 0) pageNumber = 1; if (pageSize == 0) pageSize = 20; //登录的人员 @@ -406,7 +406,7 @@ public class DataEaseController extends Controller { //根据区域码，获取区域名称 String area_name = rm.getAreaName(area_code); - Page list = dm.getDataSetContentByCity(id,keyword, area_name, pageNumber, pageSize); + Page list = dm.getDataSetContentByCity(id, keyword, area_name, pageNumber, pageSize); renderJson(CommonUtil.renderJsonForLayUI(list)); } @@ -511,15 +511,18 @@ public class DataEaseController extends Controller { /** * 省级管理员，帮助市州、县区填报数据，需要获取指定数据集的数据 * - * @param id 数据集id + * @param id 数据集id + * @param keyword 关键字 + * @param pageNumber 第几页 + * @param pageSize 每页显示多少条数据 */ @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContentByProvince(int id,String keyword, int pageNumber, int pageSize) { + public void getDataSetContentByProvince(int id, String keyword, int pageNumber, int pageSize) { if (pageNumber == 0) pageNumber = 1; if (pageSize == 0) pageSize = 20; - Page list = dm.getDataSetContentByProvince(id, keyword,pageNumber, pageSize); + Page list = dm.getDataSetContentByProvince(id, keyword, pageNumber, pageSize); renderJson(CommonUtil.renderJsonForLayUI(list)); } From 80d272ad58653aef4537934da893f22ad8109331 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 08:41:48 +0800 Subject: [PATCH 4/5] 'commit' --- .../com/dsideal/base/DataEase/Controller/DataEaseController.java | 1 - 1 file changed, 1 deletion(-) 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 a889467c..e79fd9fc 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -36,7 +36,6 @@ import java.util.Set; public class DataEaseController extends Controller { DataEaseModel dm = new DataEaseModel(); ResourceModel rm = new ResourceModel(); - String tempDir = System.getProperty("java.io.tmpdir"); /* http://10.10.21.20:9000/dsBase/dataease/route?city_name=昆明市 http://10.10.21.20:9000/dsBase/dataease/routePage?type_id=1 From c23a1bf1fb275fb915085e81a1a281a40428fe42 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 08:45:21 +0800 Subject: [PATCH 5/5] 'commit' --- .../dsideal/base/DataEase/Controller/DataEaseController.java | 2 -- 1 file changed, 2 deletions(-) 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 e79fd9fc..0744f6fc 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -9,7 +9,6 @@ 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; @@ -23,7 +22,6 @@ import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.upload.UploadFile; import io.github.yedaxia.apidocs.ApiDoc; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; import java.io.File;