From 68f80a7451a126335153ec00bb6cb520a5ae1f8d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:02:45 +0800
Subject: [PATCH] 定时任务逻辑修改
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 735 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 619 insertions(+), 116 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
index acbeabe..8ae67ba 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -1,7 +1,12 @@
package com.dji.sample.wayline.service.impl;
+import com.alibaba.druid.stat.TableStat;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.error.CommonErrorEnum;
import com.dji.sample.common.model.CustomClaim;
@@ -12,20 +17,33 @@
import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
+import com.dji.sample.control.model.dto.PointDTO;
+import com.dji.sample.control.model.param.DrcModeParam;
+import com.dji.sample.control.model.param.FlyToPointParam;
+import com.dji.sample.control.model.param.TakeoffToPointParam;
+import com.dji.sample.control.service.IControlService;
+import com.dji.sample.control.service.IDrcService;
import com.dji.sample.manage.model.dto.DeviceDTO;
+import com.dji.sample.manage.model.enums.DeviceModeCodeEnum;
+import com.dji.sample.manage.model.enums.DockModeCodeEnum;
+import com.dji.sample.manage.model.enums.DroneRcLostActionEnum;
+import com.dji.sample.manage.model.enums.WaylineRcLostActionEnum;
+import com.dji.sample.manage.model.receiver.OsdDockReceiver;
+import com.dji.sample.manage.model.receiver.OsdSubDeviceReceiver;
+import com.dji.sample.manage.service.IDeviceRedisService;
import com.dji.sample.manage.service.IDeviceService;
import com.dji.sample.media.model.MediaFileCountDTO;
import com.dji.sample.media.model.MediaMethodEnum;
import com.dji.sample.media.service.IFileService;
+import com.dji.sample.utils.GeoUtils;
import com.dji.sample.wayline.dao.IWaylineJobMapper;
import com.dji.sample.wayline.model.dto.*;
import com.dji.sample.wayline.model.entity.WaylineJobEntity;
-import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum;
-import com.dji.sample.wayline.model.enums.WaylineMethodEnum;
-import com.dji.sample.wayline.model.enums.WaylineTaskTypeEnum;
-import com.dji.sample.wayline.model.param.CreateJobParam;
+import com.dji.sample.wayline.model.enums.*;
+import com.dji.sample.wayline.model.param.*;
import com.dji.sample.wayline.service.IWaylineFileService;
import com.dji.sample.wayline.service.IWaylineJobService;
+import com.dji.sample.wayline.service.IWaylineRedisService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
@@ -37,6 +55,7 @@
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.net.URL;
import java.sql.SQLException;
@@ -72,6 +91,18 @@
@Autowired
private IFileService fileService;
+ @Autowired
+ private IDrcService drcService;
+
+ @Autowired
+ private IDeviceRedisService deviceRedisService;
+
+ @Autowired
+ private IWaylineRedisService waylineRedisService;
+
+ @Autowired
+ private IControlService controlService;
+
private Optional<WaylineJobDTO> insertWaylineJob(WaylineJobEntity jobEntity) {
int id = mapper.insert(jobEntity);
if (id <= 0) {
@@ -96,8 +127,8 @@
.beginTime(beginTime)
.endTime(endTime)
.status(WaylineJobStatusEnum.PENDING.getVal())
- .taskType(param.getTaskType())
- .waylineType(param.getWaylineType())
+ .taskType(param.getTaskType().getVal())
+ .waylineType(param.getWaylineType().getVal())
.outOfControlAction(param.getOutOfControlAction())
.rthAltitude(param.getRthAltitude())
.mediaCount(0)
@@ -123,31 +154,194 @@
return this.insertWaylineJob(jobEntity);
}
+ /**
+ * 对于即时任务，以服务器时间为准。
+ *
+ * @param param
+ */
+ private void fillImmediateTime(CreateJobParam param) {
+ if (WaylineTaskTypeEnum.IMMEDIATE != param.getTaskType()) {
+ return;
+ }
+ long now = System.currentTimeMillis() / 1000 - 10;
+// param.setTaskDays(Collections.singletonList(now));
+// param.setTaskPeriods(Collections.singletonList(Collections.singletonList(now)));
+ param.setTaskDays(List.of(now));
+ param.setTaskPeriods(List.of(List.of(now)));
+ }
+
@Override
public ResponseResult publishFlightTask(CreateJobParam param, CustomClaim customClaim) throws SQLException {
- if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == param.getTaskType()) {
- param.setExecuteTime(System.currentTimeMillis());
+ fillImmediateTime(param);
+
+// param.getTaskDays().sort((a, b) -> (int) (a - b));
+// param.getTaskPeriods().sort((a, b) -> (int) (a.get(0) - b.get(0)));
+ for (Long taskDay : param.getTaskDays()) {
+ LocalDate date = LocalDate.ofInstant(Instant.ofEpochSecond(taskDay), ZoneId.systemDefault());
+ for (List<Long> taskPeriod : param.getTaskPeriods()) {
+ long beginTime = LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(taskPeriod.get(0)), ZoneId.systemDefault()))
+ .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+ long endTime = taskPeriod.size() > 1 && Objects.nonNull(taskPeriod.get(1)) ?
+ LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(taskPeriod.get(1)), ZoneId.systemDefault()))
+ .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() : beginTime;
+ if (WaylineTaskTypeEnum.IMMEDIATE != param.getTaskType() && endTime < System.currentTimeMillis()) {
+ return ResponseResult.error("任务已过期");
+ }
+ Optional<WaylineJobDTO> waylineJobOpt = this.createWaylineJob(param, customClaim.getWorkspaceId(), customClaim.getUsername(), beginTime, endTime);
+ if (waylineJobOpt.isEmpty()) {
+ throw new SQLException("任务创建失败");
+ }
+ WaylineJobDTO waylineJob = waylineJobOpt.get();
+ // If it is a conditional task type, add conditions to the job parameters.
+ //如果是条件任务类型，需要在任务参数中添加条件。
+ addPreparedJob(waylineJob, param, beginTime, endTime);
+
+ ResponseResult response = this.publishOneFlightTask(waylineJob);
+ if (ResponseResult.CODE_SUCCESS != response.getCode()) {
+ return response;
+ }
+ }
}
- Optional<WaylineJobDTO> waylineJobOpt = this.createWaylineJob(param,
- customClaim.getWorkspaceId(), customClaim.getUsername(),
- param.getExecuteTime(), param.getExecuteTime());
+ return ResponseResult.success();
+ }
+
+ @Override
+ public ResponseResult publishFlightTaskCondition(CreateJobParam param, CustomClaim customClaim) throws SQLException {
+ //开始日期
+ LocalDate startDate = LocalDate.ofInstant(Instant.ofEpochSecond(param.getTaskDays().get(0)), ZoneId.systemDefault());
+ long start = LocalDateTime.of(startDate, LocalTime.ofInstant(Instant.ofEpochSecond(param.getExecuteStartTimeArr().get(0).get(0)), ZoneId.systemDefault()))
+ .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+ //结束日期
+ LocalDate endDate = LocalDate.ofInstant(Instant.ofEpochSecond(param.getTaskDays().get(1)), ZoneId.systemDefault());
+ long end = LocalDateTime.of(endDate, LocalTime.ofInstant(Instant.ofEpochSecond(param.getExecuteStartTimeArr().get(param.getExecuteStartTimeArr().size() - 1).get(0)), ZoneId.systemDefault()))
+ .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+ //保存数据
+ WaylineJobEntity waylineJobEntity = WaylineJobEntity.builder()
+ .jobId(UUID.randomUUID().toString())
+ .name(param.getName())
+ .dockSn(param.getDockSn())
+ .fileId(param.getFileId())
+ .username(customClaim.getUsername())
+ .workspaceId(customClaim.getWorkspaceId())
+
+ .beginTime(start)
+ .endTime(end)
+ .status(WaylineJobStatusEnum.PENDING.getVal())
+ .taskType(param.getTaskType().getVal())
+ .waylineType(param.getWaylineType().getVal())
+ .outOfControlAction(param.getOutOfControlAction())
+ .batteryCapacity(param.getMinBatteryCapacity())
+ .rthAltitude(param.getRthAltitude())
+ .mediaCount(0)
+ .repFreVal(param.getRepFreVal())
+ .repFreType(param.getRepFreType())
+ .repRuleType(param.getRepRuleType())
+ .repRuleVal(param.getRepRuleVal())
+ .executeTimeArr(param.getTaskPeriods())
+ .executeStartTimeArr(param.getExecuteStartTimeArr())
+ .build();
+
+ Optional<WaylineJobDTO> waylineJobOpt = insertWaylineJob(waylineJobEntity);
+
if (waylineJobOpt.isEmpty()) {
- throw new SQLException("Failed to create wayline job.");
+ throw new SQLException("任务创建失败");
}
+
WaylineJobDTO waylineJob = waylineJobOpt.get();
- boolean isOnline = deviceService.checkDeviceOnline(waylineJob.getDockSn());
+ //存一条记录,
+ List<Long> timeArr = param.getExecuteStartTimeArr().get(0);
+
+ LocalDate date = LocalDate.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault());
+ LocalDateTime beginTime = LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault()));
+
+ LocalDateTime endTime = timeArr.size() > 1 && Objects.nonNull(timeArr.get(1)) ?
+ LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(1)), ZoneId.systemDefault())) : beginTime;
+
+ if (WaylineTaskTypeEnum.IMMEDIATE != param.getTaskType() && endTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() < System.currentTimeMillis()) {
+ return ResponseResult.error("任务已过期");
+ }
+ //条件任务
+ if (param.getTaskType() == WaylineTaskTypeEnum.CONDITION) {
+ //如果是条件任务类型，需要在任务参数中添加条件。
+ waylineJob.setConditions(
+ WaylineTaskConditionDTO.builder()
+ .executableConditions(Objects.nonNull(param.getMinStorageCapacity()) ? WaylineTaskExecutableConditionDTO.builder().storageCapacity(param.getMinStorageCapacity()).build() : null)
+ .readyConditions(WaylineTaskReadyConditionDTO.builder()
+ .batteryCapacity(param.getMinBatteryCapacity())
+ .beginTime(beginTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli())
+ .endTime(endTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli())
+ .build())
+ .build());
+ } else {
+ waylineJob.setBeginTime(beginTime);
+ }
+
+ ResponseResult response = this.publishOneFlightTask(waylineJob);
+ if (ResponseResult.CODE_SUCCESS != response.getCode()) {
+ return response;
+ }
+
+ return ResponseResult.success();
+ }
+
+ private void addPreparedJob(WaylineJobDTO waylineJob, CreateJobParam param, Long beginTime, Long endTime) {
+ if (WaylineTaskTypeEnum.CONDITION == param.getTaskType()) {
+ waylineJob.setConditions(
+ WaylineTaskConditionDTO.builder()
+ .executableConditions(Objects.nonNull(param.getMinStorageCapacity()) ? WaylineTaskExecutableConditionDTO.builder().storageCapacity(param.getMinStorageCapacity()).build() : null)
+ .readyConditions(WaylineTaskReadyConditionDTO.builder()
+ .batteryCapacity(param.getMinBatteryCapacity())
+ .beginTime(beginTime)
+ .endTime(endTime)
+ .build())
+ .build());
+
+ waylineRedisService.setConditionalWaylineJob(waylineJob);
+ }
+ // value: {workspace_id}:{dock_sn}:{job_id}
+ boolean isAdd = waylineRedisService.addPreparedWaylineJob(waylineJob);
+ if (!isAdd) {
+ throw new RuntimeException("创建任务失败。");
+ }
+ }
+
+ public ResponseResult publishOneFlightTask(WaylineJobDTO waylineJob) throws SQLException {
+
+ boolean isSuccess = this.prepareFlightTask(waylineJob);
+ if (!isSuccess) {
+ return ResponseResult.error("任务准备失败");
+ }
+
+ // Issue an immediate task execution command.
+ //发出立即任务执行命令
+ if (WaylineTaskTypeEnum.IMMEDIATE == waylineJob.getTaskType()) {
+ boolean isExecuted = executeFlightTask(waylineJob.getWorkspaceId(), waylineJob.getJobId());
+ if (!isExecuted) {
+ return ResponseResult.error("执行任务失败");
+ }
+ }
+
+ return ResponseResult.success();
+ }
+
+ private Boolean prepareFlightTask(WaylineJobDTO waylineJob) throws SQLException {
+
+ boolean isOnline = deviceRedisService.checkDeviceOnline(waylineJob.getDockSn());
if (!isOnline) {
- throw new RuntimeException("Dock is offline.");
+ throw new RuntimeException("设备离线。");
}
// get wayline file
Optional<WaylineFileDTO> waylineFile = waylineFileService.getWaylineByWaylineId(waylineJob.getWorkspaceId(), waylineJob.getFileId());
if (waylineFile.isEmpty()) {
- throw new SQLException("Wayline file doesn't exist.");
+ throw new SQLException("航线文件不存在。");
}
// get file url
+ //获取航线文件地址
URL url = waylineFileService.getObjectUrl(waylineJob.getWorkspaceId(), waylineFile.get().getWaylineId());
WaylineTaskCreateDTO flightTask = WaylineTaskCreateDTO.builder()
@@ -163,19 +357,21 @@
.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();
+ //当任务类型为条件时
+ if (WaylineTaskTypeEnum.CONDITION == waylineJob.getTaskType()) {
+ if (Objects.isNull(waylineJob.getConditions())) {
+ throw new IllegalArgumentException();
+ }
+ flightTask.setReadyConditions(waylineJob.getConditions().getReadyConditions());
+ flightTask.setExecutableConditions(waylineJob.getConditions().getExecutableConditions());
+ }
- ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
+ //发布飞行指令
+ ServiceReply serviceReply = messageSender.publishServicesTopic(
+ waylineJob.getDockSn(), WaylineMethodEnum.FLIGHT_TASK_PREPARE.getMethod(), flightTask, waylineJob.getJobId());
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
log.info("Prepare task ====> Error code: {}", serviceReply.getResult());
+ //飞行失败，更新数据库信息
this.updateJob(WaylineJobDTO.builder()
.workspaceId(waylineJob.getWorkspaceId())
.jobId(waylineJob.getJobId())
@@ -183,26 +379,9 @@
.status(WaylineJobStatusEnum.FAILED.getVal())
.completedTime(LocalDateTime.now())
.code(serviceReply.getResult()).build());
- return ResponseResult.error("Prepare task ====> Error code: " + serviceReply.getResult());
+ return false;
}
-
- // Issue an immediate task execution command.
- if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) {
- if (!executeFlightTask(waylineJob.getWorkspaceId(), 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.");
- }
- }
-
- return ResponseResult.success();
+ return true;
}
@Override
@@ -210,28 +389,19 @@
// get job
Optional<WaylineJobDTO> waylineJob = this.getJobByJobId(workspaceId, jobId);
if (waylineJob.isEmpty()) {
- throw new IllegalArgumentException("Job doesn't exist.");
+ throw new IllegalArgumentException("任务不存在");
}
- boolean isOnline = deviceService.checkDeviceOnline(waylineJob.get().getDockSn());
+ boolean isOnline = deviceRedisService.checkDeviceOnline(waylineJob.get().getDockSn());
if (!isOnline) {
- throw new RuntimeException("Dock is offline.");
+ throw new RuntimeException("设备离线");
}
WaylineJobDTO job = waylineJob.get();
WaylineTaskCreateDTO flightTask = WaylineTaskCreateDTO.builder().flightId(jobId).build();
- String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT +
- job.getDockSn() + TopicConst.SERVICES_SUF;
- CommonTopicResponse<Object> response = CommonTopicResponse.builder()
- .tid(UUID.randomUUID().toString())
- .bid(jobId)
- .timestamp(System.currentTimeMillis())
- .data(flightTask)
- .method(WaylineMethodEnum.FLIGHT_TASK_EXECUTE.getMethod())
- .build();
-
- ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
+ ServiceReply serviceReply = messageSender.publishServicesTopic(
+ job.getDockSn(), WaylineMethodEnum.FLIGHT_TASK_EXECUTE.getMethod(), flightTask, jobId);
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
log.info("Execute job ====> Error code: {}", serviceReply.getResult());
this.updateJob(WaylineJobDTO.builder()
@@ -240,6 +410,11 @@
.status(WaylineJobStatusEnum.FAILED.getVal())
.completedTime(LocalDateTime.now())
.code(serviceReply.getResult()).build());
+ // The conditional task fails and enters the blocking status.
+ if (WaylineTaskTypeEnum.CONDITION == job.getTaskType()
+ && WaylineErrorCodeEnum.find(serviceReply.getResult()).isBlock()) {
+ waylineRedisService.setBlockedWaylineJob(job.getDockSn(), jobId);
+ }
return false;
}
@@ -248,9 +423,7 @@
.executeTime(LocalDateTime.now())
.status(WaylineJobStatusEnum.IN_PROGRESS.getVal())
.build());
- RedisOpsUtils.setWithExpire(RedisConst.WAYLINE_JOB_RUNNING_PREFIX + job.getDockSn(),
- EventsReceiver.<WaylineTaskProgressReceiver>builder().bid(jobId).sn(job.getDockSn()).build(),
- RedisConst.DEVICE_ALIVE_SECOND * RedisConst.DEVICE_ALIVE_SECOND);
+ waylineRedisService.setRunningWaylineJob(job.getDockSn(), EventsReceiver.<WaylineTaskProgressReceiver>builder().bid(jobId).sn(job.getDockSn()).build());
return true;
}
@@ -260,10 +433,9 @@
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()));
}
// Group job id by dock sn.
@@ -275,24 +447,16 @@
}
public void publishCancelTask(String workspaceId, String dockSn, List<String> jobIds) {
- boolean isOnline = deviceService.checkDeviceOnline(dockSn);
+ boolean isOnline = deviceRedisService.checkDeviceOnline(dockSn);
if (!isOnline) {
- throw new RuntimeException("Dock is offline.");
+ throw new RuntimeException("设备离线");
}
- String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + dockSn + TopicConst.SERVICES_SUF;
- CommonTopicResponse<Object> response = CommonTopicResponse.builder()
- .tid(UUID.randomUUID().toString())
- .bid(UUID.randomUUID().toString())
- .timestamp(System.currentTimeMillis())
- .data(Map.of(MapKeyConst.FLIGHT_IDS, jobIds))
- .method(WaylineMethodEnum.FLIGHT_TASK_CANCEL.getMethod())
- .build();
-
- ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
+ ServiceReply serviceReply = messageSender.publishServicesTopic(
+ dockSn, WaylineMethodEnum.FLIGHT_TASK_CANCEL.getMethod(), Map.of(MapKeyConst.FLIGHT_IDS, jobIds));
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
log.info("Cancel job ====> Error code: {}", serviceReply.getResult());
- throw new RuntimeException("Failed to cancel the wayline job of " + dockSn);
+ throw new RuntimeException("航路作业取消失败 " + dockSn);
}
for (String jobId : jobIds) {
@@ -302,18 +466,16 @@
.status(WaylineJobStatusEnum.CANCEL.getVal())
.completedTime(LocalDateTime.now())
.build());
- RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, workspaceId + RedisConst.DELIMITER + dockSn + RedisConst.DELIMITER + jobId);
}
}
public List<WaylineJobDTO> getJobsByConditions(String workspaceId, Collection<String> jobIds, WaylineJobStatusEnum status) {
return mapper.selectList(
- new LambdaQueryWrapper<WaylineJobEntity>()
- .eq(WaylineJobEntity::getWorkspaceId, workspaceId)
- .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(WaylineJobEntity::getWorkspaceId, workspaceId)
+ .eq(Objects.nonNull(status), WaylineJobEntity::getStatus, status.getVal())
+ .in(!CollectionUtils.isEmpty(jobIds), WaylineJobEntity::getJobId, jobIds))
.stream()
.map(this::entity2Dto)
.collect(Collectors.toList());
@@ -329,19 +491,26 @@
}
@Override
- public Boolean updateJob(WaylineJobDTO dto) {
+ public Boolean updateJob(WaylineJobDTO dto){
+
+ try {
+ if (dto.getStatus() == 3){
+ this.checkNextJob(dto);
+ }
+ }catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+
+
return mapper.update(this.dto2Entity(dto),
new LambdaUpdateWrapper<WaylineJobEntity>()
.eq(WaylineJobEntity::getJobId, dto.getJobId())) > 0;
}
@Override
- public PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize) {
- Page<WaylineJobEntity> pageData = mapper.selectPage(
- new Page<WaylineJobEntity>(page, pageSize),
- new LambdaQueryWrapper<WaylineJobEntity>()
- .eq(WaylineJobEntity::getWorkspaceId, workspaceId)
- .orderByDesc(WaylineJobEntity::getId));
+ public PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam) {
+ Page<WaylineJobEntity> pageData = mapper.getPage(new Page<WaylineJobEntity>(page, pageSize), waylineJobQueryParam, workspaceId);
+
List<WaylineJobDTO> records = pageData.getRecords()
.stream()
.map(this::entity2Dto)
@@ -350,12 +519,25 @@
return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
}
+ @Override
+ public List<WaylineJobDTO> getChildrenJobs(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
+
+ List<WaylineJobEntity> list= mapper.getJobs(workspaceId, waylineJobQueryParam);
+ List<WaylineJobDTO> records =list
+ .stream()
+ .map(this::entity2Dto)
+ .collect(Collectors.toList());
+
+ return records;
+ }
+
@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()
@@ -366,8 +548,11 @@
String topic = headers.get(MqttHeaders.RECEIVED_TOPIC).toString() + TopicConst._REPLY_SUF;
- DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + receiver.getGateway());
- Optional<WaylineJobDTO> waylineJobOpt = this.getJobByJobId(device.getWorkspaceId(), jobId);
+ Optional<DeviceDTO> deviceOpt = deviceRedisService.getDeviceOnline(receiver.getGateway());
+ if (deviceOpt.isEmpty()) {
+ return;
+ }
+ Optional<WaylineJobDTO> waylineJobOpt = this.getJobByJobId(deviceOpt.get().getWorkspaceId(), jobId);
if (waylineJobOpt.isEmpty()) {
builder.data(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT));
messageSender.publish(topic, builder.build());
@@ -415,21 +600,14 @@
String dockSn = jobOpt.get().getDockSn();
String key = RedisConst.MEDIA_HIGHEST_PRIORITY_PREFIX + dockSn;
- if (RedisOpsUtils.checkExist(key) &&
- jobId.equals(((MediaFileCountDTO) RedisOpsUtils.get(key)).getJobId())) {
+ if (RedisOpsUtils.checkExist(key) && jobId.equals(((MediaFileCountDTO) RedisOpsUtils.get(key)).getJobId())) {
return;
}
- ServiceReply reply = messageSender.publishWithReply(TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + dockSn + TopicConst.SERVICES_SUF,
- CommonTopicResponse.builder()
- .tid(UUID.randomUUID().toString())
- .bid(UUID.randomUUID().toString())
- .timestamp(System.currentTimeMillis())
- .method(MediaMethodEnum.UPLOAD_FLIGHT_TASK_MEDIA_PRIORITIZE.getMethod())
- .data(Map.of(MapKeyConst.FLIGHT_ID, jobId))
- .build());
+ ServiceReply reply = messageSender.publishServicesTopic(
+ dockSn, MediaMethodEnum.UPLOAD_FLIGHT_TASK_MEDIA_PRIORITIZE.getMethod(), Map.of(MapKeyConst.FLIGHT_ID, jobId));
if (ResponseResult.CODE_SUCCESS != reply.getResult()) {
- throw new RuntimeException("Failed to set media job upload priority. Error Code: " + reply.getResult());
+ throw new RuntimeException("设置媒体作业上传优先级失败. 错误码: " + reply.getResult());
}
}
@@ -458,13 +636,336 @@
.fileId(dto.getFileId())
.dockSn(dto.getDockSn())
.workspaceId(dto.getWorkspaceId())
- .taskType(dto.getTaskType())
- .waylineType(dto.getWaylineType())
+ .taskType(Optional.ofNullable(dto.getTaskType()).map(WaylineTaskTypeEnum::getVal).orElse(null))
+ .waylineType(Optional.ofNullable(dto.getWaylineType()).map(WaylineTemplateTypeEnum::getVal).orElse(null))
.username(dto.getUsername())
.rthAltitude(dto.getRthAltitude())
.outOfControlAction(dto.getOutOfControlAction())
.parentId(dto.getParentId())
.build();
+ }
+
+ @Override
+ public void updateJobStatus(String workspaceId, String jobId, UpdateJobParam param) {
+ Optional<WaylineJobDTO> waylineJobOpt = this.getJobByJobId(workspaceId, jobId);
+ if (waylineJobOpt.isEmpty()) {
+ throw new RuntimeException("任务不存在");
+ }
+ WaylineJobDTO waylineJob = waylineJobOpt.get();
+ WaylineJobStatusEnum statusEnum = this.getWaylineState(waylineJob.getDockSn());
+ if (statusEnum.getEnd() || WaylineJobStatusEnum.PENDING == statusEnum) {
+ throw new RuntimeException("航路线作业状态不匹配，无法执行操作.");
+ }
+
+ switch (param.getStatus()) {
+ case PAUSE:
+ pauseJob(workspaceId, waylineJob.getDockSn(), jobId, statusEnum);
+ break;
+ case RESUME:
+ resumeJob(workspaceId, waylineJob.getDockSn(), jobId, statusEnum);
+ break;
+ }
+
+ }
+
+ public WaylineJobStatusEnum getWaylineState(String dockSn) {
+ Optional<DeviceDTO> dockOpt = deviceRedisService.getDeviceOnline(dockSn);
+ if (dockOpt.isEmpty() || !StringUtils.hasText(dockOpt.get().getChildDeviceSn())) {
+ return WaylineJobStatusEnum.UNKNOWN;
+ }
+ Optional<OsdDockReceiver> dockOsdOpt = deviceRedisService.getDeviceOsd(dockSn, OsdDockReceiver.class);
+ Optional<OsdSubDeviceReceiver> deviceOsdOpt = deviceRedisService.getDeviceOsd(dockOpt.get().getChildDeviceSn(), OsdSubDeviceReceiver.class);
+ if (dockOsdOpt.isEmpty() || deviceOsdOpt.isEmpty() || DockModeCodeEnum.WORKING != dockOsdOpt.get().getModeCode()) {
+ return WaylineJobStatusEnum.UNKNOWN;
+ }
+
+ OsdSubDeviceReceiver osdDevice = deviceOsdOpt.get();
+ if (DeviceModeCodeEnum.WAYLINE == osdDevice.getModeCode()
+ || DeviceModeCodeEnum.MANUAL == osdDevice.getModeCode()
+ || DeviceModeCodeEnum.TAKEOFF_AUTO == osdDevice.getModeCode()) {
+ if (StringUtils.hasText(waylineRedisService.getPausedWaylineJobId(dockSn))) {
+ return WaylineJobStatusEnum.PAUSED;
+ }
+ if (waylineRedisService.getRunningWaylineJob(dockSn).isPresent()) {
+ return WaylineJobStatusEnum.IN_PROGRESS;
+ }
+ }
+ return WaylineJobStatusEnum.UNKNOWN;
+ }
+
+ @Override
+ public WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
+ WaylineJobEntity waylineJobEntity = mapper.getLatest(workspaceId, waylineJobQueryParam);
+ return waylineJobEntity;
+ }
+
+ @Override
+ public ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam) {
+
+ List<List<PointPOJO>> areaList = flyAreaParam.getAreaList();
+ PointPOJO dockPoint = flyAreaParam.getDockPoint();
+ Double radius = flyAreaParam.getRadius();
+
+ List<PointPOJO> centerPointList = new ArrayList<>();
+
+ //根据区域获取中心点
+ areaList.forEach(area -> {
+ PointPOJO centerPoint = GeoUtils.getCenterPoint(area);
+ centerPointList.add(centerPoint);
+ });
+
+ //巡逻目标集合
+ List<PointPOJO> targetList = new ArrayList<>();
+ //获取所有中心点之后,
+ centerPointList.forEach(centerPoint -> {
+ //判断各个中心点和机场点的距离
+ double distance = GeoUtils.distance(dockPoint.getLon(), dockPoint.getLat(), centerPoint.getLon(), centerPoint.getLat());
+
+ //当距离小于半径时,添加到目标集合中
+ if (distance <= radius) {
+ centerPoint.setDistance(distance);
+ targetList.add(centerPoint);
+ }
+ });
+
+ //按距离从近到远排序
+ targetList.sort(Comparator.comparing(PointPOJO::getDistance));
+
+ //后续为无人机操作逻辑
+ //先飞到空中
+ TakeoffToPointParam takeoffToPointParam = new TakeoffToPointParam();
+
+ takeoffToPointParam.setTargetLatitude(dockPoint.getLat());
+ takeoffToPointParam.setTargetLongitude(dockPoint.getLon());
+ //设置飞行高度
+ takeoffToPointParam.setTargetHeight(120.0);
+ //设置安全起飞高度
+ takeoffToPointParam.setSecurityTakeoffHeight(100.0);
+ //设置返航高度
+ takeoffToPointParam.setRthAltitude(100.0);
+ //设置失控操作
+ takeoffToPointParam.setRcLostAction(DroneRcLostActionEnum.RETURN_HOME);
+ //设置起飞速度
+ takeoffToPointParam.setMaxSpeed(10.0);
+ takeoffToPointParam.setExitWaylineWhenRcLost(WaylineRcLostActionEnum.EXECUTE_RC_LOST_ACTION);
+
+ return ResponseResult.success();
+// //起飞
+// ResponseResult responseResult = controlService.takeoffToPoint(sn, takeoffToPointParam);
+//
+// if (responseResult.getCode() != ResponseResult.CODE_SUCCESS) {
+// return responseResult;
+// }
+// //向目标点飞行
+//
+// FlyToPointParam flyToPointParam = new FlyToPointParam();
+// flyToPointParam.setMaxSpeed(14);
+// List<PointDTO> pointDTOS = new ArrayList<>();
+// targetList.forEach(pointPOJO -> {
+// PointDTO pointDTO = new PointDTO();
+// pointDTO.setHeight(150.0);
+// pointDTO.setLongitude(pointPOJO.getLon());
+// pointDTO.setLatitude(pointPOJO.getLat());
+//
+// pointDTOS.add(pointDTO);
+// });
+// flyToPointParam.setPoints(pointDTOS);
+// ResponseResult responseResult1 = controlService.flyToPoint(sn, flyToPointParam);
+//
+// if (responseResult1.getCode() != ResponseResult.CODE_SUCCESS) {
+// return responseResult1;
+// }
+//
+// //返航
+// //return_home
+//
+//
+// return ResponseResult.success();
+ }
+
+
+ @Override
+ public ResponseResult checkNextJob(WaylineJobDTO job) throws SQLException {
+
+ WaylineJobEntity params = new WaylineJobEntity();
+ params.setJobId(job.getJobId());
+
+
+ WaylineJobEntity job1 = mapper.selectOne(Wrappers.query(params));
+
+ WaylineJobEntity currentJob = JSON.parseObject(JSON.toJSONString(job1), WaylineJobEntity.class);
+
+ if (currentJob == null) {
+ return ResponseResult.error("该任务不存在");
+ }
+
+ //该任务没有多次时间
+ if (currentJob.getExecuteStartTimeArr() == null) {
+ return ResponseResult.success();
+ }
+
+ List<List<Long>> executeStartTimeArr = currentJob.getExecuteStartTimeArr();
+ int indexTime = -1;
+
+ long currentTime = System.currentTimeMillis();
+ for (int i = 0; i < executeStartTimeArr.size(); i++) {
+ Long startTime = executeStartTimeArr.get(i).get(0)*1000;
+ //如果当前时间小于开始时间
+ if (currentTime < startTime) {
+ //当前索引就是下一次要执行的时间
+ indexTime = i;
+ break;
+ }
+ }
+
+ if (indexTime == -1) {
+ return ResponseResult.success();
+ }
+
+
+ List<Long> timeArr = currentJob.getExecuteStartTimeArr().get(indexTime);
+ LocalDate date = LocalDate.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault());
+ LocalDateTime beginDate = LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault()));
+ LocalDateTime endDate = timeArr.size() > 1 && Objects.nonNull(timeArr.get(1)) ?
+ LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(1)), ZoneId.systemDefault()))
+ : beginDate;
+
+ long beginTime = beginDate
+ .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+ long endTime = endDate
+ .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+
+ //添加一条新数据
+ WaylineJobEntity waylineJobEntity = WaylineJobEntity.builder()
+ .jobId(UUID.randomUUID().toString())
+ //大于1则拿前面的parentId,为1则拿第0个的id
+ .parentId(indexTime > 1 ? currentJob.getParentId().toString() : currentJob.getId().toString())
+ .name(currentJob.getName())
+ .dockSn(currentJob.getDockSn())
+ .fileId(currentJob.getFileId())
+ .username(currentJob.getUsername())
+ .workspaceId(currentJob.getWorkspaceId())
+
+ .beginTime(beginTime)
+ .endTime(endTime)
+ .status(WaylineJobStatusEnum.PENDING.getVal())
+ .taskType(currentJob.getTaskType())
+ .waylineType(currentJob.getWaylineType())
+ .outOfControlAction(currentJob.getOutOfControlAction())
+ .batteryCapacity(currentJob.getBatteryCapacity())
+ .rthAltitude(currentJob.getRthAltitude())
+ .mediaCount(0)
+ .repFreVal(currentJob.getRepFreVal())
+ .repFreType(currentJob.getRepFreType())
+ .repRuleType(currentJob.getRepRuleType())
+ .repRuleVal(currentJob.getRepRuleVal())
+ .executeTimeArr(currentJob.getExecuteTimeArr())
+ .executeStartTimeArr(currentJob.getExecuteStartTimeArr())
+ .build();
+
+ Optional<WaylineJobDTO> waylineJobOpt = insertWaylineJob(waylineJobEntity);
+
+ if (waylineJobOpt.isEmpty()) {
+ return ResponseResult.error("任务创建失败");
+ }
+
+ WaylineJobDTO waylineJob = waylineJobOpt.get();
+
+ LocalDateTime beginTimeNext = LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(0)), ZoneId.systemDefault()));
+
+ LocalDateTime endTimeNext = timeArr.size() > 1 && Objects.nonNull(timeArr.get(1)) ?
+ LocalDateTime.of(date, LocalTime.ofInstant(Instant.ofEpochSecond(timeArr.get(1)), ZoneId.systemDefault())) : beginTimeNext;
+
+
+ //条件任务
+ if (currentJob.getTaskType() == 2) {
+ //如果是条件任务类型，需要在任务参数中添加条件。
+ waylineJob.setConditions(
+ WaylineTaskConditionDTO.builder()
+ .executableConditions(null)
+ .readyConditions(WaylineTaskReadyConditionDTO.builder()
+ .batteryCapacity(currentJob.getBatteryCapacity())
+ .beginTime(beginTime)
+ .endTime(endTime)
+ .build())
+ .build());
+ } else {
+ waylineJob.setBeginTime(beginDate);
+ }
+
+ ResponseResult response = this.publishOneFlightTask(waylineJob);
+ if (ResponseResult.CODE_SUCCESS != response.getCode()) {
+ return response;
+ }
+
+ return ResponseResult.success();
+ }
+
+
+
+
+ @Override
+ public WaylineJobCountDTO patrolStatistics(String workspaceId,String queryTime) {
+ WaylineJobCountDTO waylineJobCountDTO = new WaylineJobCountDTO();
+ List<WaylineJobEntity> list = mapper.patrolStatistics(workspaceId,queryTime);
+ if (!CollectionUtils.isEmpty(list)){
+ waylineJobCountDTO.setTotalNumber(list.size());
+ long totalTime = list.stream().mapToLong(s -> s.getEndTime() - s.getBeginTime()).sum() / 1000;
+ StringBuffer buffer = new StringBuffer();
+ long h = totalTime / 3600;
+ long m = (totalTime % 3600) / 60;
+ buffer.append(h).append(" h ");
+ buffer.append(m).append(" min");
+ waylineJobCountDTO.setTotalDuration(buffer.toString());
+ }
+ return waylineJobCountDTO;
+ }
+
+ @Override
+ public void updateJobCollect(WaylineJobEntity waylineJob) {
+ new LambdaUpdateChainWrapper<>(mapper)
+ .eq(WaylineJobEntity::getJobId,waylineJob.getJobId())
+ .set(WaylineJobEntity::getCollectStatus,waylineJob.getCollectStatus())
+ .set(WaylineJobEntity::getUserId,waylineJob.getUserId())
+ .update();
+ }
+
+ private void pauseJob(String workspaceId, String dockSn, String jobId, WaylineJobStatusEnum statusEnum) {
+ if (WaylineJobStatusEnum.PAUSED == statusEnum && jobId.equals(waylineRedisService.getPausedWaylineJobId(dockSn))) {
+ waylineRedisService.setPausedWaylineJob(dockSn, jobId);
+ return;
+ }
+
+ ServiceReply reply = messageSender.publishServicesTopic(
+ dockSn, WaylineMethodEnum.FLIGHT_TASK_PAUSE.getMethod(), "", jobId);
+ if (ResponseResult.CODE_SUCCESS != reply.getResult()) {
+ throw new RuntimeException("未能恢复航路作业。错误码： " + reply.getResult());
+ }
+ waylineRedisService.delRunningWaylineJob(dockSn);
+ waylineRedisService.setPausedWaylineJob(dockSn, jobId);
+ }
+
+ private void resumeJob(String workspaceId, String dockSn, String jobId, WaylineJobStatusEnum statusEnum) {
+ Optional<EventsReceiver<WaylineTaskProgressReceiver>> runningDataOpt = waylineRedisService.getRunningWaylineJob(dockSn);
+ if (WaylineJobStatusEnum.IN_PROGRESS == statusEnum && jobId.equals(runningDataOpt.map(EventsReceiver::getSn).get())) {
+ waylineRedisService.setRunningWaylineJob(dockSn, runningDataOpt.get());
+ return;
+ }
+ ServiceReply reply = messageSender.publishServicesTopic(
+ dockSn, WaylineMethodEnum.FLIGHT_TASK_RESUME.getMethod(), "", jobId);
+ if (ResponseResult.CODE_SUCCESS != reply.getResult()) {
+ throw new RuntimeException("未能恢复航路作业。错误码：: " + reply.getResult());
+ }
+
+ runningDataOpt.ifPresent(runningData -> waylineRedisService.setRunningWaylineJob(dockSn, runningData));
+ waylineRedisService.delPausedWaylineJob(dockSn);
+
+ if (deviceService.checkDockDrcMode(dockSn)) {
+ drcService.deviceDrcExit(workspaceId, DrcModeParam.builder().dockSn(dockSn)
+ .clientId(drcService.getDrcModeInRedis(dockSn)).build());
+ }
+
}
private WaylineJobDTO entity2Dto(WaylineJobEntity entity) {
@@ -484,7 +985,7 @@
.username(entity.getUsername())
.workspaceId(entity.getWorkspaceId())
.status(WaylineJobStatusEnum.IN_PROGRESS.getVal() == entity.getStatus() &&
- RedisOpsUtils.checkExist(RedisConst.WAYLINE_JOB_PAUSED_PREFIX + entity.getJobId()) ?
+ entity.getJobId().equals(waylineRedisService.getPausedWaylineJobId(entity.getDockSn())) ?
WaylineJobStatusEnum.PAUSED.getVal() : entity.getStatus())
.code(entity.getErrorCode())
.beginTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getBeginTime()), ZoneId.systemDefault()))
@@ -494,20 +995,22 @@
LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getExecuteTime()), ZoneId.systemDefault()) : null)
.completedTime(WaylineJobStatusEnum.find(entity.getStatus()).getEnd() ?
LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getUpdateTime()), ZoneId.systemDefault()) : null)
- .taskType(entity.getTaskType())
- .waylineType(entity.getWaylineType())
+ .taskType(WaylineTaskTypeEnum.find(entity.getTaskType()))
+ .waylineType(WaylineTemplateTypeEnum.find(entity.getWaylineType()))
.rthAltitude(entity.getRthAltitude())
.outOfControlAction(entity.getOutOfControlAction())
- .mediaCount(entity.getMediaCount());
+ .mediaCount(entity.getMediaCount())
+ .hasChildren(entity.getHasChildren());
if (Objects.nonNull(entity.getEndTime())) {
builder.endTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getEndTime()), ZoneId.systemDefault()));
}
- if (WaylineJobStatusEnum.IN_PROGRESS.getVal() == entity.getStatus() && RedisOpsUtils.getExpire(entity.getJobId()) > 0) {
- EventsReceiver<WaylineTaskProgressReceiver> taskProgress = (EventsReceiver<WaylineTaskProgressReceiver>) RedisOpsUtils.get(RedisConst.WAYLINE_JOB_RUNNING_PREFIX + entity.getDockSn());
- if (Objects.nonNull(taskProgress.getOutput()) && Objects.nonNull(taskProgress.getOutput().getProgress())) {
- builder.progress(taskProgress.getOutput().getProgress().getPercent());
- }
+ if (WaylineJobStatusEnum.IN_PROGRESS.getVal() == entity.getStatus()) {
+ builder.progress(waylineRedisService.getRunningWaylineJob(entity.getDockSn())
+ .map(EventsReceiver::getOutput)
+ .map(WaylineTaskProgressReceiver::getProgress)
+ .map(WaylineTaskProgress::getPercent)
+ .orElse(null));
}
if (entity.getMediaCount() == 0) {
@@ -520,7 +1023,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();
}
--
Gitblit v1.9.3