Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

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

@@ -97,8 +97,13 @@ public class QueryInspectionAndAirportStatusService {
         }
         //String---> JsonResult
         JsonResult jsonResult = JacksonUtil.json2pojo(airPortStatusStr, JsonResult.class);
-        List<AirPortStatusVO> airPortStatusVOList = (List<AirPortStatusVO>) jsonResult.getData();
-//        List<AirPortStatusVO> airPortStatusVOList = com.alibaba.fastjson.JSONObject.parseArray(JSONObject.toJSONString(jsonResult.getData()), AirPortStatusVO.class);
+        if(ObjectUtil.isEmpty(jsonResult) || !ObjectUtil.isEmpty(Objects.requireNonNull(jsonResult).getData()) && jsonResult.getCode() != 0){
+            log.info("获取机场列表为空");
+            return null;
+        }
+
+        //List<AirPortStatusVO> airPortStatusVOList = (List<AirPortStatusVO>) jsonResult.getData();
+        List<AirPortStatusVO> airPortStatusVOList = com.alibaba.fastjson.JSONObject.parseArray(JSONObject.toJSONString(jsonResult.getData()), AirPortStatusVO.class);
         Map<Integer,AirPortStatusVO> map = new HashMap<>();
         for (AirPortStatusVO airPortStatusVO : airPortStatusVOList) {
             map.put(airPortStatusVO.getAirportId(),airPortStatusVO);