From bdb8dcd075f56750022df37b0557c6c08aabd917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 31 Oct 2024 21:32:30 +0800 Subject: [PATCH] 'commit' --- .../Controller/DataEaseController.java | 23 ++++++++-- .../base/DataEase/Model/DataEaseModel.java | 35 ++++++++++++++- .../base/Tools/ChangeDataEaseCity.java | 43 ++++++++++++------- 3 files changed, 81 insertions(+), 20 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 521489e0..283cebb7 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -22,7 +22,22 @@ public class DataEaseController extends Controller { DataEaseModel dm = new DataEaseModel(); BaseModel bm = new BaseModel(); - // http://10.10.21.20:9000/dsBase/dataease/route?city_name=昆明市 + // http://10.10.21.20:9000/dsBase/dataease/route?city_name=昆明市&r=1234234 + // http://10.10.21.20:9000/dsBase/dataease/route?city_name=楚雄彝族自治州&r=1234234 + /** + * DataEase仪表板外部参数传递 + * https://www.jianshu.com/p/cc9982e986f5 + * + * https://base64.us/ + * + * + * {"city_name":"昆明市"} + * http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmmIbmmI7luIIifQ== + * + * + * {"city_name":"楚雄彝族自治州"} + * http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmpZrpm4TlvZ3ml4/oh6rmsrvlt54ifQ== + */ /** * 路由跳转 * @param city_name 城市名称 @@ -31,9 +46,11 @@ public class DataEaseController extends Controller { @EmptyInterface({"city_name"}) public void route(String city_name) { if(city_name.equals("昆明市")){ - redirect301("http://www.baidu.com"); + dm.updateCity("156530100"); + redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmmIbmmI7luIIifQ=="); }else{ - redirect301("http://www.edusoa.com"); + dm.updateCity("156532300"); + redirect301("http://10.10.14.203:8100/#/de-link/zud8IQ8J?attachParams=eyJjaXR5X25hbWUiOiLmpZrpm4TlvZ3ml4/oh6rmsrvlt54ifQ=="); } } /** 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 72d5d305..8e53b1ac 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -34,7 +34,7 @@ public class DataEaseModel { Record record = getTableName(dataset_id); if (record == null) return null; String sql = "select * from `" + record.getStr("table_name") + "`"; - List list=Db.use(DB_NAME).find(sql); + List list = Db.use(DB_NAME).find(sql); return list; } @@ -81,4 +81,37 @@ public class DataEaseModel { } Db.use("dataease").batchSave(tableName, list, 100); } + + /** + * 更新DataEase中大屏中的行政区划 + * + * @param xzqhId 行政区划ID + */ + public void updateCity(String xzqhId) { + //取出大屏的ID值 + String sql = "select * from dataease.data_visualization_info where name ='黄海测试的市州地图'"; + Record dataVisualizationInfo = Db.findFirst(sql); + 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); + + 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(); + 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 beb1cc43..0dd7b8c2 100644 --- a/src/main/java/com/dsideal/base/Tools/ChangeDataEaseCity.java +++ b/src/main/java/com/dsideal/base/Tools/ChangeDataEaseCity.java @@ -10,6 +10,8 @@ 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 { @@ -34,30 +36,39 @@ public class ChangeDataEaseCity { System.out.println(bigScreenId); // 配置的内容 sql = "select id,custom_attr from core_chart_view where scene_id=? and type='map'"; - Record record = Db.findFirst(sql, bigScreenId); - long id = record.getLong("id"); - JSONObject jo = JSONObject.parseObject(record.getStr("custom_attr")); - System.out.println(jo.getJSONObject("map").getString("level")); - System.out.println(jo.getJSONObject("map").getString("id")); + List list = Db.find(sql, bigScreenId); + + for (Record record : list) { + long id = record.getLong("id"); + com.alibaba.fastjson2.JSONObject jo = com.alibaba.fastjson2.JSONObject.parseObject(record.getStr("custom_attr")); + System.out.println(jo.getJSONObject("map").getString("level")); + System.out.println(jo.getJSONObject("map").getString("id")); + + + if (jo.getJSONObject("map").getString("id").equals("156530100")) { + //修改为楚雄 + jo.getJSONObject("map").put("id", "156532300"); + jo.getJSONObject("map").put("level", "city"); + } else { + //修改为昆明 + jo.getJSONObject("map").put("id", "156530100"); + jo.getJSONObject("map").put("level", "city"); + } + + //回写到数据库 + String jsonString = jo.toJSONString(); + Db.update("update 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 - 吉林省 - province 156220000 - 云南省 province 156530000 + 220000000000 */ - //修改为云南省 - //jo.getJSONObject("map").put("id", "156530000"); - //修改为吉林省 - jo.getJSONObject("map").put("id", "156220000"); - //回写到数据库 - String jsonString = jo.toJSONString(); - Db.update("update core_chart_view set custom_attr=? where id=?", jsonString, id); - System.out.println("成功切换！"); } }