From 7c585586e9bea943161676bd9d127e81123891c3 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 11 十二月 2024 11:01:35 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into herb

---
 jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.java |   78 +++++++++++++++++++++++++++++++++-----
 1 files changed, 67 insertions(+), 11 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..f4c85dd 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";
@@ -24,18 +31,13 @@
   String MOBILE_QUERY_EQU_STATU = MOBILE_UP_PREFIX + "/query/equ/statu";
   //绉诲姩绔繙绋嬭姹傛寚浠�
   String MOBILE_REQ_EQU_CMD = MOBILE_UP_PREFIX + "/req/equ/cmd";
+
+  //绉诲姩绔姹傛煡璇竴娆¤澶囧疄鏃舵晠闅滃憡璀�
+  String MOBILE_REQ_EQU_REAL_FAULT = MOBILE_UP_PREFIX + "/req/real/fault";
+
+
   /**************************绉诲姩绔悜鏈嶅姟绔姹傛寚浠nd*******************************/
 
-
-
-  /**************************绉熸埛绔悜鏈嶅姟绔彂閫佹暟鎹畇tart*******************************/
-
-
-  String TENANT_UP_PREFIX = "tenant/up";
-  String TENANT_UP_PREFIX_REALTIME_DATA = TENANT_UP_PREFIX + "/realTime/data";
-
-
-  /**************************绉熸埛绔悜鏈嶅姟绔彂閫佹暟鎹甧nd*******************************/
 
 
 
@@ -47,11 +49,65 @@
   String SERVICE_RES_EQU_STATU = SERVICE_DOWN_PREFIX + "/%s/statu";
   //杩斿洖绉诲姩绔繙绋嬭姹傛寚浠�
   String SERVICE_RES_EQU_CMD = SERVICE_DOWN_PREFIX + "/%s/cmd";
+
+
+
   /**************************鏈嶅姟绔悜绉诲姩绔搷搴旀寚浠nd*******************************/
 
 
+  /**************************鏈嶅姟绔悜绉诲姩绔彂閫佸箍鎾璼tart*******************************/
+  //骞挎挱绫诲瀷鎺ㄩ�佹棤鍏崇Щ鍔ㄧ璁惧id锛屽悜鎵�鏈夊湪绾跨Щ鍔ㄧ鍙戦��
+  String SERVICE_BROADCAST_PREFIX = "service/broadcast";
+
+  //鏈嶅姟绔悜鍚勭鎴峰鎴风鍙戦�佸疄鏃舵晠闅滃箍鎾�
+  String  SERVICE_BROADCAST_TENANT_REAL_FAULT = SERVICE_BROADCAST_PREFIX + "/real/fault/%s";
+  //鏈嶅姟绔悜绉诲姩绔洖澶嶄竴娆¤澶囧疄鏃舵晠闅滃憡璀�
+  String  SERVICE_ONECE_TENANT_REAL_FAULT = "service/onece" + "/real/fault/%s";
+
+
+
+  /**************************鏈嶅姟绔悜绉诲姩绔彂閫佸箍鎾璭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_REAL_FAULT_DATA = TENANT_UP_PREFIX + "/real/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::";
+  //client
+  String MQTT_REAL_FAULT = "mqtt:real:fault";
+
+
+
+  //service(cloud)
+  //鍦ㄧ嚎瀹㈡埛绔�
+  String MQTT_ONLINE_CLIENT = "mqtt:online:client:%s";
+  //鎵�鏈夌鎴风殑瀹炴椂鎶ヨ锛�%s锛氱鎴穒d锛�
+  String MQTT_CLOUD_REAL_FAULT = "mqtt:real:fault:%s";
+
+
 
 
 }

--
Gitblit v1.9.3