From 4eb3c3caa8441c0adb03a2d99c1de2d7f0dcae4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Fri, 5 Jul 2024 13:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/datacollect/README.md | 87 +++++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 25 deletions(-)

diff --git a/docs/datacollect/README.md b/docs/datacollect/README.md
index 7d0433be..a89ec5d5 100644
--- a/docs/datacollect/README.md
+++ b/docs/datacollect/README.md
@@ -152,8 +152,8 @@ PS: 同一节点只允许建立一条连接。
 **数据体:**
 ```json
 {
-    //设备ID
-    "12351235213":{
+    "deviceId": "1123451235464",
+    "values": {
         //设备完整初始数据
         "Ia": 123.1,
         "Ib": 122.1,
@@ -162,22 +162,12 @@ PS: 同一节点只允许建立一条连接。
         "Ub": 221.4,
         "Uc": 223.1,
         "Switch01": 1
-    },
-    "12351235214":{
-        //设备完整初始数据
-        "Ia": 122.1,
-        "Ib": 123.1,
-        "Ic": 121.1,
-        "Ua": 224.3,
-        "Ub": 223.4,
-        "Uc": 223.1,
-        "Switch01": 0
     }
 }
 
-````
+```
 
-### 模拟量上报
+### 模拟量数据上报
 
 ?> 方向: `采集程序` -> `系统`
 
@@ -186,33 +176,80 @@ PS: 同一节点只允许建立一条连接。
 **数据体:**
 ```json
 {
-    //key为设备ID
-    "1123451235": {
+    //数据时间(毫秒)
+    "dataTime": 123123123123,
+    //设备ID
+    "deviceId": "1123451235464",
+    "values": {
         //key为属性名
         "Ia": 123.1,
         "Ib": 122.1,
         "Ic": 123.1
-    },
-    "351235123" : {
-        "P" : 1213.1,
-        "Q" : 123.1
     }
 }
 ```
 
-### 状态量上报
+### 状态量数据上报
 
 ?> 方向: `采集程序` -> `系统`
 
-**命令：** `discreteData`
+**命令：** `stateData`
 
 **数据体:**
 ```json
 {
-    //key为设备ID
-    "1123451235": {
+    //数据时间(毫秒)
+    "dataTime": 123123123123,
+    //设备ID
+    "deviceId": "1123451235464",
+    "values": {
         //key为属性名
         "Switch01": 1
-    },
+    }
 }
 ```
+
+### 历史模拟量数据上报
+
+?> 方向: `采集程序` -> `系统`
+
+**命令：** `historyAnalogData`
+
+**数据体:**
+
+```json
+{
+    //数据时间(毫秒)
+    "dataTime": 123123123123,
+    //设备ID
+    "deviceId": "1123451235464",
+    "values": {
+        //key为属性名
+        "Ia": 123.1,
+        "Ib": 122.1,
+        "Ic": 123.1
+    }
+}
+```
+
+
+### 历史状态量数据上报
+
+?> 方向: `采集程序` -> `系统`
+
+**命令：** `historyStateData`
+
+**数据体:**
+
+```json
+{
+    //数据时间(毫秒)
+    "dataTime": 123123123123,
+    //设备ID
+    "deviceId": "1123451235464",
+    "values": {
+        //key为属性名
+        "Switch01": 1
+    }
+}
+```
\ No newline at end of file