From aedd183d6fc62fa5a7c91a4f64829b572faf0760 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 16 Sep 2021 08:50:47 +0800
Subject: [PATCH] screen-api 修改获取特殊设备名称代码
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 11 ++++++-----
1 files changed, 6 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..86c5e57 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondUav;
import com.moral.api.entity.Organization;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.HistorySecondUavMapper;
import com.moral.api.pojo.dto.uav.UAVQueryTimeSlotDTO;
import com.moral.api.pojo.form.uav.UAVQueryTimeSlotForm;
@@ -142,11 +143,14 @@
List<Map<String, Object>> timeSlots = new ArrayList<>();
dto.setMac(key);
//������mac������������������
- dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).get("name"));
+ SpecialDevice specialDevice = specialDeviceService.getSpecialDeviceMapByMac(key);
+ if(specialDevice==null)
+ return;
+ dto.setName(specialDevice.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 +248,5 @@
Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance));
return Distance;
}
-
-
-
}
--
Gitblit v1.8.0