修改获取六参五分钟平均值bug

kaiyu

2020-10-20 ac670fcaf071f52ac886a4e52edb7c37d9f5d4fe

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

@@ -22,6 +22,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -256,6 +257,21 @@
        parameters.put("yearAndMonth",yearAndMonth);
        parameters.put("macs",macs);
        List<Map<String, Object>> datas = historyMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);

        //如果当前五分钟数据还没有插入，则提取前五分钟数据返回
        if(ObjectUtils.isEmpty(datas)){
            try {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                Date date = sdf.parse(time);
                date = DateUtil.rollMinute(date, -5);
                time = sdf.format(date);
                parameters.put("time",time);
                datas = historyMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
            } catch (ParseException e) {
                e.printStackTrace();
            }

        }
        datas = insertDeviceInfo(datas,devices);
        return new ResultBean<List<Map<String, Object>>>(datas);