From 4428fd50d5e8216d5d7bd63a7fc2e1bb8e239d9d Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Wed, 13 May 2020 13:58:13 +0800 Subject: [PATCH] update大屏地图跳转定位问题 --- src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java index 9a24f1b..5d0c824 100644 --- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java +++ b/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); } } -- Gitblit v1.8.0