Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/accident/ReversalFlightRequest.java

@@ -14,10 +14,6 @@ public class ReversalFlightRequest {
      */
     private Integer airportId;
 
-    /**
-     * 任务id
-     */
-    private Integer taskId;
 
     /**
      * 校验数字符

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

@@ -128,7 +128,7 @@ public class PointFlightService {
         inspection.setDeptId(user.getDeptId());
         inspection.setName("应急任务"+code);
         inspection.setType(1);
-        inspection.setStatus(TaskStatusEnum.INFLIGHT.getCode());
+        inspection.setStatus(TaskStatusEnum.INFLIGHT.getCode());// 设置应急任务状态为飞行中
         inspection.setRoadId("");
         inspection.setSectionId("");
         inspection.setInspectionType(2);

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

@@ -12,6 +12,7 @@ import com.tuoheng.admin.request.accident.ReversalFlightRequest;
 import com.tuoheng.common.core.config.common.CommonConfig;
 import com.tuoheng.common.core.exception.ServiceException;
 import com.tuoheng.common.core.utils.HttpUtils;
+import com.tuoheng.common.core.utils.JacksonUtil;
 import com.tuoheng.common.core.utils.JsonResult;
 import com.tuoheng.common.core.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -41,32 +42,29 @@ public class ReversalFlightService {
         if(null == request.getAirportId()){
            throw new ServiceException("机场id为空");
         }
-//        if(null == request.getTaskId()){
-//            throw new ServiceException("任务id为空");
-//        }
         //根据任务对应的机场查询对应任务id
-        Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
-                .eq(Inspection::getAirportId, request.getAirportId())
-                .eq(Inspection::getMark, MarkEnum.VALID.getCode())
-                .eq(Inspection::getStatus, InspectionStatusEnum.IN_FLIGHT.getCode()));
-        if(ObjectUtils.isNotEmpty(inspection)){
-            request.setTaskId(Integer.valueOf(inspection.getId()));
-        }
-        request.setTaskId(Integer.valueOf(inspection.getId()));
+//        Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
+//                .eq(Inspection::getAirportId, request.getAirportId())
+//                .eq(Inspection::getMark, MarkEnum.VALID.getCode())
+//                .eq(Inspection::getStatus, InspectionStatusEnum.IN_FLIGHT.getCode()));
         request.setZhilin("03");
         //调用机场平台让飞机返航
         String url = CommonConfig.airportURL + SystemConstant.API_AIRPORT_REVERSAL_FLIGH;
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("taskId",request.getTaskId());
         jsonObject.put("airportId",request.getAirportId());
         jsonObject.put("zhilin",request.getZhilin());
         log.info("调用机场平台，无人机执行定点飞行返航：url:{}",url);
-        log.info("调用机场平台，原无人机执行定点飞行，jsonObject:{}",jsonObject);
+        log.info("调用机场平台，原无人机执行定点飞行返航，jsonObject:{}",jsonObject);
 
         String airPortStr = HttpUtils.doSend(url, jsonObject, null, "POST");
         if (StringUtils.isEmpty(airPortStr)) {
-            log.info("原无人机执行定点飞行返航：机场接口返回数据为空，飞行失败，jsonObject：{}", jsonObject);
-            throw new ServiceException("机场接口返回数据为空，飞行失败");
+            log.info("原无人机执行定点飞行返航：机场接口返回数据为空，返航失败，jsonObject：{}", jsonObject);
+            throw new ServiceException("机场接口返回数据为空，返航失败");
+        }
+        JsonResult jsonResult = JacksonUtil.json2pojo(airPortStr, JsonResult.class);
+        if (0 != jsonResult.getCode()) {
+            log.info("调用机场平台，无人机执行定点飞行：返航失败，jsonResult：{}", jsonResult.getMsg());
+            throw new com.tuoheng.common.core.exception.ServiceException("机场平台返回，返航失败");
         }
 
         return JsonResult.success();