Merge branch 'develop'

MyEMS · Jul 11, 2024 · 850a77a · 850a77a
2 parents 617f522 + d9cdd06
commit 850a77a
Show file tree

Hide file tree

Showing 3 changed files with 215 additions and 32 deletions.
diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql
@@ -1123,21 +1123,21 @@ CREATE INDEX `tbl_protocols_index_1` ON `myems_system_db`.`tbl_protocols` (`name
 
 INSERT INTO myems_system_db.tbl_protocols (id,name,code)
 VALUES
-(1,'bacnet-ip', 'bacnet-ip'),
-(2,'cassandra', 'cassandra'),
-(3,'clickhouse', 'clickhouse'),
-(4,'coap', 'coap'),
-(5,'controllogix', 'controllogix'),
-(6,'dlt645', 'dlt645'),
-(7,'dtu-rtu', 'dtu-rtu'),
-(8,'dtu-tcp', 'dtu-tcp'),
-(9,'dtu-mqtt', 'dtu-mqtt'),
-(10,'elexon-bmrs', 'elexon-bmrs'),
-(11,'iec104', 'iec104'),
-(12,'influxdb', 'influxdb'),
-(13,'lora', 'lora'),
-(14,'modbus-rtu', 'modbus-rtu'),
-(15,'modbus-tcp', 'modbus-tcp'),
+(1,'modbus-tcp', 'modbus-tcp'),
+(2,'bacnet-ip', 'bacnet-ip'),
+(3,'cassandra', 'cassandra'),
+(4,'clickhouse', 'clickhouse'),
+(5,'coap', 'coap'),
+(6,'controllogix', 'controllogix'),
+(7,'dlt645', 'dlt645'),
+(8,'dtu-rtu', 'dtu-rtu'),
+(9,'dtu-tcp', 'dtu-tcp'),
+(10,'dtu-mqtt', 'dtu-mqtt'),
+(11,'elexon-bmrs', 'elexon-bmrs'),
+(12,'iec104', 'iec104'),
+(13,'influxdb', 'influxdb'),
+(14,'lora', 'lora'),
+(15,'modbus-rtu', 'modbus-rtu'),
 (16,'mongodb', 'mongodb'),
 (17,'mqtt-acrel', 'mqtt-acrel'),
 (18,'mqtt-adw300', 'mqtt-adw300'),

diff --git a/database/upgrade/upgrade4.7.0.sql b/database/upgrade/upgrade4.7.0.sql
@@ -68,21 +68,21 @@ CREATE INDEX `tbl_protocols_index_1` ON `myems_system_db`.`tbl_protocols` (`name
 
 INSERT INTO myems_system_db.tbl_protocols (id,name,code)
 VALUES
-(1,'bacnet-ip', 'bacnet-ip'),
-(2,'cassandra', 'cassandra'),
-(3,'clickhouse', 'clickhouse'),
-(4,'coap', 'coap'),
-(5,'controllogix', 'controllogix'),
-(6,'dlt645', 'dlt645'),
-(7,'dtu-rtu', 'dtu-rtu'),
-(8,'dtu-tcp', 'dtu-tcp'),
-(9,'dtu-mqtt', 'dtu-mqtt'),
-(10,'elexon-bmrs', 'elexon-bmrs'),
-(11,'iec104', 'iec104'),
-(12,'influxdb', 'influxdb'),
-(13,'lora', 'lora'),
-(14,'modbus-rtu', 'modbus-rtu'),
-(15,'modbus-tcp', 'modbus-tcp'),
+(1,'modbus-tcp', 'modbus-tcp'),
+(2,'bacnet-ip', 'bacnet-ip'),
+(3,'cassandra', 'cassandra'),
+(4,'clickhouse', 'clickhouse'),
+(5,'coap', 'coap'),
+(6,'controllogix', 'controllogix'),
+(7,'dlt645', 'dlt645'),
+(8,'dtu-rtu', 'dtu-rtu'),
+(9,'dtu-tcp', 'dtu-tcp'),
+(10,'dtu-mqtt', 'dtu-mqtt'),
+(11,'elexon-bmrs', 'elexon-bmrs'),
+(12,'iec104', 'iec104'),
+(13,'influxdb', 'influxdb'),
+(14,'lora', 'lora'),
+(15,'modbus-rtu', 'modbus-rtu'),
 (16,'mongodb', 'mongodb'),
 (17,'mqtt-acrel', 'mqtt-acrel'),
 (18,'mqtt-adw300', 'mqtt-adw300'),

diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json
@@ -1,9 +1,9 @@
 {
  "info": {
- "_postman_id": "945ab7b0-5e55-41b0-8182-4abaffc0b8b3",
+ "_postman_id": "68799a4a-5d3a-4405-9fa2-7de1624badc4",
  "name": "MyEMS",
  "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
- "_exporter_id": "32357384"
+ "_exporter_id": "36323627"
  },
  "item": [
  {
@@ -13413,6 +13413,189 @@
  }
  ]
  },
+ {
+ "name": "Protocol",
+ "item": [
+ {
+ "name": "Get All Protocols",
+ "request": {
+ "auth": {
+ "type": "noauth"
+ },
+ "method": "GET",
+ "header": [
+ {
+ "key": "User-UUID",
+ "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4"
+ },
+ {
+ "key": "Token",
+ "value": "831f86c46eaa946be6450097c2ecfc2966fecea18853d00ae3147b11123899438fd5394f1bcfc165d0a3d0604baa93eb14f29d0d88c3f75b3bcaa807029e410c"
+ },
+ {
+ "key": "API-Key",
+ "value": "c5ee62be2792ed4a59de1096511934288f4c192363529dafc00b3b35f81f224a5cc44c9aae46ac8966dc52f1ea0039395551bdf3f86aff6bb2b6b032834fc139",
+ "disabled": true
+ }
+ ],
+ "url": {
+ "raw": "{{base_url}}/protocols",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "protocols"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "GET a Protocol by ID",
+ "request": {
+ "method": "GET",
+ "header": [
+ {
+ "key": "User-UUID",
+ "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4"
+ },
+ {
+ "key": "Token",
+ "value": "831f86c46eaa946be6450097c2ecfc2966fecea18853d00ae3147b11123899438fd5394f1bcfc165d0a3d0604baa93eb14f29d0d88c3f75b3bcaa807029e410c"
+ },
+ {
+ "key": "API-Key",
+ "value": "c5ee62be2792ed4a59de1096511934288f4c192363529dafc00b3b35f81f224a5cc44c9aae46ac8966dc52f1ea0039395551bdf3f86aff6bb2b6b032834fc139",
+ "disabled": true
+ }
+ ],
+ "url": {
+ "raw": "{{base_url}}/protocols/1",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "protocols",
+ "1"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "Create New Protocol",
+ "request": {
+ "method": "POST",
+ "header": [
+ {
+ "key": "User-UUID",
+ "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
+ "description": "Any admin users' UUID"
+ },
+ {
+ "key": "Token",
+ "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1",
+ "description": "Login first to get a valid token"
+ },
+ {
+ "key": "API-Key",
+ "value": "c5ee62be2792ed4a59de1096511934288f4c192363529dafc00b3b35f81f224a5cc44c9aae46ac8966dc52f1ea0039395551bdf3f86aff6bb2b6b032834fc139",
+ "description": "Create API Key at myems-admin",
+ "disabled": true
+ }
+ ],
+ "body": {
+ "mode": "raw",
+ "raw": "{\"data\":{\"name\":\"modbus-tcp\", \"code\":\"modbus-tcp\"}}"
+ },
+ "url": {
+ "raw": "{{base_url}}/protocols",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "protocols"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "Update a Protocol",
+ "request": {
+ "method": "PUT",
+ "header": [
+ {
+ "key": "User-UUID",
+ "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
+ "description": "Any admin users' UUID"
+ },
+ {
+ "key": "Token",
+ "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1",
+ "description": "Login first to get a valid token"
+ },
+ {
+ "key": "API-Key",
+ "value": "c5ee62be2792ed4a59de1096511934288f4c192363529dafc00b3b35f81f224a5cc44c9aae46ac8966dc52f1ea0039395551bdf3f86aff6bb2b6b032834fc139",
+ "description": "Create API Key at myems-admin",
+ "disabled": true
+ }
+ ],
+ "body": {
+ "mode": "raw",
+ "raw": "{\"data\":{\"name\":\"modbus-tcp\", \"code\":\"modbus-tcp\"}}"
+ },
+ "url": {
+ "raw": "{{base_url}}/protocols/3",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "protocols",
+ "3"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "DELETE a Protocol by ID",
+ "request": {
+ "method": "DELETE",
+ "header": [
+ {
+ "key": "User-UUID",
+ "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
+ "description": "Any admin users' UUID"
+ },
+ {
+ "key": "Token",
+ "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1",
+ "description": "Login first to get a valid token"
+ },
+ {
+ "key": "API-Key",
+ "value": "c5ee62be2792ed4a59de1096511934288f4c192363529dafc00b3b35f81f224a5cc44c9aae46ac8966dc52f1ea0039395551bdf3f86aff6bb2b6b032834fc139",
+ "description": "Create API Key at myems-admin",
+ "disabled": true
+ }
+ ],
+ "url": {
+ "raw": "{{base_url}}/protocols/3",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "protocols",
+ "3"
+ ]
+ }
+ },
+ "response": []
+ }
+ ]
+ },
  {
  "name": "Rule Ⓔ",
  "item": [