screen-api 修改获取特殊设备逻辑

kaiyu

2021-09-14 3604b90f27205b63b559502fb181ce150c2d9a5d

screen-api
               修改获取特殊设备逻辑

 screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java

@@ -29,7 +29,7 @@
            * @Author: 陈凯裕
            * @Date: 2021/9/8
            */
    Map<String,Object> getSpecialDeviceMapByMac(String mac);
    SpecialDevice getSpecialDeviceMapByMac(String mac);

    /**
    * @Description: 根据mac号获取无人机对象

 screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java

@@ -142,7 +142,7 @@
            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) -> {
@@ -244,8 +244,5 @@
        Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance));
        return Distance;
    }




}

 screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java

@@ -98,10 +98,12 @@
    }

    @Override
    public Map<String,Object> getSpecialDeviceMapByMac(String mac) {
    public SpecialDevice getSpecialDeviceMapByMac(String mac) {
        //从缓存中获取
        Map<String,Object> specialDeviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE,mac);
       return specialDeviceMap;
        QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
        wrapper.eq("mac",mac);
        wrapper.eq("is_delete",Constants.NOT_DELETE);
       return specialDeviceMapper.selectOne(wrapper);
    }

    @Override