修改心跳功能

src/main/java/com/care/common/constant/Constants.java

@@ -26,8 +26,4 @@ public interface Constants {
      */
     String MQTT_DEV_JIHUO_TIMEOUT_KEY = "mqttDevJihuoTimeoutKey";
 
-    /**
-     * 设备心跳消息
-     */
-    String DEV_HEARTBEAT_MESSAGE = "I am alive!";
 }

src/main/java/com/care/mqtt/service/MqttMsgService.java

@@ -76,11 +76,7 @@ public class MqttMsgService {
     private void handleOrderEventMessage(String topic, String mqttMessageStr) {
 
         try {
-            //处理心跳,放入redis
-            if (Constants.DEV_HEARTBEAT_MESSAGE.equals(mqttMessageStr)) {
-                redisUtil.hset(RedisKeyConstant.MQTT_DEV_HEARBEAT_INFO, topic, "1", RedisKeyConstant.MQTT_DEV_HEARBEAT_INFO_TIME);
-                return;
-            }
+
 
             Map map = JSON.parseObject(mqttMessageStr);
             String type = (String) map.get("type");
@@ -89,6 +85,12 @@ public class MqttMsgService {
                 logger.error("不是正确格式的消息");
                 return;
             }
+            //处理心跳,放入redis
+            if ("HeartBeat".equals(type)) {
+                redisUtil.hset(RedisKeyConstant.MQTT_DEV_HEARBEAT_INFO, topic, "1", RedisKeyConstant.MQTT_DEV_HEARBEAT_INFO_TIME);
+                return;
+            }
+
             if(!"BreathHeartRate".equals(type) && !"FallDown".equals(type) && !"StayTooLong".equals(type)){
                // logger.error("不是要处理的消息");
                 return;

src/main/java/com/care/mqtt/tool/MqttMessageListener.java

@@ -36,7 +36,7 @@ public class MqttMessageListener implements IMqttMessageListener {
 //        System.out.println(mqttMessage.isDuplicate());
         String mqttMessageStr = mqttMessage.toString();
         //logger.info("mqttMessageStr == " + mqttMessageStr);
-        if(mqttMessageStr == null || (!mqttMessageStr.startsWith("{") && !Constants.DEV_HEARTBEAT_MESSAGE.equals(mqttMessageStr))){
+        if(mqttMessageStr == null || !mqttMessageStr.startsWith("{")) {
             logger.error("不是正确格式的消息");
             return;
         }