feat，设备信息推送

server-common/src/main/java/com/makeit/module/iot/enums/DeviceState.java

@@ -7,11 +7,12 @@ import lombok.Getter;
 @AllArgsConstructor
 @AllArgsConstructor
 @Getter
 @Getter
 public enum DeviceState {
 public enum DeviceState {
-    notActive("禁用"),
-    offline("离线"),
-    online("在线");
+    notActive("notActive","禁用"),
+    offline("offline","离线"),
+    online("online","在线");
 
 
-    private final String text;
+    private final String value;
+    private final String name;
 
 
 
 
 }
 }

server-common/src/main/java/com/makeit/module/iot/enums/DeviceType.java

@@ -7,10 +7,11 @@ import lombok.Getter;
 @AllArgsConstructor
 @AllArgsConstructor
 @Getter
 @Getter
 public enum DeviceType {
 public enum DeviceType {
-    device("直连设备"),
-    childrenDevice("网关子设备"),
-    gateway("网关设备");
+    device("device","直连设备"),
+    childrenDevice("device","网关子设备"),
+    gateway("网关设备","网关设备");
 
 
+    private final String value;
     private final String text;
     private final String text;
 
 
 
 

server-web/src/main/java/com/makeit/mqtt/MqttConfig.java

@@ -44,9 +44,7 @@ public class MqttConfig {
 
 
     @Bean
     @Bean
     public MqttPushClient getMqttPushClient() {
     public MqttPushClient getMqttPushClient() {
-
-        String iotToken = iotTokenService.getIotToken();
-        clientId = StringUtils.isNotEmpty(iotToken) ? iotToken : clientId;
+        clientId = StringUtils.isNotEmpty(clientId) ? clientId : iotTokenService.getIotToken();
         mqttPushClient.connect(hostUrl, clientId, username, password, timeout, keepalive);
         mqttPushClient.connect(hostUrl, clientId, username, password, timeout, keepalive);
         // 订阅主题
         // 订阅主题
         mqttPushClient.subscribe(defaultTopic, 0);
         mqttPushClient.subscribe(defaultTopic, 0);

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -84,7 +84,7 @@ public class PushCallback implements MqttCallback {
         DeviceInfo device = JSON.parseObject(payload, DeviceInfo.class);
         DeviceInfo device = JSON.parseObject(payload, DeviceInfo.class);
         // todo
         // todo
 
 
-        checkAlarm(device);
+       // checkAlarm(device);
     }
     }
 
 
     @Override
     @Override

server-web/src/main/resources/application-dev.yml

@@ -115,7 +115,7 @@ mqtt:
   username: admin|1693982115969
   username: admin|1693982115969
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   hostUrl: tcp://124.71.33.17:11883
   hostUrl: tcp://124.71.33.17:11883
-  clientId: ab3a2fd694c8c838aba2686df3a80e7b
+  clientId:
   defaultTopic: /device/*/*/**
   defaultTopic: /device/*/*/**
   timeout: 10
   timeout: 10
   keepalive: 60
   keepalive: 60

server-web/src/main/resources/application-test.yml

@@ -112,7 +112,7 @@ mqtt:
   username: admin|1693982115969
   username: admin|1693982115969
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   hostUrl: tcp://124.71.33.17:11883
   hostUrl: tcp://124.71.33.17:11883
-  clientId: ab3a2fd694c8c838aba2686df3a80e7b
+  clientId:
   defaultTopic: /device/*/*/**
   defaultTopic: /device/*/*/**
   timeout: 10
   timeout: 10
   keepalive: 60
   keepalive: 60