贡献率数据格式修改

jinpengyong

2022-01-05 85dba01ea5021d83487c3ed2d60706f516a0774b

贡献率数据格式修改

 screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java

@@ -938,8 +938,6 @@

        //年排名，按累计综指排
        sortByField(ranks, "compositeIndexYear");
        //年排名结果
        sortByField(ranks, "compositeIndexYear");
        Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
        if (ObjectUtils.isEmpty(yearMap)) {
            yearMap.put("rank", null);

 screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java

@@ -86,7 +86,7 @@
    @Autowired
    private SensorService sensorService;

    private static Map<String, String> senorMap = new HashMap<>();
    private static final Map<String, String> senorMap = new HashMap<>();

    static {
        senorMap.put(Constants.SENSOR_CODE_PM25, "PM2_5");
@@ -237,7 +237,7 @@
            }
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("name", cityValue);
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

@@ -299,9 +299,9 @@
                }

                //行业均值
                timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                //贡献率
                timeDataMap.put("value", contributionRate);
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            professionMap.put("data", dataList);
@@ -374,7 +374,7 @@
            }
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("name", cityValue);
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

@@ -436,9 +436,9 @@
                }

                //行业均值
                timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                //贡献率
                timeDataMap.put("value", contributionRate);
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            professionMap.put("data", dataList);
@@ -521,7 +521,7 @@
            }
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("name", cityValue);
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

@@ -583,9 +583,9 @@
                }

                //行业均值
                timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
                //贡献率
                timeDataMap.put("value", contributionRate);
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            professionMap.put("data", dataList);

 screen-api/src/main/java/com/moral/api/service/impl/RegionServiceImpl.java

@@ -79,7 +79,7 @@
    @Autowired
    private SensorService sensorService;

    private static Map<String, String> senorMap = new HashMap<>();
    private static final Map<String, String> senorMap = new HashMap<>();

    static {
        senorMap.put(Constants.SENSOR_CODE_PM25, "PM2_5");
@@ -226,7 +226,7 @@
            }
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("name", cityValue);
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

@@ -282,9 +282,9 @@
                }

                //乡镇区域均值
                timeDataMap.put("name", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                //乡镇区域贡献率
                timeDataMap.put("value", contributionRate);
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            regionMap.put("data", dataList);
@@ -357,7 +357,7 @@
            }
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("name", cityValue);
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

@@ -413,9 +413,9 @@
                }

                //乡镇区域均值
                timeDataMap.put("name", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                //乡镇区域贡献率
                timeDataMap.put("value", contributionRate);
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            regionMap.put("data", dataList);
@@ -497,7 +497,7 @@
            }
            Map<String, Object> cityDataMap = new HashMap<>();
            //本市数据
            cityDataMap.put("name", cityValue);
            cityDataMap.put("value", cityValue);
            cityDataList.add(cityDataMap);
        }

@@ -553,9 +553,9 @@
                }

                //乡镇区域均值
                timeDataMap.put("name", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                timeDataMap.put("value", regionAvg == null ? null : AmendUtils.sciCal(regionAvg, 0));
                //乡镇区域贡献率
                timeDataMap.put("value", contributionRate);
                timeDataMap.put("name", contributionRate);
                dataList.add(timeDataMap);
            }
            regionMap.put("data", dataList);

 screen-job/src/main/java/com/moral/api/service/impl/ForecastServiceImpl.java

@@ -59,7 +59,7 @@
    @Autowired
    private ForecastService forecastService;

    private static Map<String, Integer> weatherScore = new HashMap<>();
    private static final Map<String, Integer> weatherScore = new HashMap<>();

    static {
        weatherScore.put("晴", 100);