| | |
| | | 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; |
| | |
| | | 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); |
| | | |