huanghai
/
YunNanDsBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

Browse Source
main
kgdxpr 7 months ago
parent f9f5cfccae c23a1bf1fb
commit 4258b1b160
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File

22
src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
Unescape View File

@ -9,7 +9,6 @@ import com.dsideal.base.DataEase.Util.Step3_CopyBigScreen;
import com.dsideal.base.Interceptor.EmptyInterface; import com.dsideal.base.Interceptor.EmptyInterface;
import com.dsideal.base.Interceptor.IsLoginInterface; import com.dsideal.base.Interceptor.IsLoginInterface;
import com.dsideal.base.Interceptor.IsNumericInterface; import com.dsideal.base.Interceptor.IsNumericInterface;
import com.dsideal.base.Interceptor.LayUiPageInfoInterface;
import com.dsideal.base.Res.Model.ResourceModel; import com.dsideal.base.Res.Model.ResourceModel;
import com.dsideal.base.Util.CommonUtil; import com.dsideal.base.Util.CommonUtil;
import com.dsideal.base.Util.CookieUtil; 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.plugin.activerecord.Record;
import com.jfinal.upload.UploadFile; import com.jfinal.upload.UploadFile;
import io.github.yedaxia.apidocs.ApiDoc; import io.github.yedaxia.apidocs.ApiDoc;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import java.io.File; import java.io.File;
@ -36,7 +34,6 @@ import java.util.Set;
public class DataEaseController extends Controller { public class DataEaseController extends Controller {
DataEaseModel dm = new DataEaseModel(); DataEaseModel dm = new DataEaseModel();
ResourceModel rm = new ResourceModel(); 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/route?city_name=昆明市
http://10.10.21.20:9000/dsBase/dataease/routePage?type_id=1 http://10.10.21.20:9000/dsBase/dataease/routePage?type_id=1
@ -318,12 +315,13 @@ public class DataEaseController extends Controller {
* *
* @param id 数据集id * @param id 数据集id
* @param pageNumber 第几页 * @param pageNumber 第几页
* @param keyword 关键字
* @param pageSize 每页多少条数据 * @param pageSize 每页多少条数据
*/ */
@Before(GET.class) @Before(GET.class)
@IsLoginInterface({}) @IsLoginInterface({})
@IsNumericInterface({"id"}) @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 (pageNumber == 0) pageNumber = 1;
if (pageSize == 0) pageSize = 20; if (pageSize == 0) pageSize = 20;
//登录的人员 //登录的人员
@ -336,7 +334,7 @@ public class DataEaseController extends Controller {
//根据区域码，获取区域名称 //根据区域码，获取区域名称
String area_name = rm.getAreaName(area_code); String area_name = rm.getAreaName(area_code);
Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name, pageNumber, pageSize); Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name, keyword, pageNumber, pageSize);
renderJson(CommonUtil.renderJsonForLayUI(pageList)); renderJson(CommonUtil.renderJsonForLayUI(pageList));
} }
@ -386,13 +384,14 @@ public class DataEaseController extends Controller {
* 市州管理员，帮助县区管理员填报数据，需要获取指定数据集的数据 * 市州管理员，帮助县区管理员填报数据，需要获取指定数据集的数据
* *
* @param id 数据集id * @param id 数据集id
* @param keyword 关键字
* @param pageNumber 第几页 * @param pageNumber 第几页
* @param pageSize 每页多少条数据 * @param pageSize 每页多少条数据
*/ */
@Before(GET.class) @Before(GET.class)
@IsLoginInterface({}) @IsLoginInterface({})
@IsNumericInterface({"id"}) @IsNumericInterface({"id"})
public void getDataSetContentByCity(int id, int pageNumber, int pageSize) { public void getDataSetContentByCity(int id, String keyword, int pageNumber, int pageSize) {
if (pageNumber == 0) pageNumber = 1; if (pageNumber == 0) pageNumber = 1;
if (pageSize == 0) pageSize = 20; if (pageSize == 0) pageSize = 20;
//登录的人员 //登录的人员
@ -404,7 +403,7 @@ public class DataEaseController extends Controller {
//根据区域码，获取区域名称 //根据区域码，获取区域名称
String area_name = rm.getAreaName(area_code); String area_name = rm.getAreaName(area_code);
Page<Record> list = dm.getDataSetContentByCity(id, area_name, pageNumber, pageSize); Page<Record> list = dm.getDataSetContentByCity(id, keyword, area_name, pageNumber, pageSize);
renderJson(CommonUtil.renderJsonForLayUI(list)); renderJson(CommonUtil.renderJsonForLayUI(list));
} }
@ -509,15 +508,18 @@ public class DataEaseController extends Controller {
/** /**
* 省级管理员，帮助市州、县区填报数据，需要获取指定数据集的数据 * 省级管理员，帮助市州、县区填报数据，需要获取指定数据集的数据
* *
* @param id 数据集id * @param id 数据集id
* @param keyword 关键字
* @param pageNumber 第几页
* @param pageSize 每页显示多少条数据
*/ */
@Before(GET.class) @Before(GET.class)
@IsLoginInterface({}) @IsLoginInterface({})
@IsNumericInterface({"id"}) @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 (pageNumber == 0) pageNumber = 1;
if (pageSize == 0) pageSize = 20; if (pageSize == 0) pageSize = 20;
Page<Record> list = dm.getDataSetContentByProvince(id, pageNumber, pageSize); Page<Record> list = dm.getDataSetContentByProvince(id, keyword, pageNumber, pageSize);
renderJson(CommonUtil.renderJsonForLayUI(list)); renderJson(CommonUtil.renderJsonForLayUI(list));
} }

15
src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
Unescape View File

@ -585,16 +585,16 @@ public class DataEaseModel {
* @param id 数据集id * @param id 数据集id
* @return * @return
*/ */
public Page<Record> getDataSetContent(int id, int identity_id, String area_name, int pageNumber, int pageSize) { public Page<Record> getDataSetContent(int id, int identity_id, String area_name, String keyword, int pageNumber, int pageSize) {
Record record = Db.findById("t_dp_dataset", "id", id); Record record = Db.findById("t_dp_dataset", "id", id);
String tableName = record.getStr("table_name"); String tableName = record.getStr("table_name");
Page<Record> p; Page<Record> p;
if (identity_id > 1) { if (identity_id > 1) {
p = Db.paginate(pageNumber, pageSize, 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 { } else {
p = Db.paginate(pageNumber, pageSize, p = Db.paginate(pageNumber, pageSize,
"SELECT *", "from " + DB_NAME + ".`" + tableName + "`"); "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划` like '%" + keyword + "%'");
} }
return p; return p;
} }
@ -606,12 +606,12 @@ public class DataEaseModel {
* @param area_name * @param area_name
* @return * @return
*/ */
public Page<Record> getDataSetContentByCity(int id, String area_name, int pageNumber, int pageSize) { public Page<Record> getDataSetContentByCity(int id, String keyword, String area_name, int pageNumber, int pageSize) {
Record record = Db.findById("t_dp_dataset", "id", id); Record record = Db.findById("t_dp_dataset", "id", id);
String tableName = record.getStr("table_name"); String tableName = record.getStr("table_name");
Page<Record> p = Db.paginate(pageNumber, pageSize, Page<Record> p = Db.paginate(pageNumber, pageSize,
"SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "'"); "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "' and `行政区划` like `%" + keyword + "%`");
return p; return p;
} }
@ -621,12 +621,12 @@ public class DataEaseModel {
* @param id * @param id
* @return * @return
*/ */
public Page<Record> getDataSetContentByProvince(int id, int pageNumber, int pageSize) { public Page<Record> getDataSetContentByProvince(int id, String keyword, int pageNumber, int pageSize) {
Record record = Db.findById("t_dp_dataset", "id", id); Record record = Db.findById("t_dp_dataset", "id", id);
String tableName = record.getStr("table_name"); String tableName = record.getStr("table_name");
return Db.paginate(pageNumber, pageSize, return Db.paginate(pageNumber, pageSize,
"SELECT *", "from " + DB_NAME + ".`" + tableName + "`"); "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `行政区划` like '%" + keyword + "%'");
} }
/** /**
@ -640,7 +640,6 @@ public class DataEaseModel {
} }
/** /**
* 导出Excel * 导出Excel
* *

Write Preview
Loading…
Cancel
Save