lizijie
2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a
Merge remote-tracking branch 'origin/dev' into dev
1 files modified
6 ■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java 6 ●●●● patch | view | raw | blame | history
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,7 +143,10 @@
            List<Map<String, Object>> timeSlots = new ArrayList<>();
            dto.setMac(key);
            //根据mac查询设备名称
            dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).getName());
            SpecialDevice specialDevice = specialDeviceService.getSpecialDeviceMapByMac(key);
            if(specialDevice==null)
                return;
            dto.setName(specialDevice.getName());
            //获取时间段与batch
            value.forEach(listValue -> {
                listValue.forEach((mKey, mValue) -> {