路口指标趋势数据查询-兼容处理对于传入参数不是粒度整倍数情况

signal-optimize-service/src/main/java/net/wanji/opt/common/EsDateIndexUtil.java

@@ -71,16 +71,22 @@ public class EsDateIndexUtil {
         List<String> sortedSet = new ArrayList<>();
         //===========================根据开始、结束时间输出完整时刻点=================================================//
         DateTime start = DateTime.parse(startTime, DateTimeFormat.forPattern(EsDateIndexUtil.YMD_HM_FORMATTER));
-        //对于输入时间不是整5分钟情况，规约到5分钟
-        String formatStartDate = startTime.substring(0,startTime.indexOf(" ")+1) + Tools.fillZeroFront(start.getHourOfDay()+"",2)+":"+Tools.fillZeroFront((int)Math.ceil(start.getMinuteOfHour()/5)*5+"",2)+":00";
-        start = DateTime.parse(formatStartDate, DateTimeFormat.forPattern(EsDateIndexUtil.YMD_HM_FORMATTER));
 
         DateTime end = DateTime.parse(endTime, DateTimeFormat.forPattern(EsDateIndexUtil.YMD_HM_FORMATTER));
         if (Objects.equals("0", groupType)) {
+            //对于输入时间不是整5分钟情况，规约到5分钟
+            String formatStartDate = startTime.substring(0,startTime.indexOf(" ")+1) + Tools.fillZeroFront(start.getHourOfDay()+"",2)+":"+Tools.fillZeroFront((int)Math.ceil(start.getMinuteOfHour()/5)*5+"",2)+":00";
+            start = DateTime.parse(formatStartDate, DateTimeFormat.forPattern(EsDateIndexUtil.YMD_HM_FORMATTER));
             sortedSet.addAll(EsDateIndexUtil.getTimeScopeList(start, end, TimeGranularityEnum.FIVE_MINUTE, "yyyy-MM-dd HH:mm:00"));
         } else if (Objects.equals("1", groupType)) {
+            //对于输入时间不是整5分钟情况，规约到15分钟
+            String formatStartDate = startTime.substring(0,startTime.indexOf(" ")+1) + Tools.fillZeroFront(start.getHourOfDay()+"",2)+":"+Tools.fillZeroFront((int)Math.ceil(start.getMinuteOfHour()/15)*15+"",2)+":00";
+            start = DateTime.parse(formatStartDate, DateTimeFormat.forPattern(EsDateIndexUtil.YMD_HM_FORMATTER));
             sortedSet.addAll(EsDateIndexUtil.getTimeScopeList(start, end, TimeGranularityEnum.FIFTEEN_MINUTE, "yyyy-MM-dd HH:mm:00"));
         } else if (Objects.equals("2", groupType)) {
+            //对于输入时间不是整5分钟情况，规约到30分钟
+            String formatStartDate = startTime.substring(0,startTime.indexOf(" ")+1) + Tools.fillZeroFront(start.getHourOfDay()+"",2)+":"+Tools.fillZeroFront((int)Math.ceil(start.getMinuteOfHour()/30)*30+"",2)+":00";
+            start = DateTime.parse(formatStartDate, DateTimeFormat.forPattern(EsDateIndexUtil.YMD_HM_FORMATTER));
             sortedSet.addAll(EsDateIndexUtil.getTimeScopeList(start, end, TimeGranularityEnum.THIRTY_MINUTE, "yyyy-MM-dd HH:mm:00"));
         } else if (Objects.equals("3", groupType)) {
             sortedSet.addAll(EsDateIndexUtil.getTimeScopeList(start, end, TimeGranularityEnum.ONE_HOUR, "yyyy-MM-dd HH:00:00"));