From 961ba4febadf6844cba355c7da397fb9e2e354e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 8 Nov 2024 13:26:02 +0800 Subject: [PATCH 1/7] 'commit' --- .../Controller/DataEaseController.java | 59 +++++++++++++++++-- .../base/DataEase/Model/DataEaseModel.java | 11 +--- .../com/dsideal/base/Test/ChangeCity.java | 3 +- .../base/Tools/Test/ChangeDataEaseCity.java | 2 +- src/main/resources/application.yaml | 9 ++- 5 files changed, 67 insertions(+), 17 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 07262ea0..c3fe9103 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -52,15 +52,11 @@ public class DataEaseController extends Controller { //发布的地址 String publish_url = BaseApplication.PropKit.get("dataEase.publish_url"); //先更新一下数据表 - int res = dm.updateCity(dataVisualizationName, city_name); + int res = dm.updateCityArea(dataVisualizationName, city_name); if (res == -1) { renderJson(CommonUtil.returnMessageJson(false, dataVisualizationName + "名称的大屏不唯一，无法完成更新操作！")); return; } - if (res == -2) { - renderJson(CommonUtil.returnMessageJson(false, dataVisualizationName + "名称的大屏并不是隶属于云南教科院项目，无法完成更新操作！")); - return; - } //拼接一下URL的最终地址 JSONObject jo = new JSONObject(); jo.put("city_name", city_name); @@ -71,6 +67,33 @@ public class DataEaseController extends Controller { redirect(publish_url + BaseApplication.PropKit.get("dataEase.ShiZhou_url") + "?attachParams=" + base64Str); } + /** + * 市级路由 + * @param area_name 县区名称 + */ + @Before({GET.class}) + @EmptyInterface({"area_name"}) + public void routeArea(String area_name) { + //大屏名称 + String dataVisualizationName = BaseApplication.PropKit.get("dataEase.dataVisualizationNameArea"); + //发布的地址 + String publish_url = BaseApplication.PropKit.get("dataEase.publish_url"); + //先更新一下数据表 + int res = dm.updateCityArea(dataVisualizationName, area_name); + if (res == -1) { + renderJson(CommonUtil.returnMessageJson(false, dataVisualizationName + "名称的大屏不唯一，无法完成更新操作！")); + return; + } + //拼接一下URL的最终地址 + JSONObject jo = new JSONObject(); + jo.put("area_name", area_name); + String base64Str = Base64.encode(jo.toString()); + //记录最后一次操作的是哪个市或者县区 + dm.writeLastArea(area_name); + //跳转 + redirect(publish_url + BaseApplication.PropKit.get("dataEase.Area_url") + "?attachParams=" + base64Str); + } + /** * 市级路由 * @@ -103,6 +126,32 @@ public class DataEaseController extends Controller { redirect(publish_url + "?attachParams=" + base64Str); } + @Before({GET.class}) + @IsNumericInterface({"type_id"}) + public void routePageArea(int type_id) { + //最后一次操作的区域名称 + String area_name = dm.getLastArea(); + //发布的地址 + String publish_url = BaseApplication.PropKit.get("dataEase.publish_url"); + //拼接一下URL的最终地址 + JSONObject jo = new JSONObject(); + jo.put("city_name", area_name); + String base64Str = Base64.encode(jo.toString()); + switch (type_id) { + case 1://左侧学前教育规模发展预测，义务教育规模发展预测，普通高中教育规模发展预测 + publish_url = publish_url + BaseApplication.PropKit.get("dataEase.AreaLeft_url"); + break; + case 2://最底下，人口 + publish_url = publish_url + BaseApplication.PropKit.get("dataEase.AreaBottom_url"); + break; + case 3://教育资源配置发展预测 + publish_url = publish_url + BaseApplication.PropKit.get("dataEase.AreaRight_url"); + break; + } + //跳转 + redirect(publish_url + "?attachParams=" + base64Str); + } + /** * 根据当前登录人员的identity_id,获取此人员可以维护的数据集名称 */ 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 e358b64b..dd3fc205 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -144,9 +144,9 @@ public class DataEaseModel { * 修改大屏的城市地图为指定的城市 * * @param dataVisualizationName 大屏名称 - * @param cityName 城市名称 + * @param cityAreaName 城市或县区名称 */ - public int updateCity(String dataVisualizationName, String cityName) { + public int updateCityArea(String dataVisualizationName, String cityAreaName) { //取出大屏的ID值 //云南省教育决策支持系统 String sql = "select * from data_visualization_info where name =?"; @@ -156,11 +156,6 @@ public class DataEaseModel { } Record dataVisualizationInfo = L1.getFirst(); long bigScreenId = dataVisualizationInfo.getLong("id"); - //这个名称确实是存在，但它是不是我想要的这个云南省项目中的大屏呢 -// Set set = getFamilyNodes(); -// if (!set.contains(bigScreenId)) { -// return -2; -// } // 配置的内容 List list = getMap(bigScreenId); @@ -169,7 +164,7 @@ public class DataEaseModel { long id = record.getLong("id"); JSONObject jo = JSONObject.fromObject(record.getStr("custom_attr")); //获取城市编码 - String area_code = getCityCode(cityName); + String area_code = getCityCode(cityAreaName); //修改前 System.out.println("修改前=" + jo.getJSONObject("map")); diff --git a/src/main/java/com/dsideal/base/Test/ChangeCity.java b/src/main/java/com/dsideal/base/Test/ChangeCity.java index 2f38f146..e2f9fad5 100644 --- a/src/main/java/com/dsideal/base/Test/ChangeCity.java +++ b/src/main/java/com/dsideal/base/Test/ChangeCity.java @@ -4,7 +4,6 @@ import com.dsideal.base.BaseApplication; import com.dsideal.base.DataEase.Model.DataEaseModel; import com.dsideal.base.Plugin.YamlProp; import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil; -import com.jfinal.kit.Prop; public class ChangeCity { public static DataEaseModel dm = new DataEaseModel(); @@ -16,6 +15,6 @@ public class ChangeCity { LocalMysqlConnectUtil.Init(); //dm.updateCity("云南省教育决策支持系统【市州】", "楚雄州"); - dm.updateCity("云南省教育决策支持系统【市州】", "昆明市"); + dm.updateCityArea("云南省教育决策支持系统【市州】", "昆明市"); } } diff --git a/src/main/java/com/dsideal/base/Tools/Test/ChangeDataEaseCity.java b/src/main/java/com/dsideal/base/Tools/Test/ChangeDataEaseCity.java index 701fc48f..feafdba5 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/ChangeDataEaseCity.java +++ b/src/main/java/com/dsideal/base/Tools/Test/ChangeDataEaseCity.java @@ -34,7 +34,7 @@ public class ChangeDataEaseCity { String dataVisualizationName = "黄海测试的市州地图"; String cityName = "昭通市"; DataEaseModel dm = new DataEaseModel(); - dm.updateCity(dataVisualizationName, cityName); + dm.updateCityArea(dataVisualizationName, cityName); /* 要修改的市州名称，需要用全称 156530100 昆明市 diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 5f48ab56..d75b5f68 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -23,13 +23,20 @@ redis: # 数据可视化 dataEase: + publish_url: http://10.10.14.203:8100 + dataVisualizationRootName: 云南省教科院 dataVisualizationName: 云南省教育决策支持系统【市州】 - publish_url: http://10.10.14.203:8100 ShiZhou_url: /#/de-link/X4l1qGNH ShiLeft_url: /#/de-link/TgShVA0z ShiBottom_url: /#/de-link/QZVOyXqD ShiRight_url: /#/de-link/oitjXDlA + + dataVisualizationNameArea: 云南省教育决策支持系统【县区】 + Area_url: /#/de-link/OxwyzDTr + AreaLeft_url: /#/de-link/WTtaPIn6 + AreaBottom_url: /#/de-link/j3vwbtKm + AreaRight_url: /#/de-link/ufRSlWmB # ============================================================== excel: From 992d805da514616a64f8e9f88dda609b3e339616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 8 Nov 2024 13:27:19 +0800 Subject: [PATCH 2/7] 'commit' --- .../base/DataEase/Controller/DataEaseController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 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 c3fe9103..fb3d7e52 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -95,7 +95,7 @@ public class DataEaseController extends Controller { } /** - * 市级路由 + * 市级仪表盘路由 * * @param type_id 哪一个仪表盘 */ @@ -126,6 +126,10 @@ public class DataEaseController extends Controller { redirect(publish_url + "?attachParams=" + base64Str); } + /** + * 县区级仪表盘路由 + * @param type_id 哪一个仪表盘 + */ @Before({GET.class}) @IsNumericInterface({"type_id"}) public void routePageArea(int type_id) { @@ -135,7 +139,7 @@ public class DataEaseController extends Controller { String publish_url = BaseApplication.PropKit.get("dataEase.publish_url"); //拼接一下URL的最终地址 JSONObject jo = new JSONObject(); - jo.put("city_name", area_name); + jo.put("area_name", area_name); String base64Str = Base64.encode(jo.toString()); switch (type_id) { case 1://左侧学前教育规模发展预测，义务教育规模发展预测，普通高中教育规模发展预测 From 55982b4cbf65e46e86acca075c53aaac2c092e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 8 Nov 2024 13:28:19 +0800 Subject: [PATCH 3/7] 'commit' --- .../dsideal/base/DataEase/Controller/DataEaseController.java | 2 ++ 1 file changed, 2 insertions(+) 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 fb3d7e52..1b4c9adc 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -67,6 +67,7 @@ public class DataEaseController extends Controller { redirect(publish_url + BaseApplication.PropKit.get("dataEase.ShiZhou_url") + "?attachParams=" + base64Str); } + // http://10.10.21.20:9000/dsBase/dataease/routeArea?area_name=五华区 /** * 市级路由 * @param area_name 县区名称 @@ -126,6 +127,7 @@ public class DataEaseController extends Controller { redirect(publish_url + "?attachParams=" + base64Str); } + // http://10.10.21.20:9000/dsBase/dataease/routePageArea?type_id=1 /** * 县区级仪表盘路由 * @param type_id 哪一个仪表盘 From 23eea035c692eaed11e27cd9ef1be23a993fe71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 8 Nov 2024 13:32:08 +0800 Subject: [PATCH 4/7] 'commit' --- .../Controller/DataEaseController.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 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 1b4c9adc..da76e554 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -34,10 +34,14 @@ 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/route?city_name=楚雄彝族自治州 - // 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/routeArea?area_name=五华区 + http://10.10.21.20:9000/dsBase/dataease/routePageArea?type_id=1 + !!!必须发布后访问才能做到进入此接口，否则浏览器就走缓存，不进来这个接口了！!! + */ /** * 省级路由 @@ -67,9 +71,10 @@ public class DataEaseController extends Controller { redirect(publish_url + BaseApplication.PropKit.get("dataEase.ShiZhou_url") + "?attachParams=" + base64Str); } - // http://10.10.21.20:9000/dsBase/dataease/routeArea?area_name=五华区 + /** * 市级路由 + * * @param area_name 县区名称 */ @Before({GET.class}) @@ -100,7 +105,6 @@ public class DataEaseController extends Controller { * * @param type_id 哪一个仪表盘 */ - // http://10.10.21.20:9000/dsBase/dataease/routePage?type_id=1 @Before({GET.class}) @IsNumericInterface({"type_id"}) public void routePage(int type_id) { @@ -127,9 +131,10 @@ public class DataEaseController extends Controller { redirect(publish_url + "?attachParams=" + base64Str); } - // http://10.10.21.20:9000/dsBase/dataease/routePageArea?type_id=1 + /** * 县区级仪表盘路由 + * * @param type_id 哪一个仪表盘 */ @Before({GET.class}) @@ -538,7 +543,7 @@ public class DataEaseController extends Controller { ExcelReader excelReader = new ExcelReader(); List rows = excelReader.readXlsxFile(excelPath, excelCols); - dm.saveDataSetTableByCity(id,area_name, rows); + dm.saveDataSetTableByCity(id, area_name, rows); //返回结果 Kv kv = Kv.create(); From ce9792af45e61f97dae789b7b5cd7bc86dcfb8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 8 Nov 2024 14:31:24 +0800 Subject: [PATCH 5/7] 'commit' --- .../base/Tools/Step3_DataSetFakeData.java | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java b/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java index bb167d93..00c7ee0e 100644 --- a/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java +++ b/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java @@ -113,11 +113,43 @@ public class Step3_DataSetFakeData { // } // } - //有一些表是以 上级行政区划为根的，然后遍历了它的县区，还有类型，不好直接抄过来，只能硬写了 + + //市州净注入与净流出的数据集 +// String tableName = "excel_区域人口流动分布_193751804a"; +// for (Record record : listCity) { +// String cityName = record.getStr("area_name"); +// String sql = "delete from `" + tableName + "` where `行政区划`='" + cityName + "'"; +// Db.use(DataEaseModel.DB_NAME).update(sql); +// System.out.println(cityName + "正在处理数据集：" + tableName); +// if (keepArea.contains(cityName)) continue; +// Record rCity = dm.getAreaByName(cityName); +// List lArea = dm.getAreaList(rCity.getStr("id")); +// List writeList = new ArrayList<>(); +// int x = 0; +// for (Record r : lArea) { +// x++; +// Record rArea = new Record(); +// rArea.set("行政区划", cityName); +// rArea.set("下级行政区划", r.getStr("area_name")); +// rArea.set("类型", x % 2 == 1 ? "净流出" : "净流入"); +// rArea.set("数值", 900); +// writeList.add(rArea); +// } +// Db.use(DataEaseModel.DB_NAME).batchSave(tableName, writeList, 100); +// } + + + //县区净注入与净流出的数据集 + String tableName = "excel_区域人口流动分布_374179b760"; + int x=0; for (Record record : listCity) { - //String cityName = "昭通市"; + x++; String cityName = record.getStr("area_name"); if (keepArea.contains(cityName)) continue; + String sql = "delete from `" + tableName + "` where `上级行政区划`='" + cityName + "'"; + Db.use(DataEaseModel.DB_NAME).update(sql); + + System.out.println(cityName + "正在处理数据集：" + tableName); Record rCity = dm.getAreaByName(cityName); List lArea = dm.getAreaList(rCity.getStr("id")); List writeList = new ArrayList<>(); @@ -125,11 +157,11 @@ public class Step3_DataSetFakeData { Record rArea = new Record(); rArea.set("上级行政区划", cityName); rArea.set("行政区划", r.getStr("area_name")); - rArea.set("类型", "净流出"); + rArea.set("类型", x % 2 == 1 ? "净流出" : "净流入"); rArea.set("数值（人）", 2313250); writeList.add(rArea); } - Db.use(DataEaseModel.DB_NAME).batchSave("excel_区域人口流动分布_374179b760", writeList, 100); + Db.use(DataEaseModel.DB_NAME).batchSave(tableName, writeList, 100); } } From 0fc94ff357b001b46cbc51140351e902a1c15c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 8 Nov 2024 15:09:27 +0800 Subject: [PATCH 6/7] 'commit' --- .../base/DataEase/Model/DataEaseModel.java | 3 +- .../base/Tools/Step3_DataSetFakeData.java | 70 +++++++++---------- 2 files changed, 37 insertions(+), 36 deletions(-) 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 dd3fc205..9ba1c127 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -87,7 +87,8 @@ public class DataEaseModel { if (isInteger(value)) { record.set(colName, Integer.parseInt(value)); } else if (isDouble(value)) { - record.set(colName, Double.parseDouble(value)); + double roundedValue = Math.round(Double.parseDouble(value) * 100) / 100.0; + record.set(colName,roundedValue ); } else { record.set(colName, value); } diff --git a/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java b/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java index 00c7ee0e..77339af9 100644 --- a/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java +++ b/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java @@ -115,54 +115,54 @@ public class Step3_DataSetFakeData { //市州净注入与净流出的数据集 -// String tableName = "excel_区域人口流动分布_193751804a"; -// for (Record record : listCity) { -// String cityName = record.getStr("area_name"); -// String sql = "delete from `" + tableName + "` where `行政区划`='" + cityName + "'"; -// Db.use(DataEaseModel.DB_NAME).update(sql); -// System.out.println(cityName + "正在处理数据集：" + tableName); -// if (keepArea.contains(cityName)) continue; -// Record rCity = dm.getAreaByName(cityName); -// List lArea = dm.getAreaList(rCity.getStr("id")); -// List writeList = new ArrayList<>(); -// int x = 0; -// for (Record r : lArea) { -// x++; -// Record rArea = new Record(); -// rArea.set("行政区划", cityName); -// rArea.set("下级行政区划", r.getStr("area_name")); -// rArea.set("类型", x % 2 == 1 ? "净流出" : "净流入"); -// rArea.set("数值", 900); -// writeList.add(rArea); -// } -// Db.use(DataEaseModel.DB_NAME).batchSave(tableName, writeList, 100); -// } - - - //县区净注入与净流出的数据集 - String tableName = "excel_区域人口流动分布_374179b760"; - int x=0; + String tableName = "excel_区域人口流动分布_193751804a"; for (Record record : listCity) { - x++; String cityName = record.getStr("area_name"); - if (keepArea.contains(cityName)) continue; - String sql = "delete from `" + tableName + "` where `上级行政区划`='" + cityName + "'"; + String sql = "delete from `" + tableName + "` where `行政区划`='" + cityName + "'"; Db.use(DataEaseModel.DB_NAME).update(sql); - System.out.println(cityName + "正在处理数据集：" + tableName); + //if (keepArea.contains(cityName)) continue; Record rCity = dm.getAreaByName(cityName); List lArea = dm.getAreaList(rCity.getStr("id")); List writeList = new ArrayList<>(); + int x = 0; for (Record r : lArea) { + x++; Record rArea = new Record(); - rArea.set("上级行政区划", cityName); - rArea.set("行政区划", r.getStr("area_name")); - rArea.set("类型", x % 2 == 1 ? "净流出" : "净流入"); - rArea.set("数值（人）", 2313250); + rArea.set("行政区划", cityName); + rArea.set("下级行政区划", r.getStr("area_name")); + rArea.set("类型", x % 2 == 1 ? "净流出" : "净流入"); + rArea.set("数值", 900); writeList.add(rArea); } Db.use(DataEaseModel.DB_NAME).batchSave(tableName, writeList, 100); } + +// //县区净注入与净流出的数据集 +// String tableName = "excel_区域人口流动分布_374179b760"; +// int x=0; +// for (Record record : listCity) { +// x++; +// String cityName = record.getStr("area_name"); +// if (keepArea.contains(cityName)) continue; +// String sql = "delete from `" + tableName + "` where `上级行政区划`='" + cityName + "'"; +// Db.use(DataEaseModel.DB_NAME).update(sql); +// +// System.out.println(cityName + "正在处理数据集：" + tableName); +// Record rCity = dm.getAreaByName(cityName); +// List lArea = dm.getAreaList(rCity.getStr("id")); +// List writeList = new ArrayList<>(); +// for (Record r : lArea) { +// Record rArea = new Record(); +// rArea.set("上级行政区划", cityName); +// rArea.set("行政区划", r.getStr("area_name")); +// rArea.set("类型", x % 2 == 1 ? "净流出" : "净流入"); +// rArea.set("数值（人）", 2313250); +// writeList.add(rArea); +// } +// Db.use(DataEaseModel.DB_NAME).batchSave(tableName, writeList, 100); +// } + } } From 685d3ea3a0418d24077013d5ad507488e9a63e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 8 Nov 2024 15:42:59 +0800 Subject: [PATCH 7/7] 'commit' --- .../C7E022EC-E098-484C-8B04-6F841946CFC9.xlsx | Bin 0 -> 3877 bytes .../base/DataEase/Model/DataEaseModel.java | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 WebRoot/upload/C7E022EC-E098-484C-8B04-6F841946CFC9.xlsx diff --git a/WebRoot/upload/C7E022EC-E098-484C-8B04-6F841946CFC9.xlsx b/WebRoot/upload/C7E022EC-E098-484C-8B04-6F841946CFC9.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..8f7ecab7be8adb85948562a664817824696f6e97 GIT binary patch literal 3877 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 literal 0 HcmV?d00001 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 9ba1c127..34f01b1b 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -38,6 +38,9 @@ public class DataEaseModel { for (Record record : list) { //这个数据集，当前的区域，已经填写了多少条数据 String table_name = record.getStr("table_name"); + if(table_name.equals("excel_区域人口流动分布_374179b760")){ + System.out.println("ddd"); + } sql = "select count(1) as c from `" + table_name + "`"; if (identity_id > 1) { sql += " where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'"; @@ -452,7 +455,7 @@ public class DataEaseModel { //对此表中的数据进行直接导出EXCEL String sql = "select * from `" + tableName + "`"; if (identity_id > 1) { - sql = sql + "where `行政区划`='" + area_name + "'"; + sql = sql + "where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'" ; } //获取一下表有哪些列 //List columnNames = getColumns(tableName); @@ -586,7 +589,7 @@ public class DataEaseModel { String tableName = record.getStr("table_name"); if (identity_id > 1) { - String sql = "select * from `" + tableName + "` where `行政区划`='" + area_name + "'"; + String sql = "select * from `" + tableName + "` where `行政区划`='" + area_name + "' or `上级行政区划`='" + area_name + "'"; return Db.use(DB_NAME).find(sql); } else { String sql = "select * from `" + tableName + "`";