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

'commit'

Browse Source
main
黄海 7 months ago
parent e41ec88257
commit d89b8e4f78
3 changed files with 128 additions and 115 deletions
Show Stats Download Patch File Download Diff File

29
WebRoot/html/pages/dataease/dataMod.html
Unescape View File

@ -68,7 +68,7 @@
</head>
<body class="layui-form">
<div class="layui-card" style="margin-top: 50px;">
<div class="layui-card" style="margin-top: 50px;">
<div class="layui-card-body">
<!-- <button type="button" class="layui-btn" id="getData">获取数据</button> -->
<div class="fix">
@ -85,13 +85,12 @@
</script>
</div>
</div>
</div>
<!-- 请勿在项目正式环境中引用该 layui.js 地址 -->
<script src="../js/layui/layui.js"></script>
<script>
<!-- 请勿在项目正式环境中引用该 layui.js 地址 -->
<script src="../js/layui/layui.js"></script>
<script>
layui.use('table', function () {
var table = layui.table;
var $ = layui.jquery;
@ -121,15 +120,21 @@
keys.forEach((item, index) => {
_emptyData[item] = "";
var _obj = { field: item, title: item, edit: 'text', align: 'center', expandedMode: 'tips' }
var _obj = {field: item, title: item, edit: 'text', align: 'center', expandedMode: 'tips'}
_cols.push(_obj);
});
_cols.push({ title: '操作', align: 'center', toolbar: '#table-bar' });
_cols.push({title: '操作', align: 'center', toolbar: '#table-bar'});
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
});
@ -140,7 +145,7 @@
table.cache['ID-table-demo-data'] = _data;
table.renderData('ID-table-demo-data');
} else {
layer.confirm('确定删除吗？', { icon: 0 }, function (index) {
layer.confirm('确定删除吗？', {icon: 0}, function (index) {
var cacheData = table.cache['ID-table-demo-data'];
cacheData.splice(obj.index, 1)
table.renderData('ID-table-demo-data');
@ -152,7 +157,7 @@
$("#saveData").click(function () {
const cleanedData = table.cache['ID-table-demo-data'].map(item => {
const { LAY_NUM, LAY_INDEX, ...rest } = item;
const {LAY_NUM, LAY_INDEX, ...rest} = item;
return rest;
});
@ -196,7 +201,7 @@
return null;
}
});
</script>
</script>
</body>

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

@ -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);
renderJson(CommonUtil.renderJsonForLayUI(list));
Page<Record> pageList = dm.getDataSetContent(id, identity_id, area_name, pageNumber, pageSize);
renderJson(CommonUtil.renderJsonForLayUI(pageList));
}
/**

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

@ -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 + "'";
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;
}
/**

Write Preview
Loading…
Cancel
Save