Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/syncdata/SyncAirDataService.java

@@ -2,6 +2,7 @@ package com.tuoheng.admin.service.airData.syncdata;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tuoheng.admin.entity.domain.AirData;
 import com.tuoheng.admin.entity.domain.Inspection;
 import com.tuoheng.admin.entity.request.inspection.AirportLineRequest;
@@ -143,11 +144,15 @@ public class SyncAirDataService {
     }
 
     private Inspection getInspection(String serial) {
-        Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
+        Inspection inspection = inspectionMapper.selectOne(Wrappers.<Inspection>lambdaQuery()
+                .eq(Inspection::getMark, 1)
                 .eq(Inspection::getEquipmentMountCode, serial)
-                .eq(Inspection::getStatus, InspectionStatusEnum.IN_FLIGHT.getCode())
-                .eq(Inspection::getMark, MarkEnum.VALID.getCode())
-                .orderByDesc(Inspection::getCreateTime));
+                .eq(Inspection::getStatus, 10));
+//        Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
+//                .eq(Inspection::getEquipmentMountCode, serial)
+//                .eq(Inspection::getStatus, InspectionStatusEnum.IN_FLIGHT.getCode())
+//                .eq(Inspection::getMark, MarkEnum.VALID.getCode())
+//                .orderByDesc(Inspection::getCreateTime));
         if (ObjectUtil.isNull(inspection)) {
             return null;
         }