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 283cebb7..54e4a854 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -42,17 +42,17 @@ public class DataEaseController extends Controller { * 路由跳转 * @param city_name 城市名称 */ - @Before({GET.class}) - @EmptyInterface({"city_name"}) - public void route(String city_name) { - if(city_name.equals("昆明市")){ - dm.updateCity("156530100"); - redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmmIbmmI7luIIifQ=="); - }else{ - dm.updateCity("156532300"); - redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmpZrpm4TlvZ3ml4/oh6rmsrvlt54ifQ=="); - } - } +// @Before({GET.class}) +// @EmptyInterface({"city_name"}) +// public void route(String city_name) { +// if(city_name.equals("昆明市")){ +// dm.updateCity("156530100"); +// redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmmIbmmI7luIIifQ=="); +// }else{ +// dm.updateCity("156532300"); +// redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmpZrpm4TlvZ3ml4/oh6rmsrvlt54ifQ=="); +// } +// } /** * 根据当前登录人员的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 8e53b1ac..e3f69ecd 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -56,8 +56,6 @@ public class DataEaseModel { * @param ja json数组 */ public void saveDataSetTable(int identity_id, int dataset_id, String xmqh, JSONArray ja) { - - System.out.println(ja); String tableName = getTableName(dataset_id).getStr("table_name"); if (identity_id > 1) { String sql = "delete from dataease.`" + tableName + "` where `行政区划`=?"; @@ -82,36 +80,55 @@ public class DataEaseModel { Db.use("dataease").batchSave(tableName, list, 100); } + + /** - * 更新DataEase中大屏中的行政区划 + * 获取指定大屏中的地图配置信息 * - * @param xzqhId 行政区划ID + * @param bigScreenId 大屏ID + * @return */ - public void updateCity(String xzqhId) { + public List getMap(long bigScreenId) { + String sql = "select id,custom_attr from dataease.core_chart_view where scene_id=? and type='map'"; + List list = Db.find(sql, bigScreenId); + return list; + } + + /** + * 获取城市编码 + * + * @param cityName 城市名称 + * @return 城市编码 + */ + public String getCityCode(String cityName) { + String sql = "select area_code from t_city_code where area_name=?"; + return Db.findFirst(sql, cityName).getStr("area_code"); + } + + /** + * 修改大屏的城市地图为指定的城市 + * + * @param dataVisualizationName 大屏名称 + * @param cityName 城市名称 + */ + public void updateCity(String dataVisualizationName, String cityName) { //取出大屏的ID值 - String sql = "select * from dataease.data_visualization_info where name ='黄海测试的市州地图'"; - Record dataVisualizationInfo = Db.findFirst(sql); + String sql = "select * from dataease.data_visualization_info where name =?"; + Record dataVisualizationInfo = Db.findFirst(sql, dataVisualizationName); long bigScreenId = dataVisualizationInfo.getLong("id"); // 配置的内容 - sql = "select id,custom_attr from dataease.core_chart_view where scene_id=? and type='map'"; - List list = Db.find(sql, bigScreenId); - + List list = getMap(bigScreenId); for (Record record : list) { long id = record.getLong("id"); - JSONObject jo = JSONObject.fromObject(record.getStr("custom_attr")); - jo.getJSONObject("map").put("id", xzqhId); - System.out.println(jo.getJSONObject("map")); - //回写到数据库 - String jsonString = jo.toString(); + com.alibaba.fastjson.JSONObject jo = com.alibaba.fastjson.JSONObject.parseObject(record.getStr("custom_attr")); + //获取城市编码 + String area_code = getCityCode(cityName); + //修改城市编码 + jo.getJSONObject("map").put("id", area_code); + jo.getJSONObject("map").put("level", "city"); + //写到数据库 + String jsonString = jo.toJSONString(); Db.update("update dataease.core_chart_view set custom_attr=? where id=?", jsonString, id); } - /** - * json格式化工具 - * https://www.uutils.com/format/json.htm - * - * 互联网：2023年，省市县行政区划名称及编码对照表、最新省市区表1 - * https://blog.csdn.net/isworking/article/details/128630487 - */ - } } diff --git a/src/main/java/com/dsideal/base/Tools/ChangeDataEaseCity.java b/src/main/java/com/dsideal/base/Tools/ChangeDataEaseCity.java index 29416b48..2a4e3657 100644 --- a/src/main/java/com/dsideal/base/Tools/ChangeDataEaseCity.java +++ b/src/main/java/com/dsideal/base/Tools/ChangeDataEaseCity.java @@ -1,69 +1,14 @@ package com.dsideal.base.Tools; -import com.alibaba.fastjson.JSONObject; import com.dsideal.base.DataEase.Model.DataEaseModel; import com.dsideal.base.Plugin.YamlProp; import com.jfinal.kit.Prop; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; -import com.jfinal.plugin.activerecord.Db; -import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.plugin.hikaricp.HikariCpPlugin; -import java.util.List; - public class ChangeDataEaseCity { - /** - * 获取指定大屏中的地图配置信息 - * - * @param bigScreenId 大屏ID - * @return - */ - public static List getMap(long bigScreenId) { - String sql = "select id,custom_attr from dataease.core_chart_view where scene_id=? and type='map'"; - List list = Db.find(sql, bigScreenId); - return list; - } - - /** - * 获取城市编码 - * - * @param cityName 城市名称 - * @return 城市编码 - */ - public static String getCityCode(String cityName) { - String sql = "select area_code from t_city_code where area_name=?"; - return Db.findFirst(sql, cityName).getStr("area_code"); - } - - /** - * 修改大屏的城市地图为指定的城市 - * - * @param dataVisualizationName 大屏名称 - * @param cityName 城市名称 - */ - public static void updateCity(String dataVisualizationName, String cityName) { - //取出大屏的ID值 - String sql = "select * from dataease.data_visualization_info where name =?"; - Record dataVisualizationInfo = Db.findFirst(sql, dataVisualizationName); - long bigScreenId = dataVisualizationInfo.getLong("id"); - // 配置的内容 - List list = getMap(bigScreenId); - for (Record record : list) { - long id = record.getLong("id"); - JSONObject jo = JSONObject.parseObject(record.getStr("custom_attr")); - //获取城市编码 - String area_code = getCityCode(cityName); - //修改城市编码 - jo.getJSONObject("map").put("id", area_code); - jo.getJSONObject("map").put("level", "city"); - //写到数据库 - String jsonString = jo.toJSONString(); - Db.update("update dataease.core_chart_view set custom_attr=? where id=?", jsonString, id); - } - } - /** * 测试地址： * http://10.10.14.203:8100/#/de-link/zud8IQ8J @@ -88,7 +33,8 @@ public class ChangeDataEaseCity { //要修改的大屏中文名称 String dataVisualizationName = "黄海测试的市州地图"; String cityName = "昭通市"; - updateCity(dataVisualizationName, cityName); + DataEaseModel dm = new DataEaseModel(); + dm.updateCity(dataVisualizationName, cityName); /* 要修改的市州名称，需要用全称 156530100 昆明市