Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ThInspectionServiceImpl.java

@@ -161,20 +161,10 @@ public class ThInspectionServiceImpl extends BaseServiceImpl<ThInspectionMapper,
             return JsonResult.error("机场接口返回数据为空");
         }
         JsonResult jsonResult = JacksonUtil.json2pojo(airPortStr, JsonResult.class);
-        if (ObjectUtil.isEmpty(jsonResult) || (!ObjectUtil.isEmpty(Objects.requireNonNull(jsonResult).getData()) && jsonResult.getCode() != 0)) {
-            assert jsonResult != null;
-            return JsonResult.error(JSONObject.parseArray(JSONObject.parseObject(JSONObject.toJSONString(jsonResult.getData())).get("data").toString(), AirExecuteTaskVO.class), "执行任务失败！");
-        } else if (ObjectUtil.isEmpty(jsonResult.getData()) && jsonResult.getCode() != 0) {
+        if (jsonResult.getCode() != 0) {
             return JsonResult.error(jsonResult.getMsg());
-        } else {
-            ThMission thMissionUpdate = new ThMission(UpdateOrCreateEnum.UPDATE.getCode());
-            thMissionUpdate.setId(Integer.parseInt(missionId));
-            //修改执行时间为当前
-            thMissionUpdate.setExecutionStartTime(new Date());
-            missionMapper.updateById(thMissionUpdate);
-            //返回执行结果
-            return JsonResult.success(jsonResult.getMsg());
         }
+        return JsonResult.success();
     }
 
     @Override

tuoheng-admin/src/main/java/com/tuoheng/admin/task/ScheduledTask.java

@@ -56,13 +56,14 @@ public class ScheduledTask {
                 log.info("执行定时执行飞行任务:" + thMission.getId());
                 JsonResult jsonResult = inspectionService.executeTask(String.valueOf(thMission.getId()), null);
                 log.info("执行定时执行飞行任务result:" + jsonResult);
-                thMission.setExecutionStatus(2);
 
                 ThMission thMissionUpdate = new ThMission(UpdateOrCreateEnum.UPDATE.getCode());
                 thMissionUpdate.setId(thMission.getId());
                 thMissionUpdate.setExecutionStatus(2);
-                if(jsonResult.getCode()!=0 && ObjectUtil.isEmpty(jsonResult.getData())){
-                    thMission.setStatus(TaskStatusEnum.FAIL.getCode());
+
+                if(jsonResult.getCode()!=0){
+                    log.error("执行定时执行机场起飞失败" + thMission.getId());
+                    thMissionUpdate.setStatus(TaskStatusEnum.FAIL.getCode());
                 }
                 missionMapper.updateById(thMissionUpdate);
             }