|
|
|
@ -20,6 +20,7 @@ import com.jfinal.kit.StrKit;
|
|
|
|
|
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;
|
|
|
|
@ -124,7 +125,7 @@ public class DataEaseController extends Controller {
|
|
|
|
|
// identity_id=1 省
|
|
|
|
|
// identity_id=2 市
|
|
|
|
|
// identity_id=3 县
|
|
|
|
|
List<Record> list = dm.getDataSetByIdentityId(identity_id,area_name);
|
|
|
|
|
List<Record> list = dm.getDataSetByIdentityId(identity_id, area_name);
|
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(list));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -253,4 +254,50 @@ public class DataEaseController extends Controller {
|
|
|
|
|
kv.set("message", "上传成功");
|
|
|
|
|
renderJson(kv);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取数据集下的数据表
|
|
|
|
|
*
|
|
|
|
|
* @param dataset_id 数据集id
|
|
|
|
|
*/
|
|
|
|
|
@Before(GET.class)
|
|
|
|
|
@IsLoginInterface({})
|
|
|
|
|
@IsNumericInterface({"dataset_id"})
|
|
|
|
|
public void getDataSet(int dataset_id) {
|
|
|
|
|
List<Record> list = dm.getDataSet(dataset_id);
|
|
|
|
|
renderJson(CommonUtil.renderJsonForLayUI(list));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 保存数据集下的数据表
|
|
|
|
|
*
|
|
|
|
|
* @param dataset_id 数据集id
|
|
|
|
|
* @param data 保存的数据
|
|
|
|
|
*/
|
|
|
|
|
@Before(POST.class)
|
|
|
|
|
@IsLoginInterface({})
|
|
|
|
|
public void saveDataSet(int dataset_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, dataset_id, area_name, jsonArray);
|
|
|
|
|
renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|