From b7f5fd4000d644d117a0936dbcc2bfc56bfab4f0 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:08:11 +0800
Subject: [PATCH] 新建特殊设备DTO类,存放保存到redis的数据

---
 screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 5cbea96..145895d 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -142,11 +142,11 @@
             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);
@@ -244,8 +244,5 @@
         Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance));
         return Distance;
     }
-
-
-
 
 }

--
Gitblit v1.8.0