diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 12178bd1..e3701438 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "b9748a00-fb95-4c71-9c23-04f31982a7ff", + "_postman_id": "deab54cf-5883-4be6-acf1-942f75847c1c", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -6664,7 +6664,7 @@ } ], "cookie": [], - "body": null + "body": "" } ] }, @@ -9906,6 +9906,38 @@ } }, "response": [] + }, + { + "name": "GET Meter Batch Analysis Report", + "request": { + "method": "GET", + "header": [], + "url": { + "raw": "{{base_url}}/reports/meterbatch?spaceid=1&reportingperiodstartdatetime=2020-10-01T00:00:00&reportingperiodenddatetime=2020-11-01T00:00:00", + "host": [ + "{{base_url}}" + ], + "path": [ + "reports", + "meterbatch" + ], + "query": [ + { + "key": "spaceid", + "value": "1" + }, + { + "key": "reportingperiodstartdatetime", + "value": "2020-10-01T00:00:00" + }, + { + "key": "reportingperiodenddatetime", + "value": "2020-11-01T00:00:00" + } + ] + } + }, + "response": [] } ] }, diff --git a/myems-api/README.md b/myems-api/README.md index 1a010be2..5b0cc7b0 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -2175,6 +2175,10 @@ $ curl -i -X GET {{base_url}}/reports/equipmentstatistics?equipmentid=1&periodty ``` $ curl -i -X GET {{base_url}}/reports/meterenergy?meterid=6&periodtype=daily&baseperiodstartdatetime=2020-08-01T00:00:00&baseperiodenddatetime=2020-09-01T00:00:00&reportingperiodstartdatetime=2020-09-01T00:00:00&reportingperiodenddatetime=2020-10-01T00:00:00 ``` +* GET Equipment Batch Analysis Report +``` +$ curl -i -X GET {{base_url}}/reports/equipmentbatch?spaceid=1&reportingperiodstartdatetime=2021-05-01T00:00:00&reportingperiodenddatetime=2021-05-20T11:41:09 +``` * GET Meter Cost Report ``` $ curl -i -X GET {{base_url}}/reports/metercost?meterid=6&periodtype=daily&baseperiodstartdatetime=2020-08-01T00:00:00&baseperiodenddatetime=2020-09-01T00:00:00&reportingperiodstartdatetime=2020-09-01T00:00:00&reportingperiodenddatetime=2020-10-01T00:00:00 diff --git a/myems-api/app.py b/myems-api/app.py index bab9cb1f..0537ea8b 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -43,6 +43,7 @@ from reports import meterrealtime from reports import metersubmetersbalance from reports import metertrend from reports import metertracking +from reports import meterbatch from reports import offlinemeterenergy from reports import offlinemetercost from reports import shopfloorcost @@ -549,6 +550,8 @@ api.add_route('/reports/fddstorefault', fddstorefault.Reporting()) api.add_route('/reports/fddtenantfault', fddtenantfault.Reporting()) +api.add_route('/reports/meterbatch', + meterbatch.Reporting()) api.add_route('/reports/metercost', metercost.Reporting()) api.add_route('/reports/meterenergy',