jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c461daa0a405f476152391dd2defcbc307b271de

Authored by baohanddd
1 parent 8a4fb116f0
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

add statistics(map) common index

Showing 2 changed files with 27 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java View file @ c461daa
... ... @@ -132,7 +132,7 @@
132 132 dataList.add(data);
133 133 }
134 134  
135   - Option option = buildMapOption("孕妇建档数", null);
  135 + Option option = buildMapOption("全国孕妇建档及高危数", null);
136 136 option.getLegend().setTop("50px");
137 137 List<Object> seriesList = new ArrayList<>();
138 138 Series series = new Series();
... ... @@ -286,6 +286,7 @@
286 286  
287 287 // TYPE 省数据
288 288 else if (type == 2) {
  289 + String provinceName = null;
289 290 AreaDataQuery query = new AreaDataQuery();
290 291 query.setProvinceId(pid);
291 292 // 地图数据
292 293  
293 294  
294 295  
... ... @@ -322,20 +323,26 @@
322 323 areaBarOption.setSeries(areaBarSeriesList);
323 324  
324 325 for (AreaData areaData:provinceRiskList) {
  326 + if (provinceName == null) {
  327 + provinceName = areaData.getProvinceName();
  328 + }
325 329 String rigino = areaData.getCityName();
326 330 if (mapsData.get(rigino) == null) {
327 331 mapsData.put(rigino, areaData.getVal());
328   - kvData.put(rigino, areaData.getProvinceId());
  332 + kvData.put(rigino, areaData.getCityId());
329 333 } else {
330 334 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
331 335 }
332 336 }
333 337 for (AreaData areaData:provincePatientList) {
  338 + if (provinceName == null) {
  339 + provinceName = areaData.getProvinceName();
  340 + }
334 341 String rigino = areaData.getCityName();
335 342 if (mapsData.get(rigino) == null) {
336 343 riskDataList.add(0);
337 344 mapsData.put(rigino, areaData.getVal());
338   - kvData.put(rigino, areaData.getProvinceId());
  345 + kvData.put(rigino, areaData.getCityId());
339 346 } else {
340 347 riskDataList.add(mapsData.get(rigino));
341 348 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
342 349  
... ... @@ -353,19 +360,13 @@
353 360 dataList.add(data);
354 361 }
355 362  
356   - Option option = buildMapOption("孕妇建档数", null);
  363 + Option option = buildMapOption(provinceName + "孕妇建档及高危数", null);
357 364 option.getLegend().setTop("50px");
358 365 List<Object> seriesList = new ArrayList<>();
359 366 Series series = new Series();
360 367 series.setName("建档及高危数");
361 368 series.setType("map");
362   - if ("130000".equals(pid)) {
363   - series.setMapType("河北");
364   - } else if ("510000".equals(pid)) {
365   - series.setMapType("四川");
366   - } else {
367   - series.setMapType("china");
368   - }
  369 + series.setMapType(provinceName.replace("市","").replace("省",""));
369 370 series.setRoam(false);
370 371 series.setData(dataList);
371 372 series.setLabel(label);
372 373  
... ... @@ -684,8 +685,14 @@
684 685 option.setyAxis(xAxis);
685 686 List<Object> seriesList = new ArrayList<>();
686 687 option.setSeries(seriesList);
  688 + List<String> color = new ArrayList<>();
687 689 for (String groupName:map.keySet()) {
688 690 legendData.add(groupName);
  691 + if (colormap.containsKey(groupName)) {
  692 + color.add(colormap.get(groupName));
  693 + } else {
  694 + color.add(option.getColor()[new Random().nextInt(10)]);
  695 + }
689 696 Map<String, Integer> sub = map.get(groupName);
690 697 Series series = new Series();
691 698 series.setName(groupName);
platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/Option.java View file @ c461daa
... ... @@ -13,9 +13,18 @@
13 13 private VisualMap visualMap;
14 14 private Tooltip toolbox;
15 15 private List<Object> series;
  16 + private String[] color = {"#2f4554","#c23531", "#61a0a8", "#d48265", "#91c7ae","#749f83", "#ca8622", "#bda29a","#6e7074", "#546570", "#c4ccd3"};
16 17  
17 18 private Grid grid;
18 19 private AxisPointer xAxis;
  20 +
  21 + public String[] getColor() {
  22 + return color;
  23 + }
  24 +
  25 + public void setColor(String[] color) {
  26 + this.color = color;
  27 + }
19 28  
20 29 public AxisPointer getyAxis() {
21 30 return yAxis;