Merge branch 'master' of git@192.168.168.201:panzhaov5/bsth_control.git

李强
2 parents 9ea5dda5 77fceaca
Showing 1 changed file with 110 additions and 2 deletions
README.md
@@ -14,7 +14,7 @@
         * [越站](#越站)
         * [聚集](#聚集)
         * [掉线](#掉线)
-
+    * [消息上传下发](#消息上传下发)
 ----------
@@ -197,4 +197,112 @@
 | lon | float | 经度 | 
 | lat | float | 纬度|
 | timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
 \ No newline at end of file
+| createDate | Date | 时间 |
+
+##  消息上传下发
+----------
+### 消息下发接口
+[http://192.168.168.192:8080/transport_server/message](http://192.168.168.192:8080/transport_server/message/)
+    
+<span style="color: red">Request</span>:
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0x60,
+    "data":{
+        "companyCode":22,//short
+	    "deviceId":"029L2222",//string
+    	"timestamp":134326,//long
+	    "instructType":00,//short
+	    "dispatchInstruct":0x00,//short
+	    "msgId":12345,//long
+	    "alarmTime":201606012000,//long
+	    "serviceState":00000000,//long
+	    "txtContent":"你好"//string
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.companyCode | short | 公司代码 |
+| data.deviceId | string | 设备编号 |
+| data.timestamp | long | 时间戳 |
+| data.instructType | short | 保留 默认0 |
+| data.dispatchInstruct | short | 调度指令 |
+| data.msgId | long | 同上 |
+| data.alarmTime | long | 闹钟 |
+| data.serviceState | long | 多状态字节 |
+| data.txtContent | string | 下发的消息文本 |
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0x64,
+    "data":{
+        "cityCode":22,//int
+	    "deviceId":"029L2222",//string
+    	"lineId":"134326"//string
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.cityCode | short | 城市区号 |
+| data.deviceId | string | 设备编号 |
+| data.lineId | string | 线路编号 |
+
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0x86,
+        "requestAck":0x06 // 0x06同意 0x15不同意
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+| data.requestAck | short | 请求应答字 |
+
+<span style="color: red">Response</span>:
+```json
+{
+    "errCode":0
+}
+```
+
+### 消息上传接口
+    
+<span style="color: red">Request</span>:
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "status":0,// 0x80时无数据 0表示失败 1表示成功或设备确认 2表示驾驶员阅读
+    "operCode":0x80,// 消息确认时无数据
+    "data":{
+        "operCode":0x26,//二级协议
+        "requestCode":22//short
+    }// 消息确认将无数据
+}
+```
+
+<span style="color: red">Response</span>:
+```json
+{
+    "errCode":0
+}
+```
 \ No newline at end of file