kaiyu
2021-09-13 10d4b885a9b2af2a38bb03249d7547283f948197
screen-api
增加获取无人机数据接口
1 files added
6 files modified
279 ■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java 7 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UAVController.java 33 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVQueryTimeSlotDTO.java 3 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java 16 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java 9 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java 158 ●●●● patch | view | raw | blame | history
screen-common/src/main/java/com/moral/util/MathUtils.java 53 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -62,6 +62,13 @@
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }
    /**
    * @Description: 查询国控站接口
            * @Param: [regionCode]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/9/9
            */
    @GetMapping("queryStateControlStation")
    public ResultMessage queryStateControlStation(Integer regionCode) {
screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -36,20 +36,30 @@
public class UAVController {
    @Autowired
    HistorySecondUavMapper historySecondUavMapper;
    @Autowired
    HistorySecondUavService historySecondUavService;
    @Autowired
    HistorySecondUavMapper historySecondUavMapper;
    /**
    * @Description: 根据组织id,mac以及时间查询无人机数据
            * @Param: []
    * @Description: 根据批次号查询无人机飞行数据
            * @Param: [batch]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/8/31
            * @Date: 2021/9/13
            */
    @RequestMapping("query")
    public ResultMessage query(){
        List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(new QueryWrapper<>());
    @RequestMapping("queryDataByBatch")
    public ResultMessage queryDataByBatch(String batch){
        List<HistorySecondUav> historySecondUavs = historySecondUavService.queryDataByBatch(batch);
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),historySecondUavs);
    }
    @RequestMapping("test")
    public ResultMessage test(String batch){
        QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper();
        wrapper.select("value");
        wrapper.eq("batch", "2021-07-08 01:00:00");
        List<HistorySecondUav> datas = historySecondUavMapper.selectList(wrapper);
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),datas);
    }
@@ -71,6 +81,13 @@
    }
    /**
    * @Description: 查询某天组织无人机的飞行时间段
            * @Param: [form]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/9/13
            */
    @RequestMapping("queryTimeSlot")
    public ResultMessage queryTimeSlot(UAVQueryTimeSlotForm form){
        //判断是否缺少参数
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVQueryTimeSlotDTO.java
@@ -30,6 +30,7 @@
    * 无人机飞行时间段
    * map中开始时间的key为startTime
    * 结束时间的key为endTime
    * 批次号为batch
    * */
    private List<Map<String,Date>> timeSlot;
    private List<Map<String,Object>> timeSlot;
}
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
@@ -26,13 +26,17 @@
            vo.setMac(dto.getMac());
            vo.setName(dto.getName());
            List<Map<String,String>> timeSlotVo = new ArrayList<>();
            List<Map<String, Date>> timeSlot = dto.getTimeSlot();
            for (Map<String, Date> map : timeSlot) {
            List<Map<String, Object>> timeSlot = dto.getTimeSlot();
            for (Map<String, Object> map : timeSlot) {
                Map<String,String> newMap = new LinkedHashMap<>();
                map.forEach((key,value)->{
                    String dateStr = DateUtils.dateToDateString(value, "yyyy-MM-dd HH:mm:ss");
                    newMap.put(key,dateStr);
                });
                //转换开始时间
                Date startDate = (Date) map.get("startTime");
                newMap.put("startTime",DateUtils.dateToDateString(startDate, "yyyy-MM-dd HH:mm:ss"));
                //转换结束时间
                Date endDate = (Date) map.get("endTime");
                newMap.put("endTime",DateUtils.dateToDateString(endDate, "yyyy-MM-dd HH:mm:ss"));
                //存入batch批号
                newMap.put("batch", (String) map.get("batch"));
                timeSlotVo.add(newMap);
            }
            vo.setTimeSlot(timeSlotVo);
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
@@ -36,5 +36,14 @@
            */
    List<UAVQueryTimeSlotDTO> queryTimeSlot(UAVQueryTimeSlotForm form);
    /**
    * @Description: 根据批次号查询无人机数据
            * @Param: [batch]
            * @return: java.util.List<com.moral.api.entity.HistorySecondUav>
            * @Author: 陈凯裕
            * @Date: 2021/9/13
            */
    List<HistorySecondUav> queryDataByBatch(String batch);
}
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondUav;
import com.moral.api.entity.Organization;
@@ -11,9 +12,13 @@
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceService;
import com.moral.util.DateUtils;
import com.moral.util.GeodesyUtils;
import com.moral.util.MathUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Predicate;
@@ -27,6 +32,11 @@
 */
@Service
public class HistorySecondUavServiceImpl extends ServiceImpl<HistorySecondUavMapper, HistorySecondUav> implements HistorySecondUavService {
    /*
     * 筛选数据举例
     * */
    private Double filterDistance = 3d;
    @Autowired
    HistorySecondUavMapper historySecondUavMapper;
@@ -46,11 +56,11 @@
            childrenId.add(child.getId());
        }
        childrenId.add(organizationId);
        queryWrapper.in("organization_id",childrenId);
        queryWrapper.in("organization_id", childrenId);
        //设置查询时间范围为180天
        Date endDate = new Date();
        Date startDate = DateUtils.addDays(endDate, -180);
        queryWrapper.between("batch",startDate,endDate);
        queryWrapper.between("batch", startDate, endDate);
        //设置查询字段
        queryWrapper.select("DISTINCT batch");
        //查询结果
@@ -77,76 +87,164 @@
            childrenId.add(child.getId());
        }
        childrenId.add(organizationId);
        wrapper.in("organization_id",childrenId);
        wrapper.in("organization_id", childrenId);
        //查询根据batch查,因为可能会有跨天飞行的情况。
        wrapper.between("batch",startDate,endDate);
        wrapper.between("batch", startDate, endDate);
        //设置查询字段
        wrapper.select("mac,time,batch");
        //查询结果
        List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(wrapper);
        //根据batch进行分批
        Map<String,List<HistorySecondUav>> batchMap = new LinkedHashMap<>();//key为batch的string
        Map<String, List<HistorySecondUav>> batchMap = new LinkedHashMap<>();//key为batch的string
        for (HistorySecondUav historySecondUav : historySecondUavs) {
            //获取batch对应的数据集合
            List<HistorySecondUav> list = batchMap.get(historySecondUav.getBatch().toString());
            if(list!=null){
            List<HistorySecondUav> list = batchMap.get(DateUtils.dateToDateString(historySecondUav.getBatch(), "yyyy-MM-dd HH:mm:ss"));
            if (list != null) {
                list.add(historySecondUav);
            }else{
            } else {
                ArrayList<HistorySecondUav> newList = new ArrayList<>();
                newList.add(historySecondUav);
                batchMap.put(historySecondUav.getBatch().toString(),newList);
                batchMap.put(DateUtils.dateToDateString(historySecondUav.getBatch(), "yyyy-MM-dd HH:mm:ss"), newList);
            }
        }
        //去除少于30条数据的集合
        batchMap.values().removeIf(new Predicate<List<HistorySecondUav>>() {
            @Override
            public boolean test(List<HistorySecondUav> historySecondUavs) {
                if(historySecondUavs.size()<=30)
                if (historySecondUavs.size() <= 30)
                    return true;
                return false;
            }
        });
        //根据mac进行分类
        Map<String,List<Map<String,List<HistorySecondUav>>>> macBatchMap = new LinkedHashMap<>();//key为mac
        Map<String, List<Map<String, List<HistorySecondUav>>>> macBatchMap = new LinkedHashMap<>();//key为mac
        //遍历batchMap将mac提取出来,作为macBatchMap的key,batch和数据map的数据集合放入value
        batchMap.forEach((key,value)->{
        batchMap.forEach((key, value) -> {
            String mac = value.get(0).getMac();
            List<Map<String, List<HistorySecondUav>>> maps = macBatchMap.get(mac);
            if(maps!=null){
                Map<String,List<HistorySecondUav>> map = new LinkedHashMap<>();
                map.put(key,value);
            if (maps != null) {
                Map<String, List<HistorySecondUav>> map = new LinkedHashMap<>();
                map.put(key, value);
                maps.add(map);
            }else{
                List<Map<String,List<HistorySecondUav>>> list = new ArrayList<>();
                Map<String,List<HistorySecondUav>> map = new LinkedHashMap<>();
                map.put(key,value);
            } else {
                List<Map<String, List<HistorySecondUav>>> list = new ArrayList<>();
                Map<String, List<HistorySecondUav>> map = new LinkedHashMap<>();
                map.put(key, value);
                list.add(map);
                macBatchMap.put(value.get(0).getMac(),list);
                macBatchMap.put(value.get(0).getMac(), list);
            }
        });
        //封装返回数据
        List<UAVQueryTimeSlotDTO> dtos = new ArrayList<>();
        macBatchMap.forEach((key,value)->{
        macBatchMap.forEach((key, value) -> {
            UAVQueryTimeSlotDTO dto = new UAVQueryTimeSlotDTO();
            List<Map<String,Date>> timeSlots = new ArrayList<>();
            List<Map<String, Object>> timeSlots = new ArrayList<>();
            dto.setMac(key);
            //根据mac查询设备名称
            dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).get("name"));
            //获取时间段
            value.forEach(listValue->{
                listValue.forEach((mKey,mValue)->{
            //获取时间段与batch
            value.forEach(listValue -> {
                listValue.forEach((mKey, mValue) -> {
                    Date slotStartDate = mValue.get(0).getTime();
                    Date slotEndDate = mValue.get(mValue.size()-1).getTime();
                    Map<String,Date> dateMap = new HashMap<>();
                    dateMap.put("startTime",slotStartDate);
                    dateMap.put("endTime",slotEndDate);
                    Date slotEndDate = mValue.get(mValue.size() - 1).getTime();
                    Map<String, Object> dateMap = new HashMap<>();
                    dateMap.put("startTime", slotStartDate);
                    dateMap.put("endTime", slotEndDate);
                    dateMap.put("batch", mKey);
                    timeSlots.add(dateMap);
                });
            });
            dto.setTimeSlot(timeSlots);
            dtos.add(dto);
        });
      return dtos;
        return dtos;
    }
    @Override
    public List<HistorySecondUav> queryDataByBatch(String batch) {
        //batch转换类型
        Date batchDate = DateUtils.getDate(batch, "yyyy-MM-dd HH:mm:ss");
        //查询数据
        QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
        wrapper.eq("batch", batchDate);
        wrapper.select("value");
        List<HistorySecondUav> datas = historySecondUavMapper.selectList(wrapper);
        //获取无人机飞行高度最低值
        Double lowestHeight = 0d;
        for (HistorySecondUav data : datas) {
            String value = data.getValue();
            Map<String, Object> valueMap = JSON.parseObject(value, Map.class);
            //获取高度
            Double height = Double.valueOf((String) valueMap.get("flyhig"));
            if (height < lowestHeight)
                lowestHeight = height;
        }
        //获取最低点后,无人机所有飞行高度以最低点作为0点,所以无人机所有的高度全部加上最低点的绝对值。
        lowestHeight = Math.abs(lowestHeight);
        for (HistorySecondUav data : datas) {
            String value = data.getValue();
            Map<String, Object> valueMap = JSON.parseObject(value, Map.class);
            //获取高度
            Double height = Double.valueOf((String) valueMap.get("flyhig"));
            //加上最低点绝对值
            height = MathUtils.add(height, lowestHeight);
            //重新封装数据
            valueMap.put("flyhig", height);
            String newValue = JSON.toJSONString(valueMap);
            data.setValue(newValue);
        }
        //筛选无人机数据,保持每个点之间的举例在3米以上
        return filterDatas(datas);
    }
    private List<HistorySecondUav> filterDatas(List<HistorySecondUav> datas) {
        //创建返回结果
        List<HistorySecondUav> result = new ArrayList<>();
        //把第一个数据暂时作为对比数据
        HistorySecondUav tempData = datas.get(0);
        result.add(tempData);
        datas.remove(0);
        for (HistorySecondUav data : datas) {
            Double distance = getDistance(tempData, data);
            if(distance>filterDistance){
                result.add(data);
                tempData = data;
            }
        }
        return result;
    }
    /**
    * @Description: 获取两个数据之间的距离
            * @Param: [uav1, uav2]
            * @return: java.lang.Double
            * @Author: 陈凯裕
            * @Date: 2021/9/13
            */
    private Double getDistance(HistorySecondUav uav1 , HistorySecondUav uav2){
        String value1 = uav1.getValue();
        String value2 = uav2.getValue();
        Map<String,Object> value1Map = JSON.parseObject(value1,Map.class);
        Map<String,Object> value2Map = JSON.parseObject(value2,Map.class);
        //获取数据1的经纬度和高度
        Double longtitude1 = Double.valueOf((String)value1Map.get("flylon"));
        Double latitude1 = Double.valueOf((String)value1Map.get("flylat"));
        BigDecimal c1 = (BigDecimal)value1Map.get("flyhig");
        double height1 = c1.doubleValue();
        //获取数据2的经纬度和高度
        Double longtitude2 = Double.valueOf((String)value2Map.get("flylon"));
        Double latitude2 = Double.valueOf((String)value2Map.get("flylat"));
        BigDecimal c2 = (BigDecimal)value2Map.get("flyhig");
        double height2 = c2.doubleValue();
        //计算经纬度之间的平面距离
        Double planDistance = GeodesyUtils.getDistance(latitude1, longtitude1, latitude2, longtitude2);
        //根据直角三角形特性用勾股定理计算空间距离
        Double heightDsitance = Math.abs(MathUtils.sub(height2,height1));
        Double Distance = Math.sqrt(MathUtils.mul(planDistance,planDistance)+MathUtils.mul(heightDsitance,heightDsitance));
        return Distance;
    }
}
screen-common/src/main/java/com/moral/util/MathUtils.java
New file
@@ -0,0 +1,53 @@
package com.moral.util;
import java.math.BigDecimal;
/**
 * @ClassName MathUtils
 * @Description 运算工具类
 * @Author 陈凯裕
 * @Date 2021/9/13 9:54
 * @Version TODO
 **/
public class MathUtils {
    /**
     * @Description: 计算double类型加法
     * @Param: [v1, v2]
     * @return: double
     * @Author: 陈凯裕
     * @Date: 2021/9/13
     */
    public static double add(double v1, double v2) {
        BigDecimal b1 = new BigDecimal(Double.toString(v1));
        BigDecimal b2 = new BigDecimal(Double.toString(v2));
        return b1.add(b2).doubleValue();
    }
    /**
     * @Description: 计算double类型减法
     * @Param: [v1, v2]
     * @return: double
     * @Author: 陈凯裕
     * @Date: 2021/9/13
     */
    public static double sub(double v1, double v2) {
        BigDecimal b1 = new BigDecimal(Double.toString(v1));
        BigDecimal b2 = new BigDecimal(Double.toString(v2));
        return b1.subtract(b2).doubleValue();
    }
    /**
     * @Description: 计算double类型乘法
     * @Param: [v1, v2]
     * @return: double
     * @Author: 陈凯裕
     * @Date: 2021/9/13
     */
    public static double mul(double v1, double v2) {
        BigDecimal b1 = new BigDecimal(Double.toString(v1));
        BigDecimal b2 = new BigDecimal(Double.toString(v2));
        return b1.multiply(b2).doubleValue();
    }
}