风场图update

于紫祥_1901

2020-08-13 475ec3bd82f7e7f767ca6ba43f3e12b90d3383f1

 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java

@@ -361,16 +361,6 @@
    }

    @Override
    public List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters) throws Exception {
        convertQueryParam(parameters);
        if (!ObjectUtils.isEmpty(parameters.get("compensate"))) {
            parameters.put("timeUnits", "10min");
        }
        return historyMinutelyMapper.getAreaAvgDataByAreaCode(parameters);

    }

    @Override
    public void convertQueryParam(Map<String, Object> parameters) throws ParseException {
        if (!parameters.containsKey("field")) {
            // String type = (String) parameters.get("type");
@@ -382,13 +372,13 @@
                        String[] timeStr = parameters.get("time").toString().split("-");
                        int year = Integer.valueOf(timeStr[0]);
                        int month = Integer.valueOf(timeStr[1]);
                        String yearAndMonth;
                        if (month < 10) {
                            yearAndMonth = "minutely_" + year + "0" + month;
                        } else {
                            yearAndMonth = "minutely_" + year + month;
                        }
                        if (year >= 2020) {
                            String yearAndMonth;
                            if (month < 10) {
                                yearAndMonth = "minutely_" + year + "0" + month;
                            } else {
                                yearAndMonth = "minutely_" + year + month;
                            }
                            parameters.put("timeUnits", yearAndMonth);
                        }
                    }