From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/自行车mqtt协议.md | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git "a/server/\350\207\252\350\241\214\350\275\246mqtt\345\215\217\350\256\256.md" "b/server/\350\207\252\350\241\214\350\275\246mqtt\345\215\217\350\256\256.md"
index 358b7b3..7bfe95f 100644
--- "a/server/\350\207\252\350\241\214\350\275\246mqtt\345\215\217\350\256\256.md"
+++ "b/server/\350\207\252\350\241\214\350\275\246mqtt\345\215\217\350\256\256.md"
@@ -1,45 +1,51 @@
# 鑷杞� mqtt 鍗忚鏂囨。
+## sub: device/lock/{siteId}/{lockId}/info {"bikeCode":"1234567890","lockId":"kjflksjlkfsjdlk","siteId": 456,"status":0,"code":"789"}
+
+## sub: device/lock/{siteId}/{lockId}/bike {"bikeCode":"1234567890","lockId":789,"siteId": 456,"time":"2023-10-13 10:12:90"}
+
+# 鑷杞� mqtt 鍗忚鏂囨。
+
## 閫氫俊瑙勮寖
- 姣忎釜绔欑偣涓�涓� mqtt 杩炴帴锛宑lientId 涓� SITE_绔欑偣缂栧彿
- 涓�涓珯鐐圭敱閮ㄧ讲鍦ㄤ笂浣嶆満涓婄殑杞欢閫氳繃can鎬荤嚎涓庡涓攣閫氫俊锛屽苟涓庢湇鍔″櫒閫氳繃mqtt鍋氭秷鎭浆鍙�
+- siteId + lockId 涓洪攣鐨勫敮涓�绱㈠紩锛屽湪鍚屼竴绔欑偣涓嬶紝lockId涓嶉噸澶�
-## sub: device/lock/{id}/info
-> **閿佷俊鎭紝鍦ㄥ垵濮嬪寲銆佺姸鎬佸彉鏇存椂浼氭帹閫侀攣鐨勫畬鏁寸姸鎬�**
+## sub: device/lock/{siteId}/{lockId}/info qos=1
+> **閿佷俊鎭紝鍦ㄧ珯鐐硅蒋浠跺惎鍔ㄥ垵濮嬪寲銆乬etInfo涓婚锛寀nlock涓婚鏃舵椂浼氭帹閫侀攣鐨勫畬鏁寸姸鎬�**
- 鏁版嵁
```json
{
- "siteId": "1015", // 绔欑偣缂栧彿
- "code": "01", // 閿佺紪鍙�
- "id": "123456789103", // 閿佸敮涓�id,鍚屼富棰榹id}
- "status": 1, // 鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
- "bikeCode": "1234567890" // 鑷杞c鍗″彿锛屾棤杞︿负绌�
+ "siteId": "1015", // 绔欑偣缂栧彿,鍚屼富棰榹siteId}
+ "lockId": 2, // 閿佺紪鍙�,鍚屼富棰榹lockId}
+ "status": 1, // 鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父, -1鑷涓�
+ "bikeCode": "12345678", // 鑷杞c鍗″彿锛�8浣嶆暟瀛�,濡傦細10000012锛屾棤杞︿负绌�
+ "timestamp": 1234567823423 // 鏃堕棿鎴筹紝 ms鍊�
}
```
-## pub: device/lock/{id}/getInfo
-> 瀹炴椂鑾峰彇閿佷俊鎭�
+## pub: device/lock/{siteId}/{lockId}/getInfo qos=0
+> 瀹炴椂鑾峰彇閿佷俊鎭�, 绔欑偣鍦ㄦ敹鍒版娑堟伅鏃讹紝鍙戦�佹寚瀹氳幏鍙栧埌閿佺殑瀹炴椂娑堟伅锛屽苟鍙戝竷鍒癷nfo涓婚
- 鏁版嵁
```json
-{}
```
-## pub: device/lock/{id}/unlock
+## pub: device/lock/{siteId}/{lockId}/unlock qos=0
> 寮�閿侊紝鎴愬姛澶辫触鍙叧娉╥nfo娑堟伅鎺ㄩ��
- 鏁版嵁
```json
-{}
```
-## sub: device/lock/{id}/bike
+## sub: device/lock/{siteId}/{lockId}/bike qos=1
> 杩樿溅, 杩樿溅鎴愬姛鏃讹紝鑾峰緱鎵�杩樿溅杈唅c鍗″彿鎺ㄩ��
- 鏁版嵁
```json
{
- "bikeCode": "1234567890",
- "lockId": 123,
- "siteId": 234,
- "time": "2023-10-13 10:12:90" // 绔欑偣涓婁綅鏈烘敹鍒拌繕杞︽寚浠ょ殑鏃堕棿锛屼粎鍋氬弬鑰冿紝璇蜂互鏈嶅姟鍣ㄦ椂闂翠负鍑�
+ "siteId": "1015", // 绔欑偣缂栧彿,鍚屼富棰榹siteId}
+ "lockId": 2, // 閿佺紪鍙�,鍚屼富棰榹lockId}
+ "status": 1, // 鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父, -1鑷涓�
+ "bikeCode": "12345678", // 鑷杞c鍗″彿锛�8浣嶆暟瀛�,濡傦細10000012锛屾棤杞︿负绌�
+ "timestamp": 1234567823423 // 鏃堕棿鎴筹紝 ms鍊硷紝绔欑偣涓婁綅鏈烘敹鍒拌繕杞︽寚浠ょ殑鏃堕棿锛屼粎鍋氬弬鑰冿紝璇蜂互鏈嶅姟鍣ㄦ椂闂翠负鍑�
}
```
\ No newline at end of file
--
Gitblit v1.9.3