Merge branch 'dev' of git.xmmakeit.com:huangjiay/iot-platform-server into dev

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java

@@ -112,13 +112,12 @@ public class BehaviorAlarm implements IAlarm {
             if (duration!= 0 && count / 1000 >= duration && StringUtils.equals(alarmRedisDTO.getAlarm(), CommonEnum.NO.getValue())) {
                 log.error("空间雷达发出告警，设备plat_id：" + platDevice.getId());
                 if(duration1 != 0) {
+                    alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
+                    RedisUtil.set(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId, alarmRedisDTO);
                     notice(platAlarmCheckDTO);
                 }else {
                     return;
                 }
-                alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
-                RedisUtil.set(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId, alarmRedisDTO);
-
             }
 
         } else {//没人

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java

@@ -121,11 +121,12 @@ public class BreathAlarm implements IAlarm {
                 }
                 fillRemark(platAlarmCheckDTO, br, start, end);
                 platAlarmCheckDTO.setAbnormalValue(Convert.toStr(br));
-                notice(platAlarmCheckDTO);
                 alarmRedisDTO.setStartLong(endLong);
                 alarmRedisDTO.setStart(now);
                 alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
                 RedisUtil.set(RedisConst.ALARM_DEVICE_BR_ID + deviceId, alarmRedisDTO);
+                notice(platAlarmCheckDTO);
+
             }
         } else {
             RedisUtil.delete(RedisConst.ALARM_DEVICE_BR_ID + deviceId);

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java

@@ -57,9 +57,9 @@ public class FallAlarm implements IAlarm {
                 log.error("长者跌倒，已告警过，设备plat_id:"+deviceId);
                 return;
             }
-            notice(platAlarmCheckDTO);
             alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
             RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID+ deviceId, alarmRedisDTO);
+            notice(platAlarmCheckDTO);
         } else {
             if(StringUtils.equals(alarmRedisDTO.getAlarm(),CommonEnum.YES.getValue())) {
                 alarmRedisDTO.setAlarm(CommonEnum.NO.getValue());

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java

@@ -110,11 +110,12 @@ public class HeartAlarm implements IAlarm {
                 }
                 fillRemark(platAlarmCheckDTO, hr, start, end);
                 platAlarmCheckDTO.setAbnormalValue(Convert.toStr(hr));
-                notice(platAlarmCheckDTO);
+
                 alarmRedisDTO.setStartLong(endLong);
                 alarmRedisDTO.setStart(now);
                 alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
                 RedisUtil.set(RedisConst.ALARM_DEVICE_HR_ID + deviceId, alarmRedisDTO);
+                notice(platAlarmCheckDTO);
             }
         } else {
 

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

@@ -262,8 +262,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class);
 
-        treeList.forEach(e->{
-            if(StringUtils.isBlank(e.getParentId())){
+        treeList.forEach(e -> {
+            if (StringUtils.isBlank(e.getParentId())) {
                 e.setParentId(TreeConst.TOP_LEVEL);
             }
         });
@@ -579,6 +579,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         platElder.setStreetOrgId(userVO.getStreetOrgId());
         platElder.setOrgPath(userVO.getOrgPath());
 
+        if (StringUtils.isNotBlank(dto.getBedId())) {
+            platElder.setCheckInTime(LocalDateTime.now());
+        }
+
         save(platElder);
 
         dto.setId(platElder.getId());
@@ -627,7 +631,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         personalConfigCacheUtil.put(healthInfo);
 
 
-
         PlatElderOtherInfo otherInfo = platElderOtherInfoService.getOne(new QueryWrapper<PlatElderOtherInfo>().lambda()
                 .eq(PlatElderOtherInfo::getElderId, dto.getId()));
         if (otherInfo == null) {
@@ -658,7 +661,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         fillSpace(platElder);
 
-        if (StringUtils.isNotBlank(dto.getBedId())) {
+        if (StringUtils.isNotBlank(dto.getBedId()) && !dto.getBedId().equals(oldBedId)) {
             platElder.setCheckInTime(LocalDateTime.now());
         }
 
@@ -666,7 +669,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         addOrEditExt(dto);
 
-        if (StringUtils.isNotBlank(dto.getBedId())) {
+        if (StringUtils.isNotBlank(dto.getBedId()) && !dto.getBedId().equals(oldBedId)) {
             db.setCheckInTime(LocalDateTime.now());
             checkInInternal(dto.getBedId());
         }
@@ -675,8 +678,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         }
 
 
-
-
     }
 
     //@TenantIdIgnore