Explorar el Código

Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tags/V1.0.1
chengwang hace 1 año
padre
commit
959b665403
Se han modificado 3 ficheros con 7 adiciones y 0 borrados
  1. +1
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/flyer/OnlineIdentifService.java
  2. +1
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java
  3. +5
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/StartAIService.java

+ 1
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/flyer/OnlineIdentifService.java Ver fichero

paramMap.put("serviceInstReqList", reqMapList); paramMap.put("serviceInstReqList", reqMapList);


log.info(String.format("DSP入参:%s", paramMap)); log.info(String.format("DSP入参:%s", paramMap));

log.info("发起DSP服务调用网络请求"); log.info("发起DSP服务调用网络请求");
HttpEntity<Map<String, Object>> httpEntity = new HttpEntity<>(paramMap); HttpEntity<Map<String, Object>> httpEntity = new HttpEntity<>(paramMap);
ResponseEntity<JsonResult<DspCallbackVo>> response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, new ParameterizedTypeReference<JsonResult<DspCallbackVo>>() { ResponseEntity<JsonResult<DspCallbackVo>> response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, new ParameterizedTypeReference<JsonResult<DspCallbackVo>>() {

+ 1
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java Ver fichero

liveChannel.setPullUrl(dspCallbackVo.getPlayUrl()); liveChannel.setPullUrl(dspCallbackVo.getPlayUrl());
liveChannel.setAipushUrl(dspCallbackVo.getAipushUrl()); liveChannel.setAipushUrl(dspCallbackVo.getAipushUrl());
liveChannel.setAipullUrl(dspCallbackVo.getAiplayUrl()); liveChannel.setAipullUrl(dspCallbackVo.getAiplayUrl());
liveChannel.setPlayUrl(dspCallbackVo.getPlayUrl());
return liveChannel; return liveChannel;
} }



+ 5
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/StartAIService.java Ver fichero

instReqUrlPull.put("evalue", missionStatusRequest.getPullUrl()); instReqUrlPull.put("evalue", missionStatusRequest.getPullUrl());
reqList.add(instReqUrlPull); reqList.add(instReqUrlPull);


JSONObject instPlayUrl = new JSONObject();
instPlayUrl.put("ename", "play_url");
instPlayUrl.put("evalue", missionStatusRequest.getPlayUrl());
reqList.add(instPlayUrl);

request.put("serviceInstReqList", reqList); request.put("serviceInstReqList", reqList);
JSONObject responseJson = this.serviceInstApplication(request, dspServiceInstId); JSONObject responseJson = this.serviceInstApplication(request, dspServiceInstId);
if (responseJson.getIntValue("code") == 0) { if (responseJson.getIntValue("code") == 0) {

Cargando…
Cancelar
Guardar