From 765f87b17ff1709d5307a6c01bbc40bcfd1c4d48 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 18 十一月 2024 16:58:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/herb' into herb

---
 jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.java |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.java
index 0ad3087..addf80e 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.java
@@ -5,6 +5,13 @@
  */
 public interface MqttConstant {
 
+  /**************************** MQTT瑙掕壊 start *************************************/
+  String ROLE_ADMIN = "admin";
+  String ROLE_USER = "user";
+
+
+  /**************************** MQTT瑙掕壊 end *************************************/
+
   /**************************绯荤粺璁㈤槄strat*******************************/
   //涓婄嚎璁㈤槄
   String MQTT_TOPIC_ONLINE = "$SYS/brokers/+/clients/+/connected";
@@ -28,14 +35,7 @@
 
 
 
-  /**************************绉熸埛绔悜鏈嶅姟绔彂閫佹暟鎹畇tart*******************************/
 
-
-  String TENANT_UP_PREFIX = "tenant/up";
-  String TENANT_UP_PREFIX_REALTIME_DATA = TENANT_UP_PREFIX + "/realTime/data";
-
-
-  /**************************绉熸埛绔悜鏈嶅姟绔彂閫佹暟鎹甧nd*******************************/
 
 
 
@@ -49,9 +49,32 @@
   String SERVICE_RES_EQU_CMD = SERVICE_DOWN_PREFIX + "/%s/cmd";
   /**************************鏈嶅姟绔悜绉诲姩绔搷搴旀寚浠nd*******************************/
 
+  /**************************绉熸埛绔悜鏈嶅姟绔彂閫佹暟鎹畇tart*******************************/
+
+
+  String TENANT_UP_PREFIX = "tenant/up";
+  String TENANT_UP_PREFIX_REALTIME_DATA = TENANT_UP_PREFIX + "/realTime/data";
+  String TENANT_UP_PREFIX_FAULT_DATA = TENANT_UP_PREFIX + "/fault/data";
+
+  String TENANT_UP_PREFIX_EQU = TENANT_UP_PREFIX + "/equipment";
+
+
+  /**************************绉熸埛绔悜鏈嶅姟绔彂閫佹暟鎹甧nd*******************************/
+
+  /**************************鏈嶅姟绔悜绉熸埛绔姹傛暟鎹畇tart*******************************/
+
+
+  String SERVICE_REQ_PREFIX = "service/req";
+
+
+  /**************************鏈嶅姟绔悜绉熸埛绔姹傛暟鎹甧nd*******************************/
+
+  /**************************start*******************************/
+  /**************************end*******************************/
 
   //redis缂撳瓨
   String MQTT_ONLINE_CLIENT = "mqtt:online:client::";
+  String MQTT_EQP_FAULT = "mqtt:eqp:fault";
 
 
 }

--
Gitblit v1.9.3