获取六参平均值接口返回数据添加经纬度和state

kaiyu

2020-10-19 94171b34a3f10caca03968a436567e0424fa54b5

获取六参平均值接口返回数据添加经纬度和state

 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