Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airportline/add/AddAirportLineService.java

@@ -121,7 +121,7 @@ public class AddAirportLineService {
         //属性赋值
         AirportLine airportLine = new AirportLine();
         airportLine.setTenantId(tenantId);
-        airportLine.setInspectionLineId(id);
+        airportLine.setInspectionLineId(airlineFileId);
         airportLine.setAirportLineName(airportLineName);
         airportLine.setCreateTime(DateUtils.now());
         airportLine.setCreateUser(user.getId());

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

@@ -141,7 +141,7 @@ public class QueryVideoService {
         //url
 
         if (Objects.nonNull(dataObject)) {
-            log.info("获取的数据,dataObject={}", dataObject.toJSONString());
+//            log.info("获取的数据,dataObject={}", dataObject.toJSONString());
             String records = dataObject.get("records").toString();
             List<Airport> airportList = JSONObject.parseArray(records, Airport.class);
             //log.info("获取records中的数据为：airportList={}", airportList);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/QueryRecordIService.java

@@ -17,7 +17,7 @@ import java.util.Objects;
 @Slf4j
 @Service
 public class QueryRecordIService {
-    
+
     @Autowired
     @Qualifier("restTemplate")
     private RestTemplate restTemplate;