From c461daa0a405f476152391dd2defcbc307b271de Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Thu, 7 Jul 2016 13:29:42 +0800
Subject: [PATCH] add statistics(map) common index

---
 .../web/controller/StatisticsController.java       | 29 ++++++++++++++--------
 .../platform/reportdata/model/echarts/Option.java  |  9 +++++++
 2 files changed, 27 insertions(+), 11 deletions(-)

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 1ab3c95..9d23dad 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
@@ -132,7 +132,7 @@ public class StatisticsController extends BaseController {
                 dataList.add(data);
             }
 
-            Option option = buildMapOption("孕妇建档数", null);
+            Option option = buildMapOption("全国孕妇建档及高危数", null);
             option.getLegend().setTop("50px");
             List<Object> seriesList = new ArrayList<>();
             Series series = new Series();
@@ -286,6 +286,7 @@ public class StatisticsController extends BaseController {
 
         // TYPE 省数据
         else if (type == 2) {
+            String provinceName = null;
             AreaDataQuery query = new AreaDataQuery();
             query.setProvinceId(pid);
             // 地图数据
@@ -322,20 +323,26 @@ public class StatisticsController extends BaseController {
             areaBarOption.setSeries(areaBarSeriesList);
 
             for (AreaData areaData:provinceRiskList) {
+                if (provinceName == null) {
+                    provinceName = areaData.getProvinceName();
+                }
                 String rigino = areaData.getCityName();
                 if (mapsData.get(rigino) == null) {
                     mapsData.put(rigino, areaData.getVal());
-                    kvData.put(rigino, areaData.getProvinceId());
+                    kvData.put(rigino, areaData.getCityId());
                 } else {
                     mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
                 }
             }
             for (AreaData areaData:provincePatientList) {
+                if (provinceName == null) {
+                    provinceName = areaData.getProvinceName();
+                }
                 String rigino = areaData.getCityName();
                 if (mapsData.get(rigino) == null) {
                     riskDataList.add(0);
                     mapsData.put(rigino, areaData.getVal());
-                    kvData.put(rigino, areaData.getProvinceId());
+                    kvData.put(rigino, areaData.getCityId());
                 } else {
                     riskDataList.add(mapsData.get(rigino));
                     mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
@@ -353,19 +360,13 @@ public class StatisticsController extends BaseController {
                 dataList.add(data);
             }
 
-            Option option = buildMapOption("孕妇建档数", null);
+            Option option = buildMapOption(provinceName + "孕妇建档及高危数", null);
             option.getLegend().setTop("50px");
             List<Object> seriesList = new ArrayList<>();
             Series series = new Series();
             series.setName("建档及高危数");
             series.setType("map");
-            if ("130000".equals(pid)) {
-                series.setMapType("河北");
-            } else if ("510000".equals(pid)) {
-                series.setMapType("四川");
-            } else {
-                series.setMapType("china");
-            }
+            series.setMapType(provinceName.replace("市","").replace("省",""));
             series.setRoam(false);
             series.setData(dataList);
             series.setLabel(label);
@@ -684,8 +685,14 @@ public class StatisticsController extends BaseController {
         option.setyAxis(xAxis);
         List<Object> seriesList = new ArrayList<>();
         option.setSeries(seriesList);
+        List<String> color = new ArrayList<>();
         for (String groupName:map.keySet()) {
             legendData.add(groupName);
+            if (colormap.containsKey(groupName)) {
+                color.add(colormap.get(groupName));
+            } else {
+                color.add(option.getColor()[new Random().nextInt(10)]);
+            }
             Map<String, Integer> sub = map.get(groupName);
             Series series = new Series();
             series.setName(groupName);
diff --git a/platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/Option.java b/platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/Option.java
index d875c05..9f7ac3f 100644
--- a/platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/Option.java
+++ b/platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/Option.java
@@ -13,10 +13,19 @@ public class Option {
     private VisualMap visualMap;
     private Tooltip toolbox;
     private List<Object> series;
+    private String[] color = {"#2f4554","#c23531", "#61a0a8", "#d48265", "#91c7ae","#749f83",  "#ca8622", "#bda29a","#6e7074", "#546570", "#c4ccd3"};
 
     private Grid grid;
     private AxisPointer xAxis;
 
+    public String[] getColor() {
+        return color;
+    }
+
+    public void setColor(String[] color) {
+        this.color = color;
+    }
+
     public AxisPointer getyAxis() {
         return yAxis;
     }
-- 
1.8.3.1