fix：打印log

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

@@ -190,14 +190,16 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             if (StringUtils.equals(person,"1")) {
             if (StringUtils.equals(person,"1")) {
                 // 判断是否在床睡觉
                 // 判断是否在床睡觉
                 Integer sleepTimeActionThreshold = getSleepTimeActionThreshold();
                 Integer sleepTimeActionThreshold = getSleepTimeActionThreshold();
-                Long sleepTimeActionDuration = getSleepTimeActionDuration();
+                long sleepTimeActionDuration = getSleepTimeActionDuration();
                 Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_BR_ANALYSIS + platDevice.getOriDeviceId(), currentSecond - sleepTimeActionDuration, currentSecond);
                 Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_BR_ANALYSIS + platDevice.getOriDeviceId(), currentSecond - sleepTimeActionDuration, currentSecond);
-                if (CollectionUtils.isNotEmpty(dataSet) && dataSet.size() >= sleepTimeActionDuration * 0.9 ) {
+                boolean empty = CollectionUtils.isNotEmpty(dataSet);
+                log.info("当前呼吸设备:{},大小：{}",platDevice.getOriDeviceId(),empty ? dataSet.size() : 0);
+                if (empty && dataSet.size() >= sleepTimeActionDuration * 0.9 ) {
                     boolean flag = dataSet.stream().allMatch(s -> {
                     boolean flag = dataSet.stream().allMatch(s -> {
                         JSONObject result = JSON.parseObject(s);
                         JSONObject result = JSON.parseObject(s);
                         JSONObject properties = (JSONObject)result.get("properties");
                         JSONObject properties = (JSONObject)result.get("properties");
                         Integer bodymove = Integer.valueOf(properties.getString("bodymove"));
                         Integer bodymove = Integer.valueOf(properties.getString("bodymove"));
-                        return bodymove.compareTo(sleepTimeActionThreshold) <= 0 && Integer.parseInt(properties.getString("person")) == 1;
+                        return bodymove.compareTo(sleepTimeActionThreshold) <= 0 && properties.getInteger("person") == 1;
                     });
                     });
                     log.info("计算后睡眠集合大小:{}",dataSet.size());
                     log.info("计算后睡眠集合大小:{}",dataSet.size());
                     if (flag) {
                     if (flag) {
@@ -247,7 +249,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                 String angle = properties.getString("angle");
                 String angle = properties.getString("angle");
                 vo.setX(Integer.parseInt(distance) * Math.cos(90 - Integer.parseInt(angle)));
                 vo.setX(Integer.parseInt(distance) * Math.cos(90 - Integer.parseInt(angle)));
                 vo.setY(Integer.parseInt(distance) * Math.sin(90 - Integer.parseInt(angle)));
                 vo.setY(Integer.parseInt(distance) * Math.sin(90 - Integer.parseInt(angle)));
-                int personState = Integer.parseInt(properties.getString("personState"));
+                int personState = properties.getInteger("personState");
                 vo.setPersonState(personState);
                 vo.setPersonState(personState);
                 if (personState == 0) {
                 if (personState == 0) {
                     vo.setX(0.0);
                     vo.setX(0.0);
@@ -295,13 +297,13 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                 List<Integer> list = track == null ? Lists.newArrayList() : (List<Integer>) track;
                 List<Integer> list = track == null ? Lists.newArrayList() : (List<Integer>) track;
                 vo.setX(CollectionUtils.isNotEmpty(list) ? list.get(1).doubleValue() : null);
                 vo.setX(CollectionUtils.isNotEmpty(list) ? list.get(1).doubleValue() : null);
                 vo.setY(CollectionUtils.isNotEmpty(list) ? list.get(2).doubleValue(): null);
                 vo.setY(CollectionUtils.isNotEmpty(list) ? list.get(2).doubleValue(): null);
-                int personState = Integer.parseInt(properties.getString("personState"));
+                int personState = properties.getInteger("personState");
                 vo.setPersonState(personState);
                 vo.setPersonState(personState);
                 if (personState == 0) {
                 if (personState == 0) {
                     vo.setX(0.0);
                     vo.setX(0.0);
                     vo.setY(0.0);
                     vo.setY(0.0);
                 }
                 }
-                vo.setPerson(Integer.valueOf(properties.getString("person")));
+                vo.setPerson(properties.getIntValue("person"));
                 return vo;
                 return vo;
             }).collect(Collectors.toList());
             }).collect(Collectors.toList());