From 642dac3e705380eea241648f875836e64dbc809e Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Thu, 18 May 2023 17:43:06 +0800
Subject: [PATCH] Merge branch 'v1.5.0' What's new? 1. Add new model: DJI Matrices 350 RTK. 2. Update file hms.json. 3. Fixed some issues.
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineRedisServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineRedisServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineRedisServiceImpl.java
index b93e155..3307533 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineRedisServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineRedisServiceImpl.java
@@ -3,8 +3,8 @@
import com.dji.sample.component.mqtt.model.EventsReceiver;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
-import com.dji.sample.wayline.model.dto.ConditionalWaylineJobKey;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
+import com.dji.sample.wayline.model.dto.WaylineJobKey;
import com.dji.sample.wayline.model.dto.WaylineTaskProgressReceiver;
import com.dji.sample.wayline.service.IWaylineRedisService;
import org.springframework.stereotype.Service;
@@ -65,12 +65,17 @@
}
@Override
+ public Boolean delBlockedWaylineJobId(String dockSn) {
+ return RedisOpsUtils.del(RedisConst.WAYLINE_JOB_BLOCK_PREFIX + dockSn);
+ }
+
+ @Override
public void setConditionalWaylineJob(WaylineJobDTO waylineJob) {
if (!StringUtils.hasText(waylineJob.getJobId())) {
throw new RuntimeException("Job id can't be null.");
}
RedisOpsUtils.setWithExpire(RedisConst.WAYLINE_JOB_CONDITION_PREFIX + waylineJob.getJobId(), waylineJob,
- (Duration.between(waylineJob.getEndTime(), LocalDateTime.now()).getSeconds()));
+ Math.abs(Duration.between(waylineJob.getEndTime(), LocalDateTime.now()).getSeconds()));
}
@Override
@@ -84,29 +89,29 @@
}
@Override
- public Boolean addPrepareConditionalWaylineJob(WaylineJobDTO waylineJob) {
+ public Boolean addPreparedWaylineJob(WaylineJobDTO waylineJob) {
if (Objects.isNull(waylineJob.getBeginTime())) {
return false;
}
// value: {workspace_id}:{dock_sn}:{job_id}
- return RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_CONDITION_PREPARE,
+ return RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_PREPARED,
waylineJob.getWorkspaceId() + RedisConst.DELIMITER + waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(),
waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
}
@Override
- public Optional<ConditionalWaylineJobKey> getNearestConditionalWaylineJob() {
- return Optional.ofNullable(RedisOpsUtils.zGetMin(RedisConst.WAYLINE_JOB_CONDITION_PREPARE))
- .map(Object::toString).map(ConditionalWaylineJobKey::new);
+ public Optional<WaylineJobKey> getNearestPreparedWaylineJob() {
+ return Optional.ofNullable(RedisOpsUtils.zGetMin(RedisConst.WAYLINE_JOB_PREPARED))
+ .map(Object::toString).map(WaylineJobKey::new);
}
@Override
- public Double getConditionalWaylineJobTime(ConditionalWaylineJobKey jobKey) {
- return RedisOpsUtils.zScore(RedisConst.WAYLINE_JOB_CONDITION_PREPARE, jobKey.getKey());
+ public Double getPreparedWaylineJobTime(WaylineJobKey jobKey) {
+ return RedisOpsUtils.zScore(RedisConst.WAYLINE_JOB_PREPARED, jobKey.getKey());
}
@Override
- public Boolean removePrepareConditionalWaylineJob(ConditionalWaylineJobKey jobKey) {
- return RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_CONDITION_PREPARE, jobKey.getKey());
+ public Boolean removePreparedWaylineJob(WaylineJobKey jobKey) {
+ return RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_PREPARED, jobKey.getKey());
}
}
--
Gitblit v1.9.3