seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin_myems/develop' into develop

pull/1/head
hyh123a 2021-02-28 14:14:14 +08:00
parent 84b6fee32a 9754b0b8cb
commit b0273e733a
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
database/myems_system_db.sql
View File

@ -482,8 +482,7 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_energy_flow_diagrams_links` (
`energy_flow_diagram_id` BIGINT NOT NULL, `energy_flow_diagram_id` BIGINT NOT NULL,
`source_node_id` BIGINT NOT NULL, `source_node_id` BIGINT NOT NULL,
`target_node_id` BIGINT NOT NULL, `target_node_id` BIGINT NOT NULL,
`value_object_type` VARCHAR(32) NOT NULL COMMENT 'meter, offline_meter, virtual_meter, space', `meter_uuid` CHAR(36) NOT NULL,
`value_object_id` BIGINT NOT NULL,
PRIMARY KEY (`id`)); PRIMARY KEY (`id`));
CREATE INDEX `tbl_energy_flow_diagrams_links_index_1` ON `myems_system_db`.`tbl_energy_flow_diagrams_links` (`energy_flow_diagram_id`); CREATE INDEX `tbl_energy_flow_diagrams_links_index_1` ON `myems_system_db`.`tbl_energy_flow_diagrams_links` (`energy_flow_diagram_id`);
@ -494,15 +493,16 @@ CREATE INDEX `tbl_energy_flow_diagrams_links_index_1` ON `myems_system_db`.`tbl
-- USE `myems_system_db`; -- USE `myems_system_db`;
-- --
-- INSERT INTO `myems_system_db`.`tbl_energy_flow_diagrams_links` -- INSERT INTO `myems_system_db`.`tbl_energy_flow_diagrams_links`
-- (`id`, `energy_flow_diagram_id`, `source_node_id`, `value_object_type`, `object_uuid`) -- (`id`, `energy_flow_diagram_id`, `name`)
-- VALUES -- VALUES
-- (1, 1, 1, 3, 'space', 1), -- (1, 1, 1, 3, '5ca47bc5-22c2-47fc-b906-33222191ea40'),
-- (2, 1, 2, 4, 'space', 2), -- (2, 1, 2, 4, '5d4d2f06-6200-4671-b182-4cf32cd9228f'),
-- (3, 1, 2, 5, 'space', 3), -- (3, 1, 2, 5, '7897665b-66ac-481d-9c31-2ab2ecbda16c'),
-- (4, 1, 2, 6, 'space', 4), -- (4, 1, 2, 6, 'f0c278ec-eb32-4c5e-a35f-88643b00c367'),
-- (5, 1, 3, 7, 'meter', 1), -- (5, 1, 3, 7, '9918aa6c-79e9-4579-8f2e-a76eb9fe4e3e'),
-- (6, 1, 3, 8, 'offline_meter', 1), -- (6, 1, 3, 8, '831cbc8c-1429-4840-946e-f0b389b2253e'),
-- (7, 1, 4, 9, 'virtual_meter', 1); -- (7, 1, 4, 9, 'd2fc8464-3f13-42a9-8a57-63f95f677f0f'),
-- (8, 1, 4, 10, '7e4b3831-887b-40e2-b7f8-4d77c6f206a9');
-- --
-- COMMIT; -- COMMIT;

13
database/upgrade1.0.6.sql
View File

@ -1,16 +1,3 @@
-- NOTE: this upgrade script will drop existing data table
DROP TABLE IF EXISTS `myems_system_db`.`tbl_energy_flow_diagrams_links` ;
CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_energy_flow_diagrams_links` (
`id` BIGINT NOT NULL AUTO_INCREMENT,
`energy_flow_diagram_id` BIGINT NOT NULL,
`source_node_id` BIGINT NOT NULL,
`target_node_id` BIGINT NOT NULL,
`value_object_type` VARCHAR(32) NOT NULL COMMENT 'meter, offline_meter, virtual_meter, space',
`value_object_id` BIGINT NOT NULL,
PRIMARY KEY (`id`));
CREATE INDEX `tbl_energy_flow_diagrams_links_index_1` ON `myems_system_db`.`tbl_energy_flow_diagrams_links` (`energy_flow_diagram_id`);
-- UPDATE VERSION NUMBER -- UPDATE VERSION NUMBER
UPDATE myems_system_db.tbl_versions SET version='1.0.6', release_date='2021-02-27' WHERE id=1; UPDATE myems_system_db.tbl_versions SET version='1.0.6', release_date='2021-02-27' WHERE id=1;

4
myems-api/core/version.py
View File

@ -14,8 +14,8 @@ class VersionItem:
@staticmethod @staticmethod
def on_get(req, resp): def on_get(req, resp):
result = {"version": 'MyEMS 1.0.4 (Community Edition)', result = {"version": 'MyEMS 1.0.6 (Community Edition)',
"release-date": '20210218', "release-date": '20210227',
"website": "https://myems.io"} "website": "https://myems.io"}
resp.body = json.dumps(result) resp.body = json.dumps(result)