From a0a030ec98b711e82720be38c6ea9ddf4a07a22b Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期五, 25 七月 2025 15:08:23 +0800 Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/herb --- jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.java | 25 ++++++++++++++++++------- 1 files changed, 18 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 f7867b5..2b95f9f 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 @@ -32,6 +32,9 @@ //绉诲姩绔繙绋嬭姹傛寚浠� String MOBILE_REQ_EQU_CMD = MOBILE_UP_PREFIX + "/req/equ/cmd"; + //绉诲姩绔姹傛煡璇竴娆¤澶囧疄鏃舵晠闅滃憡璀� + String MOBILE_REQ_EQU_REAL_FAULT = MOBILE_UP_PREFIX + "/req/real/fault"; + /**************************绉诲姩绔悜鏈嶅姟绔姹傛寚浠nd*******************************/ @@ -43,7 +46,7 @@ //鏈嶅姟绔笅琛屾寚浠ゅ墠缂�锛堣繑鍥炵粰绉诲姩绔級 String SERVICE_DOWN_PREFIX = "service/down/res"; //杩斿洖绉诲姩绔煡璇㈣澶囩姸鎬� - String SERVICE_RES_EQU_STATU = SERVICE_DOWN_PREFIX + "/%s/statu"; + String SERVICE_RES_EQU_STATU = SERVICE_DOWN_PREFIX + "/equ/statu/%s"; //杩斿洖绉诲姩绔繙绋嬭姹傛寚浠� String SERVICE_RES_EQU_CMD = SERVICE_DOWN_PREFIX + "/%s/cmd"; @@ -57,7 +60,14 @@ String SERVICE_BROADCAST_PREFIX = "service/broadcast"; //鏈嶅姟绔悜鍚勭鎴峰鎴风鍙戦�佸疄鏃舵晠闅滃箍鎾� - String SERVICE_BROADCAST_TENANT_REAL_FAULT = SERVICE_BROADCAST_PREFIX + "/real/fault/%s" ; + String SERVICE_BROADCAST_TENANT_REAL_FAULT = SERVICE_BROADCAST_PREFIX + "/real/fault/%s"; + //鏈嶅姟绔悜绉诲姩绔洖澶嶄竴娆¤澶囧疄鏃舵晠闅滃憡璀� + String SERVICE_ONECE_TENANT_REAL_FAULT = "service/onece" + "/real/fault/%s"; + // 鐩戞祴瀹㈡埛绔繛鎺ユ垨鏂紑锛屾帹閫佹秷鎭埌绉熸埛鍐呮墍鏈夌Щ鍔ㄧ鎻愰啋鏇存柊骞茬嚗璁惧杩炴帴淇℃伅锛�%s-绉熸埛锛� + String SERVICE_BROADCAST_TENANT_UPDATE_EQU_STATU = SERVICE_BROADCAST_PREFIX + "/update/equ/statu/%s"; + + //鏈嶅姟绔悜绉诲姩绔彂閫佸共鐕ヨ澶囧疄鏃舵暟鎹紙%s-绉熸埛锛� + String SERVICE_BROADCAST_TENANT_REAL_DATA = SERVICE_BROADCAST_PREFIX + "/real/data/%s"; @@ -72,6 +82,7 @@ String TENANT_UP_PREFIX = "tenant/up"; String TENANT_UP_PREFIX_REALTIME_DATA = TENANT_UP_PREFIX + "/realTime/data"; + String TENANT_UP_PREFIX_REALTIME_DATA_EQP = TENANT_UP_PREFIX + "/realTime/data/eqp/test"; String TENANT_UP_PREFIX_FAULT_DATA = TENANT_UP_PREFIX + "/fault/data"; String TENANT_UP_PREFIX_REAL_FAULT_DATA = TENANT_UP_PREFIX + "/real/fault/data"; @@ -90,17 +101,17 @@ /**************************start*******************************/ /**************************end*******************************/ - //redis缂撳瓨 - //client - String MQTT_REAL_FAULT = "mqtt:real:fault"; + + //鎵�鏈夌鎴风殑瀹炴椂鎶ヨ锛�%s锛氱鎴穒d锛� + String MQTT_REAL_FAULT = "mqtt:real:fault:%s"; + //service(cloud) //鍦ㄧ嚎瀹㈡埛绔� String MQTT_ONLINE_CLIENT = "mqtt:online:client:%s"; - //鎵�鏈夌鎴风殑瀹炴椂鎶ヨ锛�%s锛氱鎴穒d锛� - String MQTT_CLOUD_REAL_FAULT = "mqtt:real:fault:%s"; +// String MQTT_CLOUD_REAL_FAULT = "mqtt:real:fault:%s"; -- Gitblit v1.9.3