Browse Source

重构机场平台回调接口

tags/v1.0.0^2
wanjing 1 year ago
parent
commit
f6cd3ac5ae
3 changed files with 19 additions and 7 deletions
  1. +1
    -4
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/callback/AirPortCallbackController.java
  2. +14
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateFlightStatusService.java
  3. +4
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateInspectionStatusService.java

+ 1
- 4
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/callback/AirPortCallbackController.java View File

import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.tuoheng.admin.request.inspection.InspectionRequest; import com.tuoheng.admin.request.inspection.InspectionRequest;
import com.tuoheng.admin.request.inspection.MissionStatusRequest; import com.tuoheng.admin.request.inspection.MissionStatusRequest;
import com.tuoheng.admin.service.airport.AirportService;
import com.tuoheng.admin.service.inspection.IInspectionService; import com.tuoheng.admin.service.inspection.IInspectionService;
import com.tuoheng.common.core.common.OperationEnum; import com.tuoheng.common.core.common.OperationEnum;
import com.tuoheng.common.core.utils.JsonResult; import com.tuoheng.common.core.utils.JsonResult;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/airport/callback")
@RequestMapping("/airport/inspection")
public class AirPortCallbackController { public class AirPortCallbackController {


@Autowired @Autowired
return iInspectionService.updateStatus(missionStatusRequest); return iInspectionService.updateStatus(missionStatusRequest);
} }



/** /**
* 被硬件调用,存飞行轨迹 * 被硬件调用,存飞行轨迹
*/ */
return iInspectionService.track(inspectionRequest); return iInspectionService.track(inspectionRequest);
} }



} }

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

return JsonResult.success(); return JsonResult.success();
} }


/**
* 调用DSP接口
*
* @param missionStatusRequest
* @return
*/
private JsonResult startAI(MissionStatusRequest missionStatusRequest) { private JsonResult startAI(MissionStatusRequest missionStatusRequest) {
//调用DSP接口
log.info("进入调用DSP接口方法");
JSONObject request = new JSONObject(); JSONObject request = new JSONObject();
JSONArray configList = new JSONArray(); JSONArray configList = new JSONArray();
JSONObject instConfigMode = new JSONObject(); JSONObject instConfigMode = new JSONObject();
if (responseJson.getIntValue("code") == 0) { if (responseJson.getIntValue("code") == 0) {
String requestId = responseJson.getJSONObject("data").getString("requestId"); String requestId = responseJson.getJSONObject("data").getString("requestId");
log.info("dsp实时调用响应requestId:{}", requestId); log.info("dsp实时调用响应requestId:{}", requestId);

} else { } else {
log.error("dsp实时调用失败:{}", responseJson); log.error("dsp实时调用失败:{}", responseJson);
return JsonResult.error(EditInspectionStatusCodeEnum.TASK_ANALYSIS_FAILED.getCode(), EditInspectionStatusCodeEnum.TASK_ANALYSIS_FAILED.getMsg()); return JsonResult.error(EditInspectionStatusCodeEnum.TASK_ANALYSIS_FAILED.getCode(), EditInspectionStatusCodeEnum.TASK_ANALYSIS_FAILED.getMsg());
return JsonResult.success(responseJson); return JsonResult.success(responseJson);
} }


/**
* 处理通道数据
*
* @param inspection
* @param dspCallbackVo
*/
private void liveChannelHandle(Inspection inspection, DspCallbackVo dspCallbackVo) { private void liveChannelHandle(Inspection inspection, DspCallbackVo dspCallbackVo) {
log.info("进入处理通道数据方法");
// 通道表新增 // 通道表新增
LiveChannel liveChannel = this.buildLiveChannel(inspection, dspCallbackVo); LiveChannel liveChannel = this.buildLiveChannel(inspection, dspCallbackVo);
// 查验是否存在 // 查验是否存在

+ 4
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateInspectionStatusService.java View File

* @return * @return
*/ */
public JsonResult updateStatus(MissionStatusRequest missionStatusRequest) { public JsonResult updateStatus(MissionStatusRequest missionStatusRequest) {
log.info("进入修改任务状态业务接口");
log.info("进入修改任务状态业务接口, missionStatusRequest:{}", missionStatusRequest);
String tenantId = CurrentUserUtil.getTenantId(); String tenantId = CurrentUserUtil.getTenantId();
JsonResult result = this.check(tenantId, missionStatusRequest); JsonResult result = this.check(tenantId, missionStatusRequest);
if (0 != result.getCode()) { if (0 != result.getCode()) {
Inspection inspection = (Inspection) result.getData(); Inspection inspection = (Inspection) result.getData();


if (AirPortTaskStatusEnum.FLIGHT.getCode() != missionStatusRequest.getStatus() && AirPortTaskStatusEnum.WAIT.getCode() == missionStatusRequest.getStatus()) { if (AirPortTaskStatusEnum.FLIGHT.getCode() != missionStatusRequest.getStatus() && AirPortTaskStatusEnum.WAIT.getCode() == missionStatusRequest.getStatus()) {
log.info("修改任务状态业务接口:飞行状态出错!");
return JsonResult.error(EditInspectionStatusCodeEnum.TASK_NOT_STATUS.getCode(), EditInspectionStatusCodeEnum.TASK_NOT_STATUS.getMsg()); return JsonResult.error(EditInspectionStatusCodeEnum.TASK_NOT_STATUS.getCode(), EditInspectionStatusCodeEnum.TASK_NOT_STATUS.getMsg());
} }


if (AirPortTaskStatusEnum.FLIGHT.getCode() == missionStatusRequest.getStatus()) { if (AirPortTaskStatusEnum.FLIGHT.getCode() == missionStatusRequest.getStatus()) {
log.info("修改任务状态业务接口:修改执行中状态");
updateFlightStatusService.updateFlightStatus(inspection, missionStatusRequest); updateFlightStatusService.updateFlightStatus(inspection, missionStatusRequest);
} else if (AirPortTaskStatusEnum.WAIT.getCode() == missionStatusRequest.getStatus()) { } else if (AirPortTaskStatusEnum.WAIT.getCode() == missionStatusRequest.getStatus()) {
log.info("修改任务状态业务接口:修改待执行状态");
updateWaittStatusService.updateWaittStatus(inspection); updateWaittStatusService.updateWaittStatus(inspection);
} }



Loading…
Cancel
Save