修改文件结构

开放平台/开放平台接口文档(内部版).md → 产品/开放平台/开放平台接口文档(内部版).md

@@ -11,6 +11,7 @@
 | 1.0.2 | `HTTP`协议电量查询，实现按月、按天、按小时查询。             | 季建新 | 2021.2.21 |
 | 1.0.3 | `UDP`协议电量查询，实现按月、按天、按小时查询。              | 季建新 | 2021.2.21 |
 | 1.0.4 | 获取`HTTP`协议模块是否在线; 模块和项目绑定；模块和项目解除绑定；获取60分钟内负荷; 获取任意多开关任意时间段内的电量。 | 季建新 | 2021.3.19 |
+| 1.0.5 | 获取项目下的模块；获取项目下的所有模块及线路；获取任意多个线路的累积负荷；获取任意多开关任意时间段内的按小时、按天、按月电量；获取任意多开关任意时间段内的电量。 | 季建新 | 2021.3.22 |
 
 
 
@@ -358,6 +359,168 @@ Body:
 
 
 
+## 获取项目下的模块
+
+请求
+
+```
+POST http://47.103.61.198:5008/api/hd/macs/byproject
+
+Headers:
+
+Content-Type: application/json
+DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
+
+Body:
+
+{
+	"ProjectId":"2"
+}
+```
+
+
+
+响应
+
+```
+{
+    "data": {
+        "macs": [
+            "187ED53338C4",
+            "187ED5311111",
+            "187ED5322222",
+            "187ED5333333",
+            "187ED5344444",
+            "187ED5355555",
+            "187ED5366666"
+        ],
+        "projectId": "2"
+    },
+    "isError": false,
+    "message": "success",
+    "code": 200
+}
+```
+
+
+
+## 获取项目下的所有模块及线路
+
+请求
+
+```
+POST http://47.103.61.198:5008/api/hd/addrs/byprojectmac
+
+Headers:
+
+Content-Type: application/json
+DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
+
+Body:
+
+{
+	"ProjectId":"2"
+}
+```
+
+
+
+响应
+
+```
+{
+    "data": {
+        "projectId": "2",
+        "macs": {
+            "187ED53338C4": [
+                "1",
+                "2",
+                "3"
+            ],
+            "187ED5311111": [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10"
+            ],
+            "187ED5322222": [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10"
+            ],
+            "187ED5333333": [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10"
+            ],
+            "187ED5344444": [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10"
+            ],
+            "187ED5355555": [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10"
+            ],
+            "187ED5366666": [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9",
+                "10"
+            ]
+        }
+    },
+    "isError": false,
+    "message": "success",
+    "code": 200
+}
+```
+
+
+
+
+
 ## 获取最近60分钟的负荷
 
 当需要统计某个项目、公司、位置下的某些开关最近60分钟内负荷时调用本接口。
@@ -655,7 +818,7 @@ Body:
 
 
 
-## 获取某个线路的累积负荷
+## 获取任意多个线路的累积负荷
 
 
 
@@ -672,8 +835,7 @@ DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
 Body:
 
 {
-	"Mac":"187ED5311111",
-	"Addr":1
+	"Macs":["187ED5311111_1", "187ED5322222_2"]//一个元素就代表一个开关，不能是187ED5311111_1,2
 }
 ```
 
@@ -684,7 +846,10 @@ Body:
 ```
 {
     "data": {
-        "wp": 120
+        "macs": {
+            "187ED5311111_1": 48.9,
+            "187ED5322222_2": 123.8
+        }
     },
     "isError": false,
     "message": "success",
@@ -742,14 +907,14 @@ Body:
 
 
 
-## 获取任意多开关任意时间段内的按小时电量
+## 获取任意多开关任意时间段内的按小时、按天、按月电量
 
 
 
-请求
+请求, 按小时
 
 ```
-POST http://47.103.61.198:5008/api/breaker/power/random/byhours
+POST http://47.103.61.198:5008/api/breaker/power/random/by
 
 Headers:
 
@@ -767,16 +932,18 @@ Body:
 	"EndYear":2021,
 	"EndMonth":3,
 	"EndDay":5,
-	"EndHour":0
+	"EndHour":0,
+	"PType":"HOURS"
 }
 
 ```
 
-响应
+响应, 按小时
 
 ```
 {
     "data": {
+    	"pType": "HOURS",
         "powers": {
             "2021-03-01 00:00:00.000": 0.72,
             "2021-03-01 01:00:00.000": 0.72,
@@ -883,3 +1050,270 @@ Body:
 }
 ```
 
+
+
+请求, 按天
+
+```
+POST http://47.103.61.198:5008/api/breaker/power/random/by
+
+Headers:
+
+Content-Type: application/json
+DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
+
+Body:
+
+{
+	"MacAddrs":["187ED5311111_1", "187ED5322222_2"],
+	"StartYear":2021,
+	"StartMonth":3,
+	"StartDay":1,
+	"StartHour":0,
+	"EndYear":2021,
+	"EndMonth":3,
+	"EndDay":5,
+	"EndHour":0,
+	"PType":"DAY"
+}
+
+```
+
+响应, 按天
+
+```
+{
+    "data": {
+        "pType": "DAY",
+        "powers": {
+            "2021-03-01 00:00:00.000": 42.5,
+            "2021-03-02 00:00:00.000": 42.5,
+            "2021-03-03 00:00:00.000": 42.5,
+            "2021-03-04 00:00:00.000": 42.5,
+            "2021-03-05 00:00:00.000": 42.5
+        }
+    },
+    "isError": false,
+    "message": "success",
+    "code": 200
+}
+```
+
+请求，按月
+
+```
+POST http://47.103.61.198:5008/api/breaker/power/random/by
+
+Headers:
+
+Content-Type: application/json
+DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
+
+{
+	"MacAddrs":["187ED5311111_1", "187ED5322222_2"],
+	"StartYear":2021,
+	"StartMonth":1,
+	"StartDay":1,
+	"StartHour":0,
+	"EndYear":2021,
+	"EndMonth":3,
+	"EndDay":5,
+	"EndHour":0,
+	"PType":"MONTH"
+}
+```
+
+响应，按月
+
+```
+{
+    "data": {
+        "pType": "MONTH",
+        "powers": {
+            "2021-01-01 00:00:00.000": 356,
+            "2021-02-01 00:00:00.000": 347,
+            "2021-03-01 00:00:00.000": 359
+        }
+    },
+    "isError": false,
+    "message": "success",
+    "code": 200
+}
+```
+
+
+
+## 获取任意多开关任意时间段内的电量
+
+
+
+请求
+
+```
+POST http://47.103.61.198:5008/api/breaker/power/random/byaddr
+
+Headers:
+
+Content-Type: application/json
+DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
+
+{
+	"MacAddrs":["187ED5311111_1", "187ED5322222_2"],
+	"StartYear":2021,
+	"StartMonth":1,
+	"StartDay":1,
+	"StartHour":0,
+	"EndYear":2021,
+	"EndMonth":3,
+	"EndDay":5,
+	"EndHour":0
+}
+```
+
+
+
+响应
+
+```
+{
+    "data": {
+        "powers": {
+            "187ED5311111_1": 641.15,
+            "187ED5322222_2": 398.77
+        }
+    },
+    "isError": false,
+    "message": "success",
+    "code": 200
+}
+```
+
+
+
+## 获取任意多模块任意线路的报警
+
+请求
+
+```
+POST http://47.103.61.198:5008/api/breaker/warning/bymacs
+
+Headers:
+
+Content-Type: application/json
+DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
+
+{
+	"Macs":["187ED5311111_2","187ED53338C4_1"],
+	"StartYear":2021,
+	"StartMonth":3,
+	"StartDay":1,
+	"StartHour":0,
+	"EndYear":2021,
+	"EndMonth":3,
+	"EndDay":2,
+	"EndHour":0
+}
+```
+
+响应
+
+```
+{
+    "data": {
+        "warnings": [
+            {
+                "addr": 2,
+                "start": "2021-03-01 04:04:00.000",
+                "end": "2021-03-01 05:04:00.000",
+                "wtype": "0",
+                "level": 3,
+                "val": "265 v",
+                "limit": "260 V",
+                "mac": "187ed5311111",
+                "ts": "2021-03-18 15:26:10.724"
+            },
+            {
+                "addr": 2,
+                "start": "2021-03-01 05:05:00.000",
+                "end": "2021-03-01 06:05:00.000",
+                "wtype": "0",
+                "level": 3,
+                "val": "100 V",
+                "limit": "175 V",
+                "mac": "187ed5311111",
+                "ts": "2021-03-18 15:26:26.468"
+            },
+			......
+        ]
+    },
+    "isError": false,
+    "message": "success",
+    "code": 200
+}
+```
+
+
+
+## 获取某个线路的报警
+
+请求
+
+```
+POST http://47.103.61.198:5008/api/breaker/power/random/byaddr
+
+Headers:
+
+Content-Type: application/json
+DD-Open-Key: bde2d876-993d-440d-aba1-3a06007a25a3
+
+{
+	"Mac":"187ED5311111",
+	"Addr":2,
+	"StartYear":2021,
+	"StartMonth":3,
+	"StartDay":1,
+	"StartHour":0,
+	"EndYear":2021,
+	"EndMonth":3,
+	"EndDay":2,
+	"EndHour":0
+}
+```
+
+响应
+
+```
+{
+    "data": {
+        "warnings": [
+            {
+                "addr": 2,
+                "start": "2021-03-01 04:04:00.000",
+                "end": "2021-03-01 05:04:00.000",
+                "wtype": "0",
+                "level": 3,
+                "val": "265 v",
+                "limit": "260 V",
+                "mac": "187ed5311111",
+                "ts": "2021-03-18 15:26:10.724"
+            },
+            {
+                "addr": 2,
+                "start": "2021-03-01 05:05:00.000",
+                "end": "2021-03-01 06:05:00.000",
+                "wtype": "0",
+                "level": 3,
+                "val": "100 V",
+                "limit": "175 V",
+                "mac": "187ed5311111",
+                "ts": "2021-03-18 15:26:26.468"
+            },
+		......
+        ]
+    },
+    "isError": false,
+    "message": "success",
+    "code": 200
+}
+```
+

决策/决策.md

@@ -1,6 +0,0 @@
-> 购买云厂商MySql数据库
-
-决策：购买云厂商MySql数据库
-发起人：
-
-目前我们用的是自建MySQL服务器，好处是免费的，但是后期如果考虑维护性、安全性等方面的话，购买云厂商MySql数据库更合适。