Browse Source

Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

pull/101/head
wanjing 10 months ago
parent
commit
5ca61981ac
3 changed files with 5 additions and 4 deletions
  1. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionByIdService.java
  2. +3
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java
  3. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/GetAirportDetailService.java

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionByIdService.java View File

private InspectionMapper inspectionMapper; private InspectionMapper inspectionMapper;


public JsonResult getInspectionInfo(String id) { public JsonResult getInspectionInfo(String id) {
log.info("进入查询巡检任务信息业务");
// log.info("进入查询巡检任务信息业务");
String tenantId = CurrentUserUtil.getTenantId(); String tenantId = CurrentUserUtil.getTenantId();
JsonResult result = this.check(tenantId, id); JsonResult result = this.check(tenantId, id);
if (0 != result.getCode()) { if (0 != result.getCode()) {

+ 3
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java View File



return result; return result;
} }
log.info("调用DSP开始录制, 返回:result={}", JacksonUtil.obj2StringPretty(result));

JSONObject jsonObject = (JSONObject) result.getData(); JSONObject jsonObject = (JSONObject) result.getData();
DspCallbackRecordVo vo = JSON.toJavaObject(jsonObject.getJSONObject("data"), DspCallbackRecordVo.class); DspCallbackRecordVo vo = JSON.toJavaObject(jsonObject.getJSONObject("data"), DspCallbackRecordVo.class);
log.info("dsp响应体:{}", JacksonUtil.obj2StringPretty(vo));


log.info("修改inspection status 开始"); log.info("修改inspection status 开始");
inspectionUpdate.setStatus(InspectionStatusEnum.IN_FLIGHT.getCode()); inspectionUpdate.setStatus(InspectionStatusEnum.IN_FLIGHT.getCode());
liveChannel.setAipullUrl(""); liveChannel.setAipullUrl("");
liveChannel.setPushUrl(missionStatusRequest.getPushUrl()); liveChannel.setPushUrl(missionStatusRequest.getPushUrl());
liveChannel.setPullUrl(missionStatusRequest.getPlayUrl()); liveChannel.setPullUrl(missionStatusRequest.getPlayUrl());
liveChannel.setPlayUrl(missionStatusRequest.getPlayUrl());
liveChannel.setPlayUrl(missionStatusRequest.getPullUrl());
return liveChannel; return liveChannel;
} }



+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/GetAirportDetailService.java View File

AirportDetailDto vo = new AirportDetailDto(); AirportDetailDto vo = new AirportDetailDto();
JSONObject dataObject = (JSONObject) JSONObject.toJSON(jsonResult.getData()); JSONObject dataObject = (JSONObject) JSONObject.toJSON(jsonResult.getData());


log.info("响应信息:{}", dataObject.toJSONString());
// log.info("响应信息:{}", dataObject.toJSONString());
JSONObject wthJson = dataObject.getJSONObject("WTH"); JSONObject wthJson = dataObject.getJSONObject("WTH");
if (Objects.nonNull(wthJson)) { if (Objects.nonNull(wthJson)) {
// log.info("参数信息:{}", wthJson.toJSONString()); // log.info("参数信息:{}", wthJson.toJSONString());

Loading…
Cancel
Save