forked from uav/ard-uav-server
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -191,7 +191,7 @@ } if (waylineJobOpt.isEmpty()) { return ResponseResult.error(314013000,"创建机场任务失败！"); return ResponseResult.error(314013000, "创建机场任务失败！"); } WaylineJobDTO waylineJob = waylineJobOpt.get(); @@ -209,7 +209,7 @@ // 换航线表 ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId()); if (ardRouteOpt == null || ardRouteOpt.getPath() == null || ardRouteOpt.getPath().isEmpty()) { return ResponseResult.error(314013001,"机场任务航线不存在！"); return ResponseResult.error(314013001, "机场任务航线不存在！"); } // get file url @@ -217,7 +217,7 @@ URL url = null; String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath()); String md5 = ""; String httpUrl=""; String httpUrl = ""; try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) { md5 = DigestUtils.md5Hex(inputStream); url = new URL(ardRouteOpt.getPath()); @@ -227,7 +227,7 @@ log.info("机场任务航线文件md5值：{}", md5); } catch (Exception e) { log.error("机场任务航线文件地址错误！{}", e.getMessage()); return ResponseResult.error(314013002,"机场任务航线文件地址错误！" + e.getMessage()); return ResponseResult.error(314013002, "机场任务航线文件地址错误！" + e.getMessage()); } log.info("机场任务-rth_mode的值：{}", waylineJob.getRthMode()); @@ -266,11 +266,10 @@ .build(); // 下发参数打印 try{ try { String json = objectMapper.writeValueAsString(response); log.info("机场下发航线任务的参数response：{}", json); } catch (Exception e){ } catch (Exception e) { log.error("机场下发航线任务的参数response异常：{}", e.getMessage()); } @@ -301,7 +300,7 @@ if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) { boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(), waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(), waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); if (!isAdd) { return ResponseResult.error("无法创建计划作业。"); @@ -311,10 +310,10 @@ return ResponseResult.success(); } public ResponseResult publishFlightTaskPrepare(Optional<WaylineJobDTO> waylineJobOpt) throws SQLException{ public ResponseResult publishFlightTaskPrepare(Optional<WaylineJobDTO> waylineJobOpt) throws SQLException { if (waylineJobOpt.isEmpty()) { return ResponseResult.error(314013000,"创建机场任务失败！"); return ResponseResult.error(314013000, "创建机场任务失败！"); } WaylineJobDTO waylineJob = waylineJobOpt.get(); boolean isOnline = deviceService.checkDeviceOnline(waylineJob.getDockSn()); @@ -324,13 +323,13 @@ // 换航线表 ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId()); if (ardRouteOpt == null || ardRouteOpt.getPath() == null || ardRouteOpt.getPath().isEmpty()) { return ResponseResult.error(314013001,"机场任务航线不存在！"); return ResponseResult.error(314013001, "机场任务航线不存在！"); } // get file url URL url = null; String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath()); String md5 = ""; String httpUrl=""; String httpUrl = ""; try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) { md5 = DigestUtils.md5Hex(inputStream); url = new URL(ardRouteOpt.getPath()); @@ -340,7 +339,7 @@ log.info("机场任务航线文件md5值：{}", md5); } catch (Exception e) { log.error("机场任务航线文件地址错误！{}", e.getMessage()); return ResponseResult.error(314013002,"机场任务航线文件地址错误！" + e.getMessage()); return ResponseResult.error(314013002, "机场任务航线文件地址错误！" + e.getMessage()); } WaylineTaskCreateDTO flightTask = WaylineTaskCreateDTO.builder() @@ -364,12 +363,11 @@ .build(); // 下发参数打印 try{ try { String json = objectMapper.writeValueAsString(flightTask); log.info("机场下发航线任务的参数flightTask：{}", json); } catch (Exception e){ log.error("机场下发航线任务的参数flightTask异常：{}", e.getMessage()); log.info("机场下发循环任务子任务-定时任务的航线任务的参数flightTask：{}", json); } catch (Exception e) { log.error("机场下发循环任务子任务-定时任务的航线任务的参数flightTask异常：{}", e.getMessage()); } String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + @@ -384,9 +382,9 @@ ServiceReply serviceReply = messageSender.publishWithReply(topic, response); log.info("下发任务结果： {}", serviceReply.getResult()); log.info("机场任务航线文件url地址：{}", httpUrl); log.info("机场任务航线文件md5值：{}", md5); log.info("下发循环任务子任务-定时任务的结果： {}", serviceReply.getResult()); log.info("机场循环任务子任务-定时任务的航线文件url地址：{}", httpUrl); log.info("机场循环任务子任务-定时任务的航线文件md5值：{}", md5); if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) { String errorMsg = CommonErrorEnum.getMsgByCode(serviceReply.getResult()); @@ -403,15 +401,15 @@ // 飞行命令先注释掉 // Issue an immediate task execution command. if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) { if (!executeFlightTask(waylineJob.getJobId())) { return ResponseResult.error("无法执行作业。"); } } // if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) { // if (!executeFlightTask(waylineJob.getJobId())) { // return ResponseResult.error("无法执行作业。"); // } // } if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) { boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(), waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(), waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); if (!isAdd) { return ResponseResult.error("无法创建计划作业。"); @@ -457,11 +455,10 @@ .build(); // 下发参数打印 try{ try { String json = objectMapper.writeValueAsString(response); log.info("机场下发-执行飞行任务-的参数response：{}", json); } catch (Exception e){ } catch (Exception e) { log.error("机场下发-执行飞行任务-的参数response异常：{}", e.getMessage()); } @@ -500,7 +497,9 @@ */ @Override public ResponseResult cancelFlightTask(Collection<String> jobIds) { List<WaylineJobDTO> waylineJobs = getJobsByConditions(jobIds, WaylineJobStatusEnum.PENDING); // List<WaylineJobDTO> waylineJobs = getJobsByConditions(jobIds, WaylineJobStatusEnum.PENDING); List<WaylineJobDTO> waylineJobs = getJobsByConditions(jobIds, WaylineJobStatusEnum.IN_PROGRESS); // ResponseResult.error(errorCode, CommonErrorEnum.getMsgByCode(errorCode))); // Set<String> waylineJobIds = waylineJobs.stream().map(WaylineJobDTO::getJobId).collect(Collectors.toSet()); // // Check if the task status is correct. @@ -516,12 +515,12 @@ .collect(Collectors.groupingBy(WaylineJobDTO::getDockSn, Collectors.mapping(WaylineJobDTO::getJobId, Collectors.toList()))); // dockJobs.forEach((dockSn, idList) -> this.publishCancelTask(dockSn, idList)); for(Map.Entry<String, List<String>> entry : dockJobs.entrySet()) { for (Map.Entry<String, List<String>> entry : dockJobs.entrySet()) { String docksn = entry.getKey(); List<String> jobIdList = entry.getValue(); ResponseResult r = publishCancelTask(docksn, jobIdList); String a = r.getMessage(); return r ; ResponseResult r = publishCancelTask(docksn, jobIdList); String a = r.getMessage(); return r; } return ResponseResult.success(); @@ -600,7 +599,7 @@ */ @Override public ResponseResult publishCancelTask(String dockSn, List<String> jobIds) { for(String jobId : jobIds) { for (String jobId : jobIds) { Optional<WaylineJobDTO> waylineJobDTO = this.getJobByJobId(jobId); if (waylineJobDTO.isEmpty()) { return ResponseResult.error("任务不存在，jobId: " + jobId); @@ -674,6 +673,7 @@ new LambdaQueryWrapper<WaylineJobEntity>() // 不过滤状态, //.eq(Objects.nonNull(status), WaylineJobEntity::getStatus, status.getVal()) .ne(WaylineJobEntity::getStatus, status.getVal()) .and(!CollectionUtils.isEmpty(jobIds), wrapper -> jobIds.forEach(id -> wrapper.eq(WaylineJobEntity::getJobId, id).or()))) .stream() @@ -761,7 +761,7 @@ // 任务类型筛选，允许为空，为空则不进行筛选 .eq(taskType != null, WaylineJobEntity::getTaskType, taskType) // 任务名称筛选，允许为空，为空则不进行筛选;....模糊查询 .like(name != null, WaylineJobEntity::getName, "%"+name+"%") .like(name != null, WaylineJobEntity::getName, "%" + name + "%") // 根据是否完成筛选，允许为空，为空则不进行筛选 .eq(isComplete != null && isComplete, WaylineJobEntity::getStatus, 3) .ne(isComplete != null && !isComplete, WaylineJobEntity::getStatus, 3) @@ -782,18 +782,18 @@ public List<WaylineJobEntity> selectList(Long taskType, Long executeTime, String parentId) { return mapper.selectList(new LambdaQueryWrapper<WaylineJobEntity>() .eq(taskType != null,WaylineJobEntity::getTaskType, taskType) .ne(WaylineJobEntity::getStatus, WaylineJobStatusEnum.SUCCESS.getVal()) .eq(executeTime != null,WaylineJobEntity::getBeginTime, executeTime) .eq(parentId != null,WaylineJobEntity::getParentId,parentId) .ne(WaylineJobEntity::getStatus, 3) .eq(taskType != null, WaylineJobEntity::getTaskType, taskType) .ne(WaylineJobEntity::getStatus, WaylineJobStatusEnum.SUCCESS.getVal()) .eq(executeTime != null, WaylineJobEntity::getBeginTime, executeTime) .eq(parentId != null, WaylineJobEntity::getParentId, parentId) .ne(WaylineJobEntity::getStatus, 3) .orderByDesc(WaylineJobEntity::getId)); } /** * 获取所有待定状态的定时任务，未执行即将要执行的。 * */ public List<WaylineJobEntity> selectScheduledTaskList(){ */ public List<WaylineJobEntity> selectScheduledTaskList() { // "1":"定时任务" return mapper.selectList(new LambdaQueryWrapper<WaylineJobEntity>() .eq(WaylineJobEntity::getTaskType, 1) @@ -885,9 +885,9 @@ builder.data(RequestsReply.success(WaylineTaskCreateDTO.builder() .file(WaylineTaskFileDTO.builder() .url(httpUrl) .fingerprint(md5) .build()) .url(httpUrl) .fingerprint(md5) .build()) .build())); } catch (NullPointerException | IOException e) { @@ -898,11 +898,10 @@ } // 下发参数打印 try{ try { String json = objectMapper.writeValueAsString(builder.build()); log.info("机场通过flighttask_resource_get获取航线文件的参数flightTask：{}", json); } catch (Exception e){ } catch (Exception e) { log.error("机场通过flighttask_resource_get获取航线文件的参数flightTask异常：{}", e.getMessage()); } @@ -940,7 +939,7 @@ .build()); if (ResponseResult.CODE_SUCCESS != reply.getResult()) { String errorMsg = CommonErrorEnum.getMsgByCode(reply.getResult()); throw new RuntimeException("未能设置媒体作业上传优先级. Error Code: " + reply.getResult() +", Error Msg: " + errorMsg); throw new RuntimeException("未能设置媒体作业上传优先级. Error Code: " + reply.getResult() + ", Error Msg: " + errorMsg); } } @@ -1004,9 +1003,8 @@ fileName = Optional.ofNullable(ardRouteInfo.getName()).orElse(""); } } } catch (Exception e) { log.info("获取航线名称失败，fileId:{},异常原因：{}", fileId,e.getMessage()); } catch (Exception e) { log.info("获取航线名称失败，fileId:{},异常原因：{}", fileId, e.getMessage()); fileName = ""; } WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder()
