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

'commit'

Browse Source
main
黄海 7 months ago
parent d89b8e4f78
commit 34a59d8482
3 changed files with 31 additions and 97 deletions
Show Stats Download Patch File Download Diff File

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

@ -72,14 +72,11 @@
<div class="layui-card-body">
<!-- <button type="button" class="layui-btn" id="getData">获取数据</button> -->
<div class="fix">
<button type="button" class="layui-btn" id="saveData">保存</button>
<button type="button" class="layui-btn" id="back">返回</button>
</div>
<table id="ID-table-demo-data"></table>
<script type="text/html" id="table-bar">
<span class="woo-tool-span woo-tool-text-span" lay-event="add"><a
class="woo-theme-color">向下插入</a></span>
<span class="woo-tool-span woo-tool-text-span" lay-event="delete"><a
class="woo-theme-color">删除</a></span>
</script>
@ -94,15 +91,8 @@
layui.use('table', function () {
var table = layui.table;
var $ = layui.jquery;
var util = layui.util;
var id = GetQueryString("id");
// var id = "3";
var _data = [];
$.ajax({
type: "GET",
async: false,
@ -140,47 +130,33 @@
});
table.on('tool(ID-table-demo-data)', function (obj) {
if (obj.event === 'add') {
_data.splice(obj.index + 1, 0, _emptyData);
table.cache['ID-table-demo-data'] = _data;
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');
} else {
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');
layer.close(index);
});
}
});
$("#saveData").click(function () {
const cleanedData = table.cache['ID-table-demo-data'].map(item => {
const {LAY_NUM, LAY_INDEX, ...rest} = item;
return rest;
layer.close(index);
});
});
table.on('edit(ID-table-demo-data)', function(obj){
var value = obj.value // 得到修改后的值
,data = obj.data // 得到所在行所有数据
,field = obj.field; // 得到字段名
// 发送Ajax请求
$.ajax({
type: "POST",
dataType: "json",
async: false,
url: '/dsBase/dataease/saveDataSet',
type: 'POST',
data: {
"id": id,
"data": JSON.stringify(cleanedData)
dataset_id:id,
id: data.id,
field: field,
value: value
},
success: function (res) {
if (res.success) {
layer.msg("保存成功！", {
icon: 1,
time: 1300
});
success: function(res){
if(res.success){
layer.msg('保存成功');
} else {
layer.msg(res.message, {
icon: 2,
time: 2000
});
layer.msg('保存失败');
}
}
});
@ -191,7 +167,6 @@
history.back();
});
function GetQueryString(name, istop) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
var r = window.location.search.substr(1).match(reg);

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

@ -343,32 +343,15 @@ public class DataEaseController extends Controller {
/**
* 保存数据集下的数据表
*
* @param id 数据集id
* @param data 保存的数据
* @param dataset_id 数据集id
* @param id 数据集下的数据表的id
* @param field 字段名
* @param value 值
*/
@Before(POST.class)
@IsLoginInterface({})
public void saveDataSet(int id, String data) {
//登录的人员
int identity_id = Integer.parseInt(CookieUtil.getValue(getRequest(), "identity_id"));
String person_id = CookieUtil.getValue(getRequest(), "person_id");
//获取他是哪个城市或者县区的管理员
//行政区划码
String area_code = rm.getAreaCode(identity_id, person_id);
//根据区域码，获取区域名称
String area_name = rm.getAreaName(area_code);
//父亲的区域名称
String parent_area_name = rm.getParentAreaName(area_name);
JSONArray jsonArray = JSONArray.fromObject(data);
for (Object o : jsonArray) {
JSONObject jo = (JSONObject) o;
jo.put("行政区划", area_name);
jo.put("上级行政区划", parent_area_name);
}
//保存
dm.saveDataSet(identity_id, id, area_name, jsonArray);
public void saveDataSet(int dataset_id, int id,String field,String value) {
dm.saveDataSet(dataset_id, id, field, value);
renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
}

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

@ -591,10 +591,10 @@ public class DataEaseModel {
Page<Record> 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 + "'");
} else {
p = Db.paginate(pageNumber, pageSize,
"SELECT *", "from "+DB_NAME+".`" + tableName + "`");
"SELECT *", "from " + DB_NAME + ".`" + tableName + "`");
}
return p;
}
@ -630,36 +630,12 @@ public class DataEaseModel {
/**
* 保存数据集对应的表
*
* @param id 数据集id
* @param ja json数组
*/
public void saveDataSet(int identity_id, int id, String area_name, JSONArray ja) {
Record record = Db.findById("t_dp_dataset", "id", id);
public void saveDataSet(int dataset_id, int id, String field, String value) {
Record record = Db.findById("t_dp_dataset", "id", dataset_id);
String tableName = record.getStr("table_name");
if (identity_id > 1) {
String sql = "delete from `" + tableName + "` where `行政区划`=?";
Db.use(DB_NAME).update(sql, area_name);
} else {
String sql = "delete from `" + tableName + "`";
Db.use(DB_NAME).update(sql);
}
List<Record> list = new ArrayList<>();
for (int i = 0; i < ja.size(); i++) {
JSONObject jsonObject = ja.getJSONObject(i);
//遍历jo的每一个属性
// 或者使用keySet和for-each循环遍历
record = new Record();
for (Object key : jsonObject.keySet()) {
Object value = jsonObject.get(key);
if (value.equals("null")) value = null;
record.set(key.toString(), value);
}
list.add(record);
}
Db.use(DB_NAME).batchSave(tableName, list, 100);
String sql = "update `" + tableName + "` set `" + field + "`=? where id=?";
Db.use(DB_NAME).update(sql, value, id);
}

Write Preview
Loading…
Cancel
Save