|
|
@@ -258,17 +258,22 @@ public class MqttMsgService {
|
|
|
}
|
|
|
}
|
|
|
} else if(DeviceSceneEnum.BEDROOM.getValue().equals(careDevice.getDevScene()) && type == 1 ) { //type字段的1代表上下床事件，卧室
|
|
|
+ System.out.println("aaaaaaaaaaaa");
|
|
|
if(subType == 1) { //subtype字段的1代表床
|
|
|
+ System.out.println("bbbbbbbbbbbbbb");
|
|
|
if(event == 1) {
|
|
|
+ System.out.println("ccccccccccccc");
|
|
|
//上床事件，先存起来
|
|
|
redisUtil.hset(RedisKeyConstant.OPTINOUT_BEDROOM_INFO, careDevice.getDevCode()+ "_" + tid, System.currentTimeMillis(), RedisKeyConstant.OPTINOUT_BEDROOM_INFO_TIME);
|
|
|
//更新数据库dev
|
|
|
careDevice.setInbedStatus(DeviceInbedStateEnum.INBED.getValue());
|
|
|
careDeviceService.updateById(careDevice);
|
|
|
} else {//下床事件,
|
|
|
+ System.out.println("dddddddddddd");
|
|
|
//先查是否存在上床事件
|
|
|
Long inTime = (Long)redisUtil.hget(RedisKeyConstant.OPTINOUT_BEDROOM_INFO,careDevice.getDevCode()+ "_" + tid);
|
|
|
if(inTime != null) { //存在上床事件
|
|
|
+ System.out.println("eeeeeeeeeee");
|
|
|
CareBedroomInbedDetail careBedroomInbedDetail = new CareBedroomInbedDetail();
|
|
|
careBedroomInbedDetail.setDevId(careDevice.getId());
|
|
|
careBedroomInbedDetail.setTid(tid);
|
|
|
@@ -280,11 +285,13 @@ public class MqttMsgService {
|
|
|
careBedroomInbedDetailService.save(careBedroomInbedDetail);
|
|
|
redisUtil.hset(RedisKeyConstant.OPTINOUT_BEDROOM_INFO, careDevice.getDevCode()+ "_" + tid, null, RedisKeyConstant.OPTINOUT_BEDROOM_INFO_TIME);
|
|
|
} else { //不存在上床事件
|
|
|
+ System.out.println("fffffffffff");
|
|
|
//do nothing
|
|
|
}
|
|
|
//更新数据库dev
|
|
|
careDevice.setInbedStatus(DeviceInbedStateEnum.OUTBED.getValue());
|
|
|
careDeviceService.updateById(careDevice);
|
|
|
+ System.out.println("eeeeeeeeeeeee");
|
|
|
}
|
|
|
}
|
|
|
}
|
suntianwu