cjl
2023-07-28 6fe3e9841f25481cf78bd1f102886d4ce35e9e17
Merge remote-tracking branch 'origin/qa' into qa

# Conflicts:
# screen-api/src/main/java/com/moral/api/controller/UAVController.java
1 files modified
10 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/UAVController.java 10 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -86,6 +86,16 @@
        ArrayList<Double> flyLatList = new ArrayList<>();
        //经度
        ArrayList<Double> flyLonList = new ArrayList<>();
//        String mac ="p5dnd7a0243591";
//        String time1 ="2023-07-19 14:14:08";
//        String time2 ="2023-07-19 14:35:29";
//
////        List<UAVResultDTO> uavResultDTOS = historySecondUavMapper.reList(map);
//        QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
//        queryWrapper.select("value");
//        queryWrapper.eq("mac",mac);
//        queryWrapper.between("time",time1,time2);
//        List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
        List<HistorySecondUav> historySecondUavs = historySecondUavMapper.reList(params);
        if (ObjectUtils.isEmpty(historySecondUavs)){
            return new ResultMessage(ResponseCodeEnum.TARGET_IS_NULL,"null");