From 425d595ded20c0127402fc0cb3b20799c18b4a81 Mon Sep 17 00:00:00 2001
From: stone <827672943@qq.com>
Date: Fri, 21 Apr 2023 09:29:51 +0800
Subject: [PATCH] aaa

---
 psdc-admin/src/main/resources/application-dev.yml  |  6 ++++--
 .../java/com/psdc/mqtt/MqttProviderConfig.java     | 14 ++++++++------
 .../main/java/com/psdc/mqtt/MyMQTTCallback.java    |  3 +--
 .../psdc/controller/system/SysUserController.java  |  1 +
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/psdc-admin/src/main/resources/application-dev.yml b/psdc-admin/src/main/resources/application-dev.yml
index 8909491..b58b253 100644
--- a/psdc-admin/src/main/resources/application-dev.yml
+++ b/psdc-admin/src/main/resources/application-dev.yml
@@ -143,5 +143,7 @@ mqtt:
   timeOut: 10
   #心跳间隔时间,默认3000
   keepAlive: 200
-  topic1: /psdc/devices/1672921261340/datas/report/dataTimingReport
-  topic2: /psdc/report/dataTimingReport
+  #主题
+  dataTopic: /psdc/devices/1672921261340/datas/report/dataTimingReport
+  statusTopic: /psdc/devices/1672921261340/datas/report/statusReport
+  warnTopic: /psdc/devices/1672921261340/datas/report/devWarning
diff --git a/psdc-common/src/main/java/com/psdc/mqtt/MqttProviderConfig.java b/psdc-common/src/main/java/com/psdc/mqtt/MqttProviderConfig.java
index dc2c62b..d8da9eb 100644
--- a/psdc-common/src/main/java/com/psdc/mqtt/MqttProviderConfig.java
+++ b/psdc-common/src/main/java/com/psdc/mqtt/MqttProviderConfig.java
@@ -35,12 +35,14 @@ public class MqttProviderConfig {
     @Value("${mqtt.keepAlive}")
     private int keepAlive;
 
-    @Value("${mqtt.topic1}")
-    private String topic1;
+    @Value("${mqtt.dataTopic}")
+    private String dataTopic;
 
-    @Value("${mqtt.topic2}")
-    private String topic2;
+    @Value("${mqtt.statusTopic}")
+    private String statusTopic;
 
+    @Value("${mqtt.warnTopic}")
+    private String warnTopic;
 
     /**
      * 客户端对象
@@ -63,8 +65,8 @@ public class MqttProviderConfig {
             try {
                 myMQTTClient.connect();
                 //不同的主题
-                myMQTTClient.subscribe(topic1, 0);
-                myMQTTClient.subscribe(topic2, 0);
+                myMQTTClient.subscribe(dataTopic, 0);
+                myMQTTClient.subscribe(statusTopic, 0);
                 return myMQTTClient;
             } catch (MqttException e) {
                 log.error("MQTT connect exception,connect time = " + i);
diff --git a/psdc-common/src/main/java/com/psdc/mqtt/MyMQTTCallback.java b/psdc-common/src/main/java/com/psdc/mqtt/MyMQTTCallback.java
index c310920..55fe53f 100644
--- a/psdc-common/src/main/java/com/psdc/mqtt/MyMQTTCallback.java
+++ b/psdc-common/src/main/java/com/psdc/mqtt/MyMQTTCallback.java
@@ -34,8 +34,7 @@ public class MyMQTTCallback implements MqttCallback {
                     //连接成功，重新订阅主题
                     log.warn("重新链接成功，重新订阅主题");
                     MqttClient client = MyMQTTClient.getClient();
-                    // client.subscribe("/hwj1/test/devices/1672921261340/datas/report/dataTimingReport", 1);
-                    // client.subscribe("/hwj1/jn/datas/report/timeWarning", 1);
+                    client.subscribe("/psdc/devices/1672921261340/datas/report/#", 1);
                     log.warn("重新订阅成功");
                     return ;
                 }
diff --git a/psdc-web/src/main/java/com/psdc/controller/system/SysUserController.java b/psdc-web/src/main/java/com/psdc/controller/system/SysUserController.java
index 38b37f6..fe8fcb0 100644
--- a/psdc-web/src/main/java/com/psdc/controller/system/SysUserController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/system/SysUserController.java
@@ -1,6 +1,7 @@
 package com.psdc.controller.system;
 
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;