Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/GetDroneDataByIdService.java

@@ -73,20 +73,9 @@ public class GetDroneDataByIdService {
         droneDataVo.setInspectionId(flightData.getInspectionId());
         droneDataVo.setUavPower(79 + "%");
         droneDataVo.setRange(6 + "km");
-        double dist = Integer.valueOf(flightData.getDistHome())/1000d;
-        droneDataVo.setTargetLocation(dist+ "km");
+        //距离机场的距离
+        droneDataVo.setTargetLocation(0 + "km");
         droneDataVo.setYsingal(flightData.getYsingal() + "%");
-//        List<DroneDataVo> droneDataVoList = new ArrayList<>();
-//        for (FlightData flightData2 : flightDataList) {
-//            DroneDataVo droneDataVo = new DroneDataVo();
-//            droneDataVo.setInspectionId(flightData.getInspectionId());
-//            droneDataVo.setUavPower(79 + "%");
-//            droneDataVo.setRange(6 + "km");
-//            double dist = Integer.valueOf(flightData.getDistHome())/1000d;
-//            droneDataVo.setTargetLocation(dist+ "km");
-//            droneDataVo.setYsingal(flightData.getYsingal() + "%");
-//            droneDataVoList.add(droneDataVo);
-//        }
 
         return JsonResult.success(droneDataVo);
     }