From 14477dce2a9ce46eece6f0b906bc3091dc31acf8 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 19 Oct 2020 16:15:51 +0800 Subject: [PATCH] 更新经纬度转换 --- src/main/java/com/moral/controller/WebController.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 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..ed62e69 100644 --- a/src/main/java/com/moral/controller/WebController.java +++ b/src/main/java/com/moral/controller/WebController.java @@ -256,11 +256,36 @@ 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); + List list = LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(), device.getLongitude()); + p.put("longitude",list.get(0)); + p.put("latitude",list.get(1)); + p.put("state",device.getState()); + }); + return datas; + } + + /** * @Description: ������������������������������������������������������������������������������ * @Param: [] * @return: java.lang.String -- Gitblit v1.8.0