fix: 超过最大大小直接删除

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

@@ -88,10 +88,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
     @Autowired
     private IotProductDeviceService iotProductDeviceService;
-
-    @Autowired
-    private PlatElderDayReportDayService platElderDayReportDayService;
-
     @Autowired
     private SaasSleepAnalysisModelService saasSleepAnalysisModelService;
     @Autowired
@@ -176,32 +172,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
     }
 
-    private List<DeviceInfoContentSpace> getNowDataSpace(String elderId, String deviceId) {
-
-        List<PlatDevice> deviceList = getSpaceDevice(elderId, deviceId);
-
-        if (CollectionUtils.isEmpty(deviceList)) {
-            return null;
-        }
-
-        return deviceList.stream().map(e -> iotProductDeviceService.getLastDeviceLogSpace(e.getOriDeviceId(), 10)).filter(Objects::nonNull)
-                .collect(Collectors.toList());
-
-    }
-
-    private List<DeviceInfoContentFall> getNowDataFall(String elderId, String deviceId) {
-
-        List<PlatDevice> deviceList = getFallDevice(elderId, deviceId);
-
-        if (CollectionUtils.isEmpty(deviceList)) {
-            return null;
-        }
-
-        return deviceList.stream().map(e -> iotProductDeviceService.getLastDeviceLogFall(e.getOriDeviceId(), 10)).filter(Objects::nonNull)
-                .collect(Collectors.toList());
-
-    }
-
 
     @Override
     public PlatElderRealTimeNowVO nowStatus(PlatElderIdDTO platElderIdDTO) {
@@ -248,12 +218,12 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                 }
             }
         } else {
+            log.info("当前呼吸设备没有上报数据直接返回：" + platElderIdDTO.getElderId());
             return platElderRealTimeNowVO;
         }
         List<PlatDevice> spaceDeviceList = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         List<PlatDevice> fallDeviceList = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         boolean sportFlag = true;
-        boolean hasPeronFlag = true;  // 有没有人
         for (PlatDevice device : spaceDeviceList) {
             // 无人
             Map<Object, Object> entries = redisTemplate.opsForHash().entries(DEVICE_SPACE_TEMP_DATA + device.getOriDeviceId());
@@ -262,7 +232,11 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             }
             Collection<Object> values = entries.values();
             log.info("空间设备当前大小：{}",values.size());
-            if (values.size() < 10 || values.size() > 12)  {
+            if (values.size() < 10)  {
+                continue;
+            }
+            if (values.size() > 11) {
+                redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_SPACE_TEMP_DATA + "*")));
                 continue;
             }
             List<PlatElderCoordinateVO> voList = values.stream().map(entity -> {
@@ -308,7 +282,11 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                 continue;
             }
             Collection<Object> values = entries.values();
-            if (values.size() < 10 || values.size() > 12)  {
+            if (values.size() < 10)  {
+                continue;
+            }
+            if (values.size() > 11) {
+                redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_FALL_TEMP_DATA + "*")));
                 continue;
             }
             log.info("跌倒设备当前大小：{}",values.size());
@@ -354,14 +332,10 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue());
             return platElderRealTimeNowVO;
         }
+        log.info("当前设备无状态匹配直接返回：" + platElderIdDTO.getElderId());
         return platElderRealTimeNowVO;
     }
 
-    public static void main(String[] args) {
-        boolean b = new BigDecimal(5).compareTo(new BigDecimal(2)) > 0;
-        System.out.println(b);
-    }
-
     private Long getSleepTimeActionDuration() {
         String sleepTimeActionDuration = "";
         String result = redisTemplate.opsForValue().get(SLEEP_ANALYSIS_KEY);

server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderCenterWechatServiceImpl.java

@@ -203,19 +203,6 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
 
                         PlatElderRealTimeNowVO realTimeNowVO = platElderRealTimeService.nowStatus(platElderIdDTO);
                         r.setElderStatus(realTimeNowVO.getStatus());
-                        /*PlatElderRealTimeNowVO nowStatus = platElderRealTimeService.nowStatus(platElderIdDTO);
-                        if(nowStatus.getStatus()!=null){
-                            DeviceInfoContentBreathe deviceInfoContentBreathe = workStationService.getNowDataBreathe(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
-                            if (DeviceInfoContentBreatheEnum.PersonStateEnum.NOBODY.getValue().equals(nowStatus.getStatus())) {
-                                r.setElderStatus(WorkStationStatusEnum.NowStatus.OUT.getValue());
-                            } else if (nowStatus.getBodyMove() != null && nowStatus.getBodyMove() > turnedThreshold) {
-                                r.setElderStatus(WorkStationStatusEnum.NowStatus.TURNED.getValue());
-                            } else {
-                                List<PlatElderCoordinateVO> coordinateList = platElderDayReportDayService.coordinateList(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId(), start, now);
-                                workStationService.nowStatusRest(r, platElderIdDTO, deviceInfoContentBreathe, coordinateList);
-                                workStationService.nowStatusSleep(r, platElderIdDTO, deviceInfoContentBreathe);
-                            }
-                        }*/
                     }
                 }
                 vo.setList(roomBedVos);