| | |
| | | queryWrapper.between("batch", startDate, endDate); |
| | | //设置查询字段 |
| | | queryWrapper.select("DISTINCT batch"); |
| | | queryWrapper.orderByDesc("batch"); |
| | | //查询结果 |
| | | List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper); |
| | | //结果转为Date集合 |
| | |
| | | List<Map<String, Object>> timeSlots = new ArrayList<>(); |
| | | dto.setMac(key); |
| | | //根据mac查询设备名称 |
| | | dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).get("name")); |
| | | dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).getName()); |
| | | //获取时间段与batch |
| | | value.forEach(listValue -> { |
| | | listValue.forEach((mKey, mValue) -> { |
| | | Date slotStartDate = mValue.get(0).getTime(); |
| | | Date slotStartDate = mValue. get(0).getTime(); |
| | | Date slotEndDate = mValue.get(mValue.size() - 1).getTime(); |
| | | Map<String, Object> dateMap = new HashMap<>(); |
| | | dateMap.put("startTime", slotStartDate); |
| | |
| | | Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance)); |
| | | return Distance; |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | } |