forked from uav/ard-uav-server
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -1,5 +1,9 @@ package com.ard.sample.wayline.service.impl; import com.ard.oss.service.impl.OssServiceContext; import com.ard.route.domain.route.ArdRouteInfo; import com.ard.route.service.IArdRouteInfoService; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -24,11 +28,12 @@ import com.ard.sample.wayline.model.enums.WaylineMethodEnum; import com.ard.sample.wayline.model.enums.WaylineTaskTypeEnum; import com.ard.sample.wayline.model.param.CreateJobParam; import com.ard.sample.wayline.service.IWaylineFileService; import com.ard.sample.wayline.service.IWaylineJobService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.mqtt.support.MqttHeaders; @@ -37,6 +42,10 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.sql.SQLException; import java.time.Instant; @@ -44,6 +53,9 @@ import java.time.ZoneId; import java.util.*; import java.util.stream.Collectors; import static com.ard.route.util.ToolUtils.kmzPath; import static com.ard.route.util.ToolUtils.subStringMinioUrlName; /** * @author sean @@ -58,8 +70,14 @@ @Autowired private IWaylineJobMapper mapper; // @Autowired // private IWaylineFileService waylineFileService; @Autowired private IWaylineFileService waylineFileService; private IArdRouteInfoService _ardRouteInfoService; @Resource private OssServiceContext _ossService; @Autowired private IDeviceService deviceService; @@ -73,6 +91,12 @@ @Autowired private IFileService fileService; /** * 插入航路作业 * * @param jobEntity 航路作业实体 * @return 航路作业DTO的Optional包装对象，如果插入失败则返回Optional.empty() */ private Optional<WaylineJobDTO> insertWaylineJob(WaylineJobEntity jobEntity) { int id = mapper.insert(jobEntity); if (id <= 0) { @@ -81,6 +105,15 @@ return Optional.ofNullable(this.entity2Dto(jobEntity)); } /** * 创建航线任务 * * @param param 任务参数 * @param username 用户名 * @param beginTime 开始时间 * @param endTime 结束时间 * @return Optional<WaylineJobDTO> 返回创建的航线任务对象，若创建失败则返回Optional.empty() */ @Override public Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String username, Long beginTime, Long endTime) { if (Objects.isNull(param)) { @@ -101,11 +134,19 @@ .outOfControlAction(param.getOutOfControlAction()) .rthAltitude(param.getRthAltitude()) .mediaCount(0) .parentId(param.getParentId()) .loopSum(param.getLoopSum()) .build(); return insertWaylineJob(jobEntity); } /** * 根据父作业ID创建新的作业 * * @param parentId 父作业ID * @return 新创建的作业的DTO对象，如果父作业不存在，则返回Optional.empty() */ @Override public Optional<WaylineJobDTO> createWaylineJobByParent(String parentId) { Optional<WaylineJobDTO> parentJobOpt = this.getJobByJobId(parentId); @@ -123,6 +164,14 @@ return this.insertWaylineJob(jobEntity); } /** * 发布飞行任务 * * @param param 任务参数 * @param loginUser 登录用户 * @return ResponseResult 返回结果 * @throws SQLException SQL异常 */ @Override public ResponseResult publishFlightTask(CreateJobParam param, LoginUser loginUser) throws SQLException { if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == param.getTaskType()) { @@ -130,9 +179,16 @@ } Optional<WaylineJobDTO> waylineJobOpt = this.createWaylineJob(param, loginUser.getUsername(), param.getExecuteTime(), param.getExecuteTime()); // 循环任务 if (param.getTaskType() == WaylineTaskTypeEnum.LOOP.getVal()) { // 循环任务，不立即执行，由定时任务发布 return ResponseResult.success(); } if (waylineJobOpt.isEmpty()) { return ResponseResult.error("创建机场任务失败！"); } WaylineJobDTO waylineJob = waylineJobOpt.get(); boolean isOnline = deviceService.checkDeviceOnline(waylineJob.getDockSn()); @@ -141,13 +197,27 @@ } // get wayline file Optional<WaylineFileDTO> waylineFile = waylineFileService.getWaylineByWaylineId(waylineJob.getFileId()); if (waylineFile.isEmpty()) { // Optional<WaylineFileDTO> waylineFile = waylineFileService.getWaylineByWaylineId(waylineJob.getFileId()); // if (waylineFile.isEmpty()) { // return ResponseResult.error("机场任务航线不存在！"); // } // 换航线表 ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId()); if (ardRouteOpt == null) { return ResponseResult.error("机场任务航线不存在！"); } // get file url URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId()); // URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId()); URL url = null; String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath()); String md5 = ""; try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) { md5 = DigestUtils.md5Hex(inputStream); url = new URL(ardRouteOpt.getPath()); } catch (Exception e) { return ResponseResult.error("机场任务航线文件地址错误！" + e.getMessage()); } WaylineTaskCreateDTO flightTask = WaylineTaskCreateDTO.builder() .flightId(waylineJob.getJobId()) @@ -158,7 +228,13 @@ .outOfControlAction(waylineJob.getOutOfControlAction()) .file(WaylineTaskFileDTO.builder() .url(url.toString()) .fingerprint(waylineFile.get().getSign()) // .fingerprint(waylineFile.get().getSign()) .fingerprint(md5) .build()) .simulateMission(WaylineSimulateMissionDTO.builder() .isEnable(1) .latitude(46.558831038) .longitude(125.148072319) .build()) .build(); @@ -173,10 +249,10 @@ .build(); ServiceReply serviceReply = messageSender.publishWithReply(topic, response); log.info("下发任务结果： {}", serviceReply.getResult()); if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) { log.info("Prepare task ====> Error code: {}", serviceReply.getResult()); this.updateJob(WaylineJobDTO.builder() .workspaceId(waylineJob.getWorkspaceId()) .jobId(waylineJob.getJobId()) .executeTime(LocalDateTime.now()) .status(WaylineJobStatusEnum.FAILED.getVal()) @@ -185,25 +261,122 @@ return ResponseResult.error("Prepare task ====> Error code: " + serviceReply.getResult()); } // 飞行命令先注释掉 // Issue an immediate task execution command. if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) { if (!executeFlightTask(waylineJob.getJobId())) { return ResponseResult.error("Failed to execute job."); } } if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) { boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, waylineJob.getWorkspaceId() + RedisConst.DELIMITER + waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(), waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); if (!isAdd) { return ResponseResult.error("Failed to create scheduled job."); } } // if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) { // if (!executeFlightTask(waylineJob.getJobId())) { // return ResponseResult.error("Failed to execute job."); // } // } // // if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) { // boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, // waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(), // waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); // if (!isAdd) { // return ResponseResult.error("Failed to create scheduled job."); // } // } return ResponseResult.success(); } public ResponseResult publishFlightTaskPrepare(Optional<WaylineJobDTO> waylineJobOpt) throws SQLException{ if (waylineJobOpt.isEmpty()) { return ResponseResult.error("创建机场任务失败！"); } WaylineJobDTO waylineJob = waylineJobOpt.get(); boolean isOnline = deviceService.checkDeviceOnline(waylineJob.getDockSn()); if (!isOnline) { return ResponseResult.error("机场不在线！"); } // 换航线表 ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId()); if (ardRouteOpt == null) { return ResponseResult.error("机场任务航线不存在！"); } // get file url URL url = null; String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath()); String md5 = ""; try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) { md5 = DigestUtils.md5Hex(inputStream); url = new URL(ardRouteOpt.getPath()); } catch (Exception e) { return ResponseResult.error("机场任务航线文件地址错误！" + e.getMessage()); } WaylineTaskCreateDTO flightTask = WaylineTaskCreateDTO.builder() .flightId(waylineJob.getJobId()) .executeTime(waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) .taskType(waylineJob.getTaskType()) .waylineType(waylineJob.getWaylineType()) .rthAltitude(waylineJob.getRthAltitude()) .outOfControlAction(waylineJob.getOutOfControlAction()) .file(WaylineTaskFileDTO.builder() .url(url.toString()) // .fingerprint(waylineFile.get().getSign()) .fingerprint(md5) .build()) .simulateMission(WaylineSimulateMissionDTO.builder() .isEnable(1) .latitude(46.558831038) .longitude(125.148072319) .build()) .build(); String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + waylineJob.getDockSn() + TopicConst.SERVICES_SUF; CommonTopicResponse<Object> response = CommonTopicResponse.builder() .tid(UUID.randomUUID().toString()) .bid(waylineJob.getJobId()) .timestamp(System.currentTimeMillis()) .data(flightTask) .method(WaylineMethodEnum.FLIGHT_TASK_PREPARE.getMethod()) .build(); ServiceReply serviceReply = messageSender.publishWithReply(topic, response); log.info("下发任务结果： {}", serviceReply.getResult()); if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) { log.info("Prepare task ====> Error code: {}", serviceReply.getResult()); this.updateJob(WaylineJobDTO.builder() .jobId(waylineJob.getJobId()) .executeTime(LocalDateTime.now()) .status(WaylineJobStatusEnum.FAILED.getVal()) .completedTime(LocalDateTime.now()) .code(serviceReply.getResult()).build()); return ResponseResult.error("Prepare task ====> Error code: " + serviceReply.getResult()); } // 飞行命令先注释掉 // Issue an immediate task execution command. // if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) { // if (!executeFlightTask(waylineJob.getJobId())) { // return ResponseResult.error("Failed to execute job."); // } // } // // if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) { // boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, // waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(), // waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); // if (!isAdd) { // return ResponseResult.error("Failed to create scheduled job."); // } // } return ResponseResult.success(); } /** * 执行飞行任务 * * @param jobId 任务ID * @return 如果任务执行成功返回true，否则返回false * @throws IllegalArgumentException 如果任务不存在 * @throws RuntimeException 如果设备处于离线状态 */ @Override public Boolean executeFlightTask(String jobId) { // get job @@ -253,16 +426,23 @@ return true; } /** * 取消飞行任务 * * @param jobIds 需要取消的任务ID集合 * @throws IllegalArgumentException 如果任务状态不正确，抛出非法参数异常 */ @Override public void cancelFlightTask(Collection<String> jobIds) { List<WaylineJobDTO> waylineJobs = getJobsByConditions(jobIds, WaylineJobStatusEnum.PENDING); Set<String> waylineJobIds = waylineJobs.stream().map(WaylineJobDTO::getJobId).collect(Collectors.toSet()); // Check if the task status is correct. boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty() ; boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty(); if (isErr) { throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. " + Arrays.toString(jobIds.toArray())); throw new IllegalArgumentException("任务开始后，无法取消。" + Arrays.toString(jobIds.toArray())); // throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. " // + Arrays.toString(jobIds.toArray())); } // Group job id by dock sn. @@ -273,6 +453,13 @@ } /** * 发布取消任务 * * @param dockSn 设备序列号 * @param jobIds 任务ID列表 * @throws RuntimeException 如果设备离线或取消任务失败，则抛出运行时异常 */ @Override public void publishCancelTask(String dockSn, List<String> jobIds) { boolean isOnline = deviceService.checkDeviceOnline(dockSn); @@ -302,22 +489,43 @@ .completedTime(LocalDateTime.now()) .build()); RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, RedisConst.DELIMITER + dockSn + RedisConst.DELIMITER + jobId); // 原流程是修改表中数据的status状态值，现在的精力是直接删除 this.deleteTask(jobId); } } @Override public void deleteTask(String jobid) { mapper.delete(new LambdaQueryWrapper<WaylineJobEntity>() .eq(WaylineJobEntity::getJobId, jobid)); } /** * 根据条件查询作业列表 * * @param jobIds 作业ID集合 * @param status 作业状态枚举 * @return 满足条件的作业DTO列表 */ @Override public List<WaylineJobDTO> getJobsByConditions(Collection<String> jobIds, WaylineJobStatusEnum status) { return mapper.selectList( new LambdaQueryWrapper<WaylineJobEntity>() .eq(Objects.nonNull(status), WaylineJobEntity::getStatus, status.getVal()) .and(!CollectionUtils.isEmpty(jobIds), wrapper -> jobIds.forEach(id -> wrapper.eq(WaylineJobEntity::getJobId, id).or()))) new LambdaQueryWrapper<WaylineJobEntity>() .eq(Objects.nonNull(status), WaylineJobEntity::getStatus, status.getVal()) .and(!CollectionUtils.isEmpty(jobIds), wrapper -> jobIds.forEach(id -> wrapper.eq(WaylineJobEntity::getJobId, id).or()))) .stream() .map(this::entity2Dto) .collect(Collectors.toList()); } /** * 根据任务ID获取任务详情 * * @param jobId 任务ID * @return Optional<WaylineJobDTO> 包含任务详情的Optional对象，如果不存在则返回空的Optional */ @Override public Optional<WaylineJobDTO> getJobByJobId(String jobId) { WaylineJobEntity jobEntity = mapper.selectOne( @@ -326,6 +534,12 @@ return Optional.ofNullable(entity2Dto(jobEntity)); } /** * 更新作业信息 * * @param dto 作业信息传输对象 * @return 更新成功返回true，否则返回false */ @Override public Boolean updateJob(WaylineJobDTO dto) { return mapper.update(this.dto2Entity(dto), @@ -333,6 +547,13 @@ .eq(WaylineJobEntity::getJobId, dto.getJobId())) > 0; } /** * 根据工作区ID获取工作线任务分页数据 * * @param page 页码，从1开始 * @param pageSize 每页显示条数 * @return PaginationData 包含工作线任务分页数据的对象 */ @Override public PaginationData<WaylineJobDTO> getJobsByWorkspaceId(long page, long pageSize) { Page<WaylineJobEntity> pageData = mapper.selectPage( @@ -347,12 +568,68 @@ return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData)); } /** * 根据条件筛选获取任务分页数据 * * @param page 页码，从1开始 * @param pageSize 每页显示条数 * @return PaginationData 包含工作线任务分页数据的对象 */ @Override public PaginationData<WaylineJobDTO> getJobsList(long page, long pageSize, Integer status, Long startTime, Long endTime, Integer taskType, String name, Boolean isComplete) { Page<WaylineJobEntity> pageData = mapper.selectPage( new Page<WaylineJobEntity>(page, pageSize), new LambdaQueryWrapper<WaylineJobEntity>() // 实际开始时间筛选，允许为空，为空则不进行筛选 .ge(startTime != null, WaylineJobEntity::getBeginTime, startTime) .le(endTime != null, WaylineJobEntity::getBeginTime, endTime) // 任务类型筛选，允许为空，为空则不进行筛选 .eq(taskType != null, WaylineJobEntity::getTaskType, taskType) // 任务名称筛选，允许为空，为空则不进行筛选;....模糊查询 .like(name != null, WaylineJobEntity::getName, "%"+name+"%") // 根据是否完成筛选，允许为空，为空则不进行筛选 .eq(isComplete != null && isComplete, WaylineJobEntity::getStatus, 3) .ne(isComplete != null && !isComplete, WaylineJobEntity::getStatus, 3) // 任务状态筛选，允许为空，为空则不进行筛选 .eq(status != null, WaylineJobEntity::getStatus, status) .orderByDesc(WaylineJobEntity::getId)); List<WaylineJobDTO> records = pageData.getRecords() .stream() .map(this::entity2Dto) .collect(Collectors.toList()); return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData)); } 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) .orderByDesc(WaylineJobEntity::getId)); } /** * 根据航班任务ID获取航班任务资源 * * @param receiver 接收到的消息对象 * @param headers 消息头信息 * @Override 覆盖父类方法 * @ServiceActivator(inputChannel = ChannelName.INBOUND_REQUESTS_FLIGHT_TASK_RESOURCE_GET, outputChannel = ChannelName.OUTBOUND) * 指定输入通道和输出通道 * @Transactional(isolation = Isolation.READ_UNCOMMITTED) * 设置事务隔离级别为未提交读 */ @Override @ServiceActivator(inputChannel = ChannelName.INBOUND_REQUESTS_FLIGHT_TASK_RESOURCE_GET, outputChannel = ChannelName.OUTBOUND) @Transactional(isolation = Isolation.READ_UNCOMMITTED) public void flightTaskResourceGet(CommonTopicReceiver receiver, MessageHeaders headers) { Map<String, String> jobIdMap = objectMapper.convertValue(receiver.getData(), new TypeReference<Map<String, String>>() {}); Map<String, String> jobIdMap = objectMapper.convertValue(receiver.getData(), new TypeReference<Map<String, String>>() { }); String jobId = jobIdMap.get(MapKeyConst.FLIGHT_ID); CommonTopicResponse.CommonTopicResponseBuilder<RequestsReply> builder = CommonTopicResponse.<RequestsReply>builder() @@ -374,8 +651,16 @@ WaylineJobDTO waylineJob = waylineJobOpt.get(); // get wayline file Optional<WaylineFileDTO> waylineFile = waylineFileService.getWaylineByWaylineId(waylineJob.getFileId()); if (waylineFile.isEmpty()) { // Optional<WaylineFileDTO> waylineFile = waylineFileService.getWaylineByWaylineId(waylineJob.getFileId()); // if (waylineFile.isEmpty()) { // builder.data(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT)); // messageSender.publish(topic, builder.build()); // return; // } // 修改航线文件名称，从ard_route_info航线表中取; // 换航线表 ArdRouteInfo ardRouteOpt = _ardRouteInfoService.selectArdRouteInfoById(waylineJob.getFileId()); if (ardRouteOpt == null) { builder.data(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT)); messageSender.publish(topic, builder.build()); return; @@ -383,16 +668,24 @@ // get file url URL url = null; try { url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId()); String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath()); String md5 = ""; try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) { md5 = DigestUtils.md5Hex(inputStream); url = new URL(ardRouteOpt.getPath()); // } // try { // url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId()); // url = new URL(ardRouteOpt.getUpPath()); builder.data(RequestsReply.success(WaylineTaskCreateDTO.builder() .file(WaylineTaskFileDTO.builder() .url(url.toString()) .fingerprint(waylineFile.get().getSign()) // .fingerprint(waylineFile.get().getSign()) .fingerprint(md5) .build()) .build())); } catch (SQLException | NullPointerException e) { } catch (NullPointerException | IOException e) { e.printStackTrace(); builder.data(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT)); messageSender.publish(topic, builder.build()); @@ -403,6 +696,12 @@ } /** * 上传媒体文件的最高优先级 * * @param jobId 作业ID * @throws RuntimeException 如果作业ID不合法或设置优先级失败 */ @Override public void uploadMediaHighestPriority(String jobId) { Optional<WaylineJobDTO> jobOpt = getJobByJobId(jobId); @@ -430,6 +729,12 @@ } } /** * 将WaylineJobDTO对象转换为WaylineJobEntity对象 * * @param dto WaylineJobDTO对象 * @return WaylineJobEntity对象 */ private WaylineJobEntity dto2Entity(WaylineJobDTO dto) { WaylineJobEntity.WaylineJobEntityBuilder builder = WaylineJobEntity.builder(); if (dto == null) { @@ -454,32 +759,52 @@ .jobId(dto.getJobId()) .fileId(dto.getFileId()) .dockSn(dto.getDockSn()) .workspaceId(dto.getWorkspaceId()) .taskType(dto.getTaskType()) .waylineType(dto.getWaylineType()) .username(dto.getUsername()) .rthAltitude(dto.getRthAltitude()) .outOfControlAction(dto.getOutOfControlAction()) .parentId(dto.getParentId()) .loopSum(dto.getLoopSum()) .build(); } /** * 将实体对象转换为数据传输对象 * * @param entity WaylineJobEntity 实体对象 * @return WaylineJobDTO 数据传输对象 */ private WaylineJobDTO entity2Dto(WaylineJobEntity entity) { if (entity == null) { return null; } // 修改航线文件名称，从ard_route_info航线表中取; String fileId = entity.getFileId(); String fileName = ""; try { if (fileId != null) { ArdRouteInfo ardRouteInfo = _ardRouteInfoService.selectArdRouteInfoById(fileId); if (ardRouteInfo != null) { fileName = Optional.ofNullable(ardRouteInfo.getName()).orElse(""); } } } catch (Exception e) { log.info("获取航线名称失败，fileId:{},异常原因：{}", fileId,e.getMessage()); fileName = ""; } WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder() .jobId(entity.getJobId()) .jobName(entity.getName()) .fileId(entity.getFileId()) .fileName(waylineFileService.getWaylineByWaylineId(entity.getFileId()) .orElse(WaylineFileDTO.builder().build()).getName()) // .fileName(waylineFileService.getWaylineByWaylineId(entity.getFileId()) // .orElse(WaylineFileDTO.builder().build()).getName()) .fileName(fileName) .dockSn(entity.getDockSn()) .dockName(deviceService.getDeviceBySn(entity.getDockSn()) .orElse(DeviceDTO.builder().build()).getNickname()) .username(entity.getUsername()) .workspaceId(entity.getWorkspaceId()) .status(WaylineJobStatusEnum.IN_PROGRESS.getVal() == entity.getStatus() && RedisOpsUtils.checkExist(RedisConst.WAYLINE_JOB_PAUSED_PREFIX + entity.getJobId()) ? WaylineJobStatusEnum.PAUSED.getVal() : entity.getStatus()) @@ -495,7 +820,9 @@ .waylineType(entity.getWaylineType()) .rthAltitude(entity.getRthAltitude()) .outOfControlAction(entity.getOutOfControlAction()) .mediaCount(entity.getMediaCount()); .mediaCount(entity.getMediaCount()) .loopSum(entity.getLoopSum()); if (Objects.nonNull(entity.getEndTime())) { builder.endTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getEndTime()), ZoneId.systemDefault())); @@ -517,7 +844,7 @@ Object mediaFileCount = RedisOpsUtils.hashGet(countKey, entity.getJobId()); if (Objects.nonNull(mediaFileCount)) { builder.uploadedCount(((MediaFileCountDTO) mediaFileCount).getUploadedCount()) .uploading(RedisOpsUtils.checkExist(key) && entity.getJobId().equals(((MediaFileCountDTO)RedisOpsUtils.get(key)).getJobId())); .uploading(RedisOpsUtils.checkExist(key) && entity.getJobId().equals(((MediaFileCountDTO) RedisOpsUtils.get(key)).getJobId())); return builder.build(); }
