From 2d8ded3e77b22e44985265ca4063102662e452c1 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Mon, 12 Dec 2022 18:32:19 +0800
Subject: [PATCH] initial v1.3.1
---
src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java
index 123660b..89a7308 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java
@@ -9,6 +9,7 @@
import com.dji.sample.manage.model.dto.DeviceDictionaryDTO;
import com.dji.sample.manage.model.dto.DevicePayloadDTO;
import com.dji.sample.manage.model.entity.DevicePayloadEntity;
+import com.dji.sample.manage.model.enums.DeviceDomainEnum;
import com.dji.sample.manage.model.receiver.DevicePayloadReceiver;
import com.dji.sample.manage.model.receiver.FirmwareVersionReceiver;
import com.dji.sample.manage.service.ICapacityCameraService;
@@ -42,9 +43,6 @@
@Autowired
private ICapacityCameraService capacityCameraService;
- @Autowired
- private RedisOpsUtils redisOps;
-
@Override
public Integer checkPayloadExist(String payloadSn) {
DevicePayloadEntity devicePayload = mapper.selectOne(
@@ -71,7 +69,7 @@
String deviceSn = payloadReceiverList.get(0).getDeviceSn();
String key = RedisConst.DEVICE_ONLINE_PREFIX + deviceSn;
- DeviceDTO device = (DeviceDTO) redisOps.get(key);
+ DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(key);
List<DevicePayloadDTO> payloads = new ArrayList<>();
for (DevicePayloadReceiver payloadReceiver : payloadReceiverList) {
@@ -86,7 +84,7 @@
payloads = this.getDevicePayloadEntitiesByDeviceSn(deviceSn);
}
device.setPayloadsList(payloads);
- redisOps.setWithExpire(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn(), device, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.setWithExpire(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn(), device, RedisConst.DEVICE_ALIVE_SECOND);
return true;
}
@@ -132,7 +130,7 @@
String deviceSn = payloadReceiverList.stream().findAny().get().getDeviceSn();
String key = RedisConst.STATE_PAYLOAD_PREFIX + deviceSn;
// Solve timing problems
- long last = (long) Objects.requireNonNullElse(redisOps.get(key), 0L);
+ long last = (long) Objects.requireNonNullElse(RedisOpsUtils.get(key), 0L);
if (last > timestamp) {
return;
}
@@ -152,7 +150,7 @@
// Save the new payload information.
boolean isSave = this.savePayloadDTOs(needToSave);
if (isSave) {
- redisOps.setWithExpire(key, timestamp, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.setWithExpire(key, timestamp, RedisConst.DEVICE_ALIVE_SECOND);
}
log.debug("The result of saving the payloads is {}.", isSave);
}
@@ -204,7 +202,7 @@
if (arr.length == 3) {
Optional<DeviceDictionaryDTO> dictionaryOpt = dictionaryService
- .getOneDictionaryInfoByTypeSubType(arr[0], arr[1]);
+ .getOneDictionaryInfoByTypeSubType(DeviceDomainEnum.PAYLOAD.getVal(), arr[0], arr[1]);
dictionaryOpt.ifPresent(dictionary ->
builder.payloadName(dictionary.getDeviceName())
.payloadDesc(dictionary.getDeviceDesc()));
--
Gitblit v1.9.3