Bladeren bron

修改msg bug

suntianwu 3 jaren geleden
bovenliggende
commit
55f151e2d0
1 gewijzigde bestanden met toevoegingen van 0 en 13 verwijderingen
  1. 0 13
      src/main/java/com/care/mqtt/service/MqttMsgService.java

+ 0 - 13
src/main/java/com/care/mqtt/service/MqttMsgService.java

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