diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java index 2b7f35e..473e072 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java @@ -53,6 +53,12 @@ public class StatisticsController extends BaseController { @RequestMapping(value = "/total/index", method = RequestMethod.GET) public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) { Map result= new HashMap(); + Map colormap = new HashMap<>(); + colormap.put("紫色", "#FCC0F6"); + colormap.put("红色", "#FFBDBE"); + colormap.put("橙色", "#FFD6BD"); + colormap.put("黄色", "#FFFEBD"); + colormap.put("其它", "#DEDCE0"); if (type == 1) { // 地图数据 List provinceRiskList = statisticsService.queryProvinceRisks(); @@ -116,19 +122,16 @@ public class StatisticsController extends BaseController { if (mapsData.get(groupName) == null) { mapsData.put(groupName,areaData.getVal()); } else { - mapsData.put(groupName,mapsData.get(groupName)+areaData.getVal()); + mapsData.put(groupName, mapsData.get(groupName) + areaData.getVal()); } } List groupRiskDataList = new ArrayList<>(); for (Object key:groupRiskOption.getyAxis().getData()) { if (mapsData.containsKey(key)) { - groupRiskDataList.add(mapsData.get(key)); - } - } - for (String key:mapsData.keySet()) { - if (!groupRiskOption.getyAxis().getData().contains(key)) { - groupRiskOption.getyAxis().getData().add(key); - groupRiskDataList.add(mapsData.get(key)); + Data data = new Data(); + data.setValue(mapsData.get(key)); + data.setItemStyle(new ItemStyle(new Normal(null,colormap.get(key)),null)); + groupRiskDataList.add(data); } } groupRiskSeries.setData(groupRiskDataList); @@ -149,6 +152,7 @@ public class StatisticsController extends BaseController { + private Option buildMapOption(String titleText, String subTitle) { Option option = new Option(); Title title = new Title(); @@ -206,10 +210,11 @@ public class StatisticsController extends BaseController { AxisPointer yAxis = new AxisPointer(); yAxis.setType("category"); List dataList = new ArrayList(); - dataList.add("紫色"); - dataList.add("红色"); - dataList.add("橙色"); + dataList.add("其它"); dataList.add("黄色"); + dataList.add("橙色"); + dataList.add("红色"); + dataList.add("紫色"); yAxis.setData(dataList); option.setyAxis(yAxis); return option;