From 1d42a3d92d35a0cedb45cbd926cbac0c0067d52b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 16 Sep 2021 08:49:51 +0800
Subject: [PATCH] screen-api 修改判断无人机名称bug
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 7b85f26..df440a9 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������������������
+ SpecialDevice specialDevice = specialDeviceService.getSpecialDeviceMapByMac(key);
+ if(specialDevice==null)
+ return;
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);
--
Gitblit v1.8.0