|
@@ -223,19 +223,24 @@ public class MqttMsgService {
|
|
return distance;
|
|
return distance;
|
|
}
|
|
}
|
|
private void handleOptInOut(Map msg,CareDevice careDevice,Date date){
|
|
private void handleOptInOut(Map msg,CareDevice careDevice,Date date){
|
|
|
|
+ System.out.println("1111111111");
|
|
Integer event = (Integer) msg.get("event"); //1 进事件,2 出事件
|
|
Integer event = (Integer) msg.get("event"); //1 进事件,2 出事件
|
|
Integer type = (Integer) msg.get("type");
|
|
Integer type = (Integer) msg.get("type");
|
|
Integer subType = (Integer) msg.get("subType");
|
|
Integer subType = (Integer) msg.get("subType");
|
|
Integer tid = (Integer) msg.get("tid");
|
|
Integer tid = (Integer) msg.get("tid");
|
|
if(DeviceSceneEnum.TOILET.getValue().equals(careDevice.getDevScene()) && type == 2 ){ //type字段的2代表进出事件,卫生间
|
|
if(DeviceSceneEnum.TOILET.getValue().equals(careDevice.getDevScene()) && type == 2 ){ //type字段的2代表进出事件,卫生间
|
|
|
|
+ System.out.println("22222222222222");
|
|
if(subType == 1) { //subtype字段的1代表门
|
|
if(subType == 1) { //subtype字段的1代表门
|
|
if(event == 1) {
|
|
if(event == 1) {
|
|
|
|
+ System.out.println("3333333333333");
|
|
//进事件,先存起来
|
|
//进事件,先存起来
|
|
redisUtil.hset(RedisKeyConstant.OPTINOUT_TOILET_INFO, careDevice.getDevCode()+ "_" + tid, System.currentTimeMillis(), RedisKeyConstant.OPTINOUT_TOILET_INFO_TIME);
|
|
redisUtil.hset(RedisKeyConstant.OPTINOUT_TOILET_INFO, careDevice.getDevCode()+ "_" + tid, System.currentTimeMillis(), RedisKeyConstant.OPTINOUT_TOILET_INFO_TIME);
|
|
} else {//出事件,
|
|
} else {//出事件,
|
|
|
|
+ System.out.println("4444444444444444");
|
|
//先查是否存在进事件
|
|
//先查是否存在进事件
|
|
Long inTime = (Long)redisUtil.hget(RedisKeyConstant.OPTINOUT_TOILET_INFO,careDevice.getDevCode()+ "_" + tid);
|
|
Long inTime = (Long)redisUtil.hget(RedisKeyConstant.OPTINOUT_TOILET_INFO,careDevice.getDevCode()+ "_" + tid);
|
|
if(inTime != null) { //存在进事件
|
|
if(inTime != null) { //存在进事件
|
|
|
|
+ System.out.println("55555555555555");
|
|
CareToiletInoutDetail careToiletInoutDetail = new CareToiletInoutDetail();
|
|
CareToiletInoutDetail careToiletInoutDetail = new CareToiletInoutDetail();
|
|
careToiletInoutDetail.setDevId(careDevice.getId());
|
|
careToiletInoutDetail.setDevId(careDevice.getId());
|
|
careToiletInoutDetail.setTid(tid);
|
|
careToiletInoutDetail.setTid(tid);
|
|
@@ -247,6 +252,7 @@ public class MqttMsgService {
|
|
careToiletInoutDetailService.save(careToiletInoutDetail);
|
|
careToiletInoutDetailService.save(careToiletInoutDetail);
|
|
redisUtil.hset(RedisKeyConstant.OPTINOUT_TOILET_INFO, careDevice.getDevCode()+ "_" + tid, null, RedisKeyConstant.OPTINOUT_TOILET_INFO_TIME);
|
|
redisUtil.hset(RedisKeyConstant.OPTINOUT_TOILET_INFO, careDevice.getDevCode()+ "_" + tid, null, RedisKeyConstant.OPTINOUT_TOILET_INFO_TIME);
|
|
} else { //不存在进事件
|
|
} else { //不存在进事件
|
|
|
|
+ System.out.println("66666666666666");
|
|
//do nothing
|
|
//do nothing
|
|
}
|
|
}
|
|
}
|
|
}
|