Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java

@@ -232,7 +232,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
         boolean spaceNoPersonFlag = false;
         for (PlatDevice device : spaceDeviceList) {
-            Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_SPACE_TEMP_DATA + device.getOriDeviceId(), -10,-1);
+            Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_SPACE_TEMP_DATA + device.getOriDeviceId(), currentSecond - 10,currentSecond);
             if (CollectionUtils.isEmpty(dataSet)) {
                 log.info("空间设备当前没有上报数据直接返回");
                 spaceNoPersonFlag = true;
@@ -278,7 +278,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
         }
         boolean fallNoPersonFlag = false;
         for (PlatDevice device : fallDeviceList) {
-            Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_FALL_TEMP_DATA + device.getOriDeviceId(), -10,-1);
+            Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_FALL_TEMP_DATA + device.getOriDeviceId(), currentSecond -10,currentSecond);
             if (CollectionUtils.isEmpty(dataSet)) {
                 log.info("跌倒设备当前没有上报数据直接返回");
                 fallNoPersonFlag = true;