fangcheng / regional-platform

Download as
Browse Code »

Commit 946a3e8ac218734aa3739435ee87d3ef4fe6a449

Authored by baohanddd
1 parent 89fcf59037
Exists in master and in 1 other branch nobuildprocess

add statistics(map) common index

Showing 1 changed file with 25 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java View file @ 946a3e8
... ... @@ -65,7 +65,17 @@
65 65 List<AreaData> provincePatientList = statisticsService.queryProvincePatients();
66 66 Map<String, String> kvData = new HashMap<>();
67 67 Map<String, Integer> mapsData = new HashMap<>();
68   - for (AreaData areaData:provincePatientList) {
  68 + Option areaBarOption = buildBarOption("建档&高危人数", null);
  69 + List<Object> areaBarSeriesList = new ArrayList<>();
  70 + Series patientSeries = new Series();
  71 + patientSeries.setName("建档人数");
  72 + patientSeries.setType("bar");
  73 + List<Object> patientDataList = new ArrayList<>();
  74 + Series riskSeries = new Series();
  75 + riskSeries.setName("高危人数");
  76 + riskSeries.setType("bar");
  77 + List<Object> riskDataList = new ArrayList<>();
  78 + for (AreaData areaData:provinceRiskList) {
69 79 String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
70 80 if (mapsData.get(rigino) == null) {
71 81 mapsData.put(rigino, areaData.getVal());
72 82  
73 83  
74 84  
75 85  
... ... @@ -74,15 +84,22 @@
74 84 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
75 85 }
76 86 }
77   - for (AreaData areaData:provinceRiskList) {
  87 + for (AreaData areaData:provincePatientList) {
78 88 String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
79 89 if (mapsData.get(rigino) == null) {
  90 + riskDataList.add(0);
80 91 mapsData.put(rigino, areaData.getVal());
81 92 kvData.put(rigino, areaData.getProvinceId());
82 93 } else {
  94 + riskDataList.add(mapsData.get(rigino));
83 95 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
84 96 }
  97 + areaBarOption.getyAxis().getData().add(rigino);
  98 + patientDataList.add(areaData.getVal());
85 99 }
  100 + areaBarSeriesList.add(patientDataList);
  101 + areaBarSeriesList.add(riskDataList);
  102 + areaBarOption.setSeries(areaBarSeriesList);
86 103  
87 104 List<Object> dataList = new ArrayList<>();
88 105 Set<String> set = mapsData.keySet();
... ... @@ -109,6 +126,7 @@
109 126 seriesList.add(series);
110 127 option.setSeries(seriesList);
111 128  
  129 +
112 130 // 高危数据
113 131 List<AreaData> currentRiskList = statisticsService.queryRisks(new AreaDataQuery());
114 132 Option groupRiskOption = buildBarOption("当前高危人数", null);
... ... @@ -145,6 +163,7 @@
145 163 result.put("type", 1);
146 164 result.put("kvData", kvData);
147 165 result.put("mapsOption", option);
  166 + result.put("areaBarOption", areaBarOption);
148 167 result.put("groupRiskOption", groupRiskOption);
149 168 ResultUtils.buildSuccessResultAndWrite(response, result);
150 169 }
... ... @@ -201,6 +220,10 @@
201 220 option.setLegend(legend);
202 221 Grid grid = new Grid();
203 222 grid.setContainLabel(true);
  223 + grid.setTop("55px");
  224 + grid.setLeft("3%");
  225 + grid.setRight("3%");
  226 + grid.setBottom("3%");
204 227 option.setGrid(grid);
205 228 AxisPointer xAxis = new AxisPointer();
206 229 xAxis.setType("value");
... ... @@ -212,11 +235,6 @@
212 235 AxisPointer yAxis = new AxisPointer();
213 236 yAxis.setType("category");
214 237 List<Object> dataList = new ArrayList<Object>();
215   - dataList.add("其他");
216   - dataList.add("黄色");
217   - dataList.add("橙色");
218   - dataList.add("红色");
219   - dataList.add("紫色");
220 238 yAxis.setData(dataList);
221 239 option.setyAxis(yAxis);
222 240 return option;