jinpengyong
2023-11-10 c64ca12b8679d73fc7f8109f0e08fa8c74352164
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);