二期 mqtt bug

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

@@ -330,14 +330,14 @@ public class RoomService {
         CareRoom careRoom = careRoomService.getOne(queryWrapper2);
 
         int careRoomResult = 0;
-        if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoom")) {
-            careRoomResult = 3;
-        } else if (careRoom == null || (StringUtils.isNotEmpty(careRoom.getAck()) && !"1".equals(careRoom.getAck()))) {
+        if (careRoom == null || (StringUtils.isNotEmpty(careRoom.getAck()) && !"1".equals(careRoom.getAck()))) { //失败
             careRoomResult = 2;
-        } else if (StringUtils.isEmpty(careRoom.getAck())) {
-            careRoomResult = 0;
-        } else {
+        } else if ("1".equals(careRoom.getAck())) { //成功
             careRoomResult = 1;
+        } else if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoom")) {
+            careRoomResult = 3;
+        } else {
+            careRoomResult = 0;
         }
 
         QueryWrapper<CareRoomSensor> queryWrapper3 = new QueryWrapper<>();
@@ -346,15 +346,14 @@ public class RoomService {
 
         int careRoomSensorResult = 0;
 
-        if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomSensor")) {
-            careRoomSensorResult = 3;
-        } else if (careRoomSensor == null || (StringUtils.isNotEmpty(careRoomSensor.getAck()) && !"1".equals(careRoomSensor.getAck()))) {
+        if (careRoomSensor == null || (StringUtils.isNotEmpty(careRoomSensor.getAck()) && !"1".equals(careRoomSensor.getAck()))) { //失败
             careRoomSensorResult = 2;
-        }
-        if (StringUtils.isEmpty(careRoomSensor.getAck())) {
-            careRoomSensorResult = 0;
-        } else {
+        } else if ("1".equals(careRoomSensor.getAck())) { //成功
             careRoomSensorResult = 1;
+        } else if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomSensor")) {
+            careRoomSensorResult = 3;
+        } else {
+            careRoomSensorResult = 0;
         }
 
         QueryWrapper<CareRoomGate> queryWrapper4 = new QueryWrapper<>();
@@ -364,14 +363,14 @@ public class RoomService {
 
          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()) && !"1".equals(careRoomGate.getAck()))) {
+             if(careRoomGate == null || (StringUtils.isNotEmpty(careRoomGate.getAck()) && !"1".equals(careRoomGate.getAck()))) {
                 careRoomGateResult = 2;
-            } else if(StringUtils.isEmpty(careRoomGate.getAck())) {
-                careRoomGateResult = 0;
-            } else {
+            } else if("1".equals(careRoomGate.getAck())) {
                 careRoomGateResult = 1;
+            } else if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomGate")) {
+                 careRoomGateResult = 3;
+             } else {
+                careRoomGateResult = 0;
             }
         } else { //不允许为空
             careRoomGateResult = 2;
@@ -384,14 +383,14 @@ public class RoomService {
 
         if(CollUtil.isNotEmpty(careRoomRegionList)){
             CareRoomRegion careRoomRegion = careRoomRegionList.get(0);
-            if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomRegion")) {
-                careRoomRegionResult = 3;
-            } else if (careRoomRegion == null|| (StringUtils.isNotEmpty(careRoomRegion.getAck()) && !"1".equals(careRoomRegion.getAck()))) {
+           if (careRoomRegion == null|| (StringUtils.isNotEmpty(careRoomRegion.getAck()) && !"1".equals(careRoomRegion.getAck()))) {
                 careRoomRegionResult = 2;
-            } else if(StringUtils.isEmpty(careRoomRegion.getAck())) {
-                careRoomRegionResult = 0;
+            }  else if("1".equals(careRoomRegion.getAck())) {
+               careRoomGateResult = 1;
+            }  else if (!redisUtil.hasKey(Constants.MQTT_DEV_JIHUO_TIMEOUT_KEY + ":" + devCode + ":" + "careRoomRegion")) {
+                careRoomRegionResult = 3;
             } else {
-                careRoomRegionResult = 1;
+                careRoomRegionResult = 0;
             }
         } else {//允许为空
             careRoomRegionResult = 1;