二期 管家小程序

src/main/java/com/care/installation/service/RoomService.java

@@ -318,7 +318,7 @@ public class RoomService {
         CareRoom careRoom = careRoomService.getOne(queryWrapper2);
 
         int careRoomResult = 0;
-        if (redisUtil.get(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoom") == null) {
+        if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoom")) {
             careRoomResult = 3;
         } else if (careRoom == null || (StringUtils.isNotEmpty(careRoom.getAck()) && !"true".equals(careRoom.getAck()))) {
             careRoomResult = 2;
@@ -333,7 +333,8 @@ public class RoomService {
         CareRoomSensor careRoomSensor = careRoomSensorService.getOne(queryWrapper3);
 
         int careRoomSensorResult = 0;
-        if (redisUtil.get(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomSensor") == null) {
+
+        if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomSensor")) {
             careRoomSensorResult = 3;
         } else if (careRoomSensor == null || (StringUtils.isNotEmpty(careRoomSensor.getAck()) && !"true".equals(careRoomSensor.getAck()))) {
             careRoomSensorResult = 2;
@@ -348,11 +349,12 @@ public class RoomService {
         queryWrapper4.lambda().eq(CareRoomGate::getRoomId,devCode);
         List<CareRoomGate> careRoomGateList = careRoomGateService.list(queryWrapper4);
         int careRoomGateResult = 0;
-        if (redisUtil.get(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomGate") == null) {
-            careRoomGateResult = 3;
-        } else if(CollUtil.isNotEmpty(careRoomGateList)){
-            CareRoomGate careRoomGate = careRoomGateList.get(0);
-            if(careRoomGate == null || (StringUtils.isNotEmpty(careRoomGate.getAck()) && !"true".equals(careRoomGate.getAck()))) {
+
+         if(CollUtil.isNotEmpty(careRoomGateList)){
+             CareRoomGate careRoomGate = careRoomGateList.get(0);
+             if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomGate")) {
+                 careRoomGateResult = 3;
+             } else if(careRoomGate == null || (StringUtils.isNotEmpty(careRoomGate.getAck()) && !"true".equals(careRoomGate.getAck()))) {
                 careRoomGateResult = 2;
             } else if(StringUtils.isEmpty(careRoomGate.getAck())) {
                 careRoomGateResult = 0;
@@ -367,11 +369,12 @@ public class RoomService {
         queryWrapper5.lambda().eq(CareRoomRegion::getRoomId,devCode);
         List<CareRoomRegion> careRoomRegionList = careRoomRegionService.list(queryWrapper5);
         int careRoomRegionResult = 0;
-        if (redisUtil.get(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomRegion") == null) {
-            careRoomRegionResult = 3;
-        } else if(CollUtil.isNotEmpty(careRoomRegionList)){
+
+        if(CollUtil.isNotEmpty(careRoomRegionList)){
             CareRoomRegion careRoomRegion = careRoomRegionList.get(0);
-            if (careRoomRegion == null|| (StringUtils.isNotEmpty(careRoomRegion.getAck()) && !"true".equals(careRoomRegion.getAck()))) {
+            if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomRegion")) {
+                careRoomRegionResult = 3;
+            } else if (careRoomRegion == null|| (StringUtils.isNotEmpty(careRoomRegion.getAck()) && !"true".equals(careRoomRegion.getAck()))) {
                 careRoomRegionResult = 2;
             } else if(StringUtils.isEmpty(careRoomRegion.getAck())) {
                 careRoomRegionResult = 0;