diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java index 1b2207c2..e18735d6 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java @@ -3,6 +3,7 @@ package com.gccloud.dataroom.core.module.chart.controller; import com.gccloud.dataroom.core.module.basic.dto.BasePageDTO; import com.gccloud.dataroom.core.module.basic.entity.PageEntity; import com.gccloud.dataroom.core.module.chart.bean.Chart; +import com.gccloud.dataroom.core.module.chart.components.ScreenFlyMapChart; import com.gccloud.dataroom.core.module.chart.dto.ChartDataSearchDTO; import com.gccloud.dataroom.core.module.chart.service.BaseChartDataService; import com.gccloud.dataroom.core.module.chart.service.ChartMockData; @@ -83,7 +84,13 @@ public class ChartDataController { try { ChartDataVO chartDataVO = baseChartDataService.dataQuery(chart, chartDataSearchDTO); if (chartDataVO == null) { - chartDataVO = ChartMockData.getMockData(chartDataSearchDTO.getType()); + String type = chartDataSearchDTO.getType(); + if (chart instanceof ScreenFlyMapChart) { + ScreenFlyMapChart screenFlyMapChart = (ScreenFlyMapChart) chart; + ScreenFlyMapChart.Customize customize = screenFlyMapChart.getCustomize(); + type += "-" + customize.getLevel(); + } + chartDataVO = ChartMockData.getMockData(type); } return R.success(chartDataVO); } catch (Exception e) { diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json new file mode 100644 index 00000000..b8aa705b --- /dev/null +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-country.json @@ -0,0 +1,121 @@ +{ + "success": false, + "data": [ + { + "from": "青海", + "lat1": 95.2402, + "lat2": 115.4004, + "lng1": 35.4199, + "lng2": 39.4688, + "to": "河北", + "type": "move_in", + "value": 90 + }, + { + "from": "安徽省", + "lat1": 117.2461, + "lat2": 115.4004, + "lng1": 32.0361, + "lng2": 39.4688, + "to": "河北省", + "type": "move_in", + "value": 10 + }, + { + "from": "新疆", + "lat1": 87.9688, + "lat2": 115.4004, + "lng1": 39.7467, + "lng2": 39.4688, + "to": "河北", + "type": "move_in", + "value": 10 + }, + { + "from": "云南", + "lat1": 101.8652, + "lat2": 115.4004, + "lng1": 25.1807, + "lng2": 39.4688, + "to": "河北", + "type": "move_in", + "value": 10 + }, + { + "from": "黑龙江", + "lat1": 128.1445, + "lat2": 115.4004, + "lng1": 48.5156, + "lng2": 39.4688, + "to": "河北", + "type": "move_in", + "value": 10 + } + ], + "columnData": { + "from": { + "type": "varchar", + "tableName": "", + "originalColumn": "from", + "aggregate": "", + "alias": "from", + "remark": "起点" + }, + "lat1": { + "type": "double", + "tableName": "", + "originalColumn": "lat1", + "aggregate": "", + "alias": "lat1", + "remark": "起点纬度" + }, + "lat2": { + "type": "double", + "tableName": "", + "originalColumn": "lat2", + "aggregate": "", + "alias": "lat2", + "remark": "终点纬度" + }, + "lng1": { + "type": "double", + "tableName": "", + "originalColumn": "lng1", + "aggregate": "", + "alias": "lng1", + "remark": "起点经度" + }, + "lng2": { + "type": "double", + "tableName": "", + "originalColumn": "lng2", + "aggregate": "", + "alias": "lng2", + "remark": "终点经度" + }, + "to": { + "type": "varchar", + "tableName": "", + "originalColumn": "to", + "aggregate": "", + "alias": "to", + "remark": "终点" + }, + "type": { + "type": "varchar", + "tableName": "", + "originalColumn": "type", + "aggregate": "", + "alias": "type", + "remark": "类型" + }, + "value": { + "type": "int", + "tableName": "", + "originalColumn": "value", + "aggregate": "", + "alias": "value", + "remark": "值" + } + } +} diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-province.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-province.json new file mode 100644 index 00000000..be149737 --- /dev/null +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-province.json @@ -0,0 +1,70 @@ +{ + "success": false, + "data": [], + "columnData": { + "from": { + "type": "varchar", + "tableName": "", + "originalColumn": "from", + "aggregate": "", + "alias": "from", + "remark": "起点" + }, + "lat1": { + "type": "double", + "tableName": "", + "originalColumn": "lat1", + "aggregate": "", + "alias": "lat1", + "remark": "起点纬度" + }, + "lat2": { + "type": "double", + "tableName": "", + "originalColumn": "lat2", + "aggregate": "", + "alias": "lat2", + "remark": "终点纬度" + }, + "lng1": { + "type": "double", + "tableName": "", + "originalColumn": "lng1", + "aggregate": "", + "alias": "lng1", + "remark": "起点经度" + }, + "lng2": { + "type": "double", + "tableName": "", + "originalColumn": "lng2", + "aggregate": "", + "alias": "lng2", + "remark": "终点经度" + }, + "to": { + "type": "varchar", + "tableName": "", + "originalColumn": "to", + "aggregate": "", + "alias": "to", + "remark": "终点" + }, + "type": { + "type": "varchar", + "tableName": "", + "originalColumn": "type", + "aggregate": "", + "alias": "type", + "remark": "类型" + }, + "value": { + "type": "int", + "tableName": "", + "originalColumn": "value", + "aggregate": "", + "alias": "value", + "remark": "值" + } + } +} diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-world.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-world.json new file mode 100644 index 00000000..d1a2f94f --- /dev/null +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap-world.json @@ -0,0 +1,111 @@ +{ + "success": false, + "data": [ + { + "from": "加拿大", + "lat1": -95.7129, + "lat2": 29.80475, + "lng1": 56.1304, + "lng2": 50.0577, + "to": "乌克兰", + "type": "move_in", + "value": 10 + }, + { + "from": "中非", + "lat1": 20.6796, + "lng1": 6.3646, + "lat2": 29.80475, + "lng2": 50.0577, + "to": "乌克兰", + "type": "move_in", + "value": 10 + }, + { + "from": "巴西", + "lat1": -53.6453, + "lng1": -10.8921, + "lat2": 29.80475, + "lng2": 50.0577, + "to": "乌克兰", + "type": "move_in", + "value": 10 + }, + { + "from": "俄罗斯", + "lat1": 85.7325, + "lng1": 67.4894, + "lat2": 29.80475, + "lng2": 50.0577, + "to": "乌克兰", + "type": "move_in", + "value": 10 + } + ], + "columnData": { + "from": { + "type": "varchar", + "tableName": "", + "originalColumn": "from", + "aggregate": "", + "alias": "from", + "remark": "起点" + }, + "lat1": { + "type": "double", + "tableName": "", + "originalColumn": "lat1", + "aggregate": "", + "alias": "lat1", + "remark": "起点纬度" + }, + "lat2": { + "type": "double", + "tableName": "", + "originalColumn": "lat2", + "aggregate": "", + "alias": "lat2", + "remark": "终点纬度" + }, + "lng1": { + "type": "double", + "tableName": "", + "originalColumn": "lng1", + "aggregate": "", + "alias": "lng1", + "remark": "起点经度" + }, + "lng2": { + "type": "double", + "tableName": "", + "originalColumn": "lng2", + "aggregate": "", + "alias": "lng2", + "remark": "终点经度" + }, + "to": { + "type": "varchar", + "tableName": "", + "originalColumn": "to", + "aggregate": "", + "alias": "to", + "remark": "终点" + }, + "type": { + "type": "varchar", + "tableName": "", + "originalColumn": "type", + "aggregate": "", + "alias": "type", + "remark": "类型" + }, + "value": { + "type": "int", + "tableName": "", + "originalColumn": "value", + "aggregate": "", + "alias": "value", + "remark": "值" + } + } +}