Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airportline/query/inspection/QueryAirportLineByAirportService.java

@@ -6,6 +6,7 @@ import com.tuoheng.admin.constant.SystemConstant;
 import com.tuoheng.admin.entity.domain.Inspection;
 import com.tuoheng.admin.entity.vo.airport.AirPortLineLocationVo;
 import com.tuoheng.admin.entity.vo.airport.AirPortStatusVO;
+import com.tuoheng.admin.enums.InspectionTypeEnum;
 import com.tuoheng.common.core.config.common.CommonConfig;
 import com.tuoheng.common.core.exception.ServiceException;
 import com.tuoheng.common.core.utils.HttpUtils;
@@ -35,6 +36,9 @@ public class QueryAirportLineByAirportService {
      */
     public JsonResult getAirportLineList(Inspection inspection) {
         log.info("进入根据任务ID获取航线，从机场平台获取");
+        if(inspection.getInspectionType() == InspectionTypeEnum.MABNNEDFLIGHT.getCode()){
+            return JsonResult.success("飞行任务没有航线");
+        }
         Integer inspectionLine = inspection.getInspectionLine();
         JsonResult result = this.checkParam(inspectionLine);
         if (0 != result.getCode()) {