From 94171b34a3f10caca03968a436567e0424fa54b5 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 19 Oct 2020 14:59:29 +0800 Subject: [PATCH] 获取六参平均值接口返回数据添加经纬度和state --- src/main/java/com/moral/controller/WebController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java index 7b66415..60faef1 100644 --- a/src/main/java/com/moral/controller/WebController.java +++ b/src/main/java/com/moral/controller/WebController.java @@ -256,11 +256,35 @@ parameters.put("yearAndMonth",yearAndMonth); parameters.put("macs",macs); List<Map<String, Object>> datas = historyMinutelyService.getFiveMinutesDataByMacsAndTime(parameters); + datas = insertDeviceInfo(datas,devices); return new ResultBean<List<Map<String, Object>>>(datas); } /** + * @Description: ���������������������������������������state + * @Param: [datas, devices] + * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> + * @Author: ������������ + * @Date: 2020/10/19 + */ + public List<Map<String, Object>> insertDeviceInfo(List<Map<String, Object>> datas,List<Device> devices ){ + Map<String,Device> map = new HashMap<>(); + devices.forEach(p->{ + map.put(p.getMac(),p); + }); + + datas.forEach(p->{ + String mac = (String) p.get("mac"); + Device device = map.get(mac); + p.put("longitude",device.getLongitude()); + p.put("latitude",device.getLatitude()); + p.put("state",device.getState()); + }); + return datas; + } + + /** * @Description: ������������������������������������������������������������������������������ * @Param: [] * @return: java.lang.String -- Gitblit v1.8.0