Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

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

@@ -27,7 +27,7 @@ public class QueryInspectionByIdService {
     private InspectionMapper inspectionMapper;
 
     public JsonResult getInspectionInfo(String id) {
-        log.info("进入查询巡检任务信息业务");
+//        log.info("进入查询巡检任务信息业务");
         String tenantId = CurrentUserUtil.getTenantId();
         JsonResult result = this.check(tenantId, id);
         if (0 != result.getCode()) {

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java

@@ -60,9 +60,10 @@ public class UpdateFlightStatusService {
 
             return result;
         }
+        log.info("调用DSP开始录制, 返回：result={}", JacksonUtil.obj2StringPretty(result));
+
         JSONObject jsonObject = (JSONObject) result.getData();
         DspCallbackRecordVo vo = JSON.toJavaObject(jsonObject.getJSONObject("data"), DspCallbackRecordVo.class);
-        log.info("dsp响应体：{}", JacksonUtil.obj2StringPretty(vo));
 
         log.info("修改inspection status 开始");
         inspectionUpdate.setStatus(InspectionStatusEnum.IN_FLIGHT.getCode());
@@ -123,7 +124,7 @@ public class UpdateFlightStatusService {
         liveChannel.setAipullUrl("");
         liveChannel.setPushUrl(missionStatusRequest.getPushUrl());
         liveChannel.setPullUrl(missionStatusRequest.getPlayUrl());
-        liveChannel.setPlayUrl(missionStatusRequest.getPlayUrl());
+        liveChannel.setPlayUrl(missionStatusRequest.getPullUrl());
         return liveChannel;
     }
 

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

@@ -35,7 +35,7 @@ public class GetAirportDetailService {
         AirportDetailDto vo = new AirportDetailDto();
         JSONObject dataObject = (JSONObject) JSONObject.toJSON(jsonResult.getData());
 
-        log.info("响应信息:{}", dataObject.toJSONString());
+//        log.info("响应信息:{}", dataObject.toJSONString());
         JSONObject wthJson = dataObject.getJSONObject("WTH");
         if (Objects.nonNull(wthJson)) {
 //            log.info("参数信息:{}", wthJson.toJSONString());