Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 98150b4c by lzy
Options

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

parents 2066a186 d0122b7d
Inline Side-by-side
Showing with 15 additions and 13 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
...@@ -112,13 +112,12 @@ public class BehaviorAlarm implements IAlarm { ...@@ -112,13 +112,12 @@ public class BehaviorAlarm implements IAlarm {
if (duration!= 0 && count / 1000 >= duration && StringUtils.equals(alarmRedisDTO.getAlarm(), CommonEnum.NO.getValue())) { if (duration!= 0 && count / 1000 >= duration && StringUtils.equals(alarmRedisDTO.getAlarm(), CommonEnum.NO.getValue())) {
log.error("空间雷达发出告警，设备plat_id：" + platDevice.getId()); log.error("空间雷达发出告警，设备plat_id：" + platDevice.getId());
if(duration1 != 0) { if(duration1 != 0) {
alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
RedisUtil.set(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId, alarmRedisDTO);
notice(platAlarmCheckDTO); notice(platAlarmCheckDTO);
}else { }else {
return; return;
} }
alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
RedisUtil.set(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId, alarmRedisDTO);
} }
} else {//没人 } else {//没人
......
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
...@@ -121,11 +121,12 @@ public class BreathAlarm implements IAlarm { ...@@ -121,11 +121,12 @@ public class BreathAlarm implements IAlarm {
} }
fillRemark(platAlarmCheckDTO, br, start, end); fillRemark(platAlarmCheckDTO, br, start, end);
platAlarmCheckDTO.setAbnormalValue(Convert.toStr(br)); platAlarmCheckDTO.setAbnormalValue(Convert.toStr(br));
notice(platAlarmCheckDTO);
alarmRedisDTO.setStartLong(endLong); alarmRedisDTO.setStartLong(endLong);
alarmRedisDTO.setStart(now); alarmRedisDTO.setStart(now);
alarmRedisDTO.setAlarm(CommonEnum.YES.getValue()); alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
RedisUtil.set(RedisConst.ALARM_DEVICE_BR_ID + deviceId, alarmRedisDTO); RedisUtil.set(RedisConst.ALARM_DEVICE_BR_ID + deviceId, alarmRedisDTO);
notice(platAlarmCheckDTO);
} }
} else { } else {
RedisUtil.delete(RedisConst.ALARM_DEVICE_BR_ID + deviceId); 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 { ...@@ -57,9 +57,9 @@ public class FallAlarm implements IAlarm {
log.error("长者跌倒，已告警过，设备plat_id:"+deviceId); log.error("长者跌倒，已告警过，设备plat_id:"+deviceId);
return; return;
} }
notice(platAlarmCheckDTO);
alarmRedisDTO.setAlarm(CommonEnum.YES.getValue()); alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID+ deviceId, alarmRedisDTO); RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID+ deviceId, alarmRedisDTO);
notice(platAlarmCheckDTO);
} else { } else {
if(StringUtils.equals(alarmRedisDTO.getAlarm(),CommonEnum.YES.getValue())) { if(StringUtils.equals(alarmRedisDTO.getAlarm(),CommonEnum.YES.getValue())) {
alarmRedisDTO.setAlarm(CommonEnum.NO.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 { ...@@ -110,11 +110,12 @@ public class HeartAlarm implements IAlarm {
} }
fillRemark(platAlarmCheckDTO, hr, start, end); fillRemark(platAlarmCheckDTO, hr, start, end);
platAlarmCheckDTO.setAbnormalValue(Convert.toStr(hr)); platAlarmCheckDTO.setAbnormalValue(Convert.toStr(hr));
notice(platAlarmCheckDTO);
alarmRedisDTO.setStartLong(endLong); alarmRedisDTO.setStartLong(endLong);
alarmRedisDTO.setStart(now); alarmRedisDTO.setStart(now);
alarmRedisDTO.setAlarm(CommonEnum.YES.getValue()); alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
RedisUtil.set(RedisConst.ALARM_DEVICE_HR_ID + deviceId, alarmRedisDTO); RedisUtil.set(RedisConst.ALARM_DEVICE_HR_ID + deviceId, alarmRedisDTO);
notice(platAlarmCheckDTO);
} }
} else { } 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 ...@@ -262,8 +262,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class); List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class);
treeList.forEach(e->{ treeList.forEach(e -> {
if(StringUtils.isBlank(e.getParentId())){ if (StringUtils.isBlank(e.getParentId())) {
e.setParentId(TreeConst.TOP_LEVEL); e.setParentId(TreeConst.TOP_LEVEL);
} }
}); });
...@@ -579,6 +579,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -579,6 +579,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
platElder.setStreetOrgId(userVO.getStreetOrgId()); platElder.setStreetOrgId(userVO.getStreetOrgId());
platElder.setOrgPath(userVO.getOrgPath()); platElder.setOrgPath(userVO.getOrgPath());
if (StringUtils.isNotBlank(dto.getBedId())) {
platElder.setCheckInTime(LocalDateTime.now());
}
save(platElder); save(platElder);
dto.setId(platElder.getId()); dto.setId(platElder.getId());
...@@ -627,7 +631,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -627,7 +631,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
personalConfigCacheUtil.put(healthInfo); personalConfigCacheUtil.put(healthInfo);
PlatElderOtherInfo otherInfo = platElderOtherInfoService.getOne(new QueryWrapper<PlatElderOtherInfo>().lambda() PlatElderOtherInfo otherInfo = platElderOtherInfoService.getOne(new QueryWrapper<PlatElderOtherInfo>().lambda()
.eq(PlatElderOtherInfo::getElderId, dto.getId())); .eq(PlatElderOtherInfo::getElderId, dto.getId()));
if (otherInfo == null) { if (otherInfo == null) {
...@@ -658,7 +661,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -658,7 +661,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
fillSpace(platElder); fillSpace(platElder);
if (StringUtils.isNotBlank(dto.getBedId())) { if (StringUtils.isNotBlank(dto.getBedId()) && !dto.getBedId().equals(oldBedId)) {
platElder.setCheckInTime(LocalDateTime.now()); platElder.setCheckInTime(LocalDateTime.now());
} }
...@@ -666,7 +669,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -666,7 +669,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
addOrEditExt(dto); addOrEditExt(dto);
if (StringUtils.isNotBlank(dto.getBedId())) { if (StringUtils.isNotBlank(dto.getBedId()) && !dto.getBedId().equals(oldBedId)) {
db.setCheckInTime(LocalDateTime.now()); db.setCheckInTime(LocalDateTime.now());
checkInInternal(dto.getBedId()); checkInInternal(dto.getBedId());
} }
...@@ -675,8 +678,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -675,8 +678,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
} }
} }
//@TenantIdIgnore //@TenantIdIgnore
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment