update

jinpengyong

2020-04-29 f5e4a1aacb32d0b6a067ecb47bc29e08eefd11cd

update

 src/main/java/com/moral/controller/ScreenController.java

@@ -882,6 +882,7 @@
        parameters.put("sensors1", sensorKey1);

        List<Map<String, Object>> areaList = historyMinutelyService.getAreaAvgDataByAreaCode(parameters);

        if (areaList.isEmpty()) {
            Integer areaCode = Integer.valueOf(request.getParameter("areaCode"));
            areaCode = hangzhouAqiService.queryCityCode(areaCode);
@@ -929,7 +930,7 @@
                    String resultTime = resultMap.get("time").toString();
                    if (resultTime.equals(monitorTime)) {
                        String value = resultMap.remove(s).toString();
                        String value1 = monitorMap.remove(s).toString();
                        String value1 = monitorMap.get(s).toString();
                        values.add(value);
                        values.add(value1);
                        resultMap.put("values", values);
@@ -952,9 +953,7 @@
                resultMap.put("values", values);
            }
        }

        return new ResultBean<List<Map<String, Object>>>(resultList);

    }

    @GetMapping("getmpoint-byid")