Merge branch 'develop'

CHANGELOG.md

@@ -16,6 +16,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
+## [v1.5.1] -   2021-12-18
+### Added
+-   Added lock/unlock user function if user failed login with wrong password.
+
+### Changed
+- Updated email message api and view with start/end datetime parameters.
+- Changed all datatype JSON columns to datatype LONGTEXT in database.
+
+### Fixed
+-   None.
+
+### Removed
+-   None.
+
 ## [v1.5.0] -   2021-12-12
 ### Added
 -   Added energy model database

admin/views/common/footer-login.html

@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.5.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.5.1 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>

admin/views/common/footer.html

@@ -3,6 +3,6 @@
         <strong><a href="https://myems.io">https://myems.io</a></strong>
     </div>
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.5.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.5.1</strong>
     </div>
 </div>

database/demo-cn/myems_system_db.sql

@@ -204,9 +204,9 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_energy_categories`
 (`id`, `name`, `uuid`, `unit_of_measure`, `kgce`, `kgco2e`)
 VALUES
-(1, '电', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'kWh', 0.1229, 0.928),
+(1, '电', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'kWh', 0.122, 0.928),
-(2, '自来水', '3dbfa598-fccc-4d60-bf11-14bd55540c66', 'm³', 0.0857, 0.910),
+(2, '自来水', '3dbfa598-fccc-4d60-bf11-14bd55540c66', 'm³', 0.085, 0.910),
-(3, '天然气', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'm³', 1.3300, 2.1622),
+(3, '天然气', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'm³', 1.330, 2.162),
 (4,'4℃冷冻水','d2a3021a-4911-4611-856e-80133000f1d5','m³',1.000,1.000),
 (5,'7℃冷冻水','c1ad0696-e1ab-4e0c-a342-b194c0bc27e0','m³',1.000,1.000),
 (6,'蒸汽','ac91a5c4-4ae5-4a73-8e3f-044591f42eef','T',1.000,1.000),

database/demo-de/myems_system_db.sql

@@ -204,9 +204,9 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_energy_categories`
 (`id`, `name`, `uuid`, `unit_of_measure`, `kgce`, `kgco2e`)
 VALUES
-(1, 'Elektrizität', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'kWh', 0.1229, 0.928),
+(1, 'Elektrizität', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'kWh', 0.122, 0.928),
-(2, 'Leitungswasser', '3dbfa598-fccc-4d60-bf11-14bd55540c66', 'm³', 0.0857, 0.910),
+(2, 'Leitungswasser', '3dbfa598-fccc-4d60-bf11-14bd55540c66', 'm³', 0.085, 0.910),
-(3, 'Erdgas', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'm³', 1.3300, 2.1622),
+(3, 'Erdgas', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'm³', 1.330, 2.162),
 (4,'4℃ gekühltes Wasser','d2a3021a-4911-4611-856e-80133000f1d5','m³',1.000,1.000),
 (5,'7℃ gekühltes Wasser','c1ad0696-e1ab-4e0c-a342-b194c0bc27e0','m³',1.000,1.000),
 (6,'Dampf','ac91a5c4-4ae5-4a73-8e3f-044591f42eef','T',1.000,1.000),

database/demo-en/myems_system_db.sql

@@ -204,9 +204,9 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_energy_categories`
 (`id`, `name`, `uuid`, `unit_of_measure`, `kgce`, `kgco2e`)
 VALUES
-(1, 'Electricity', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'kWh', 0.1229, 0.928),
+(1, 'Electricity', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'kWh', 0.122, 0.928),
-(2, 'Water', '3dbfa598-fccc-4d60-bf11-14bd55540c66', 'm³', 0.0857, 0.910),
+(2, 'Water', '3dbfa598-fccc-4d60-bf11-14bd55540c66', 'm³', 0.085, 0.910),
-(3, 'Natural Gas', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'm³', 1.3300, 2.1622),
+(3, 'Natural Gas', '6d0753ed-8b43-4332-b6fd-d2f5813831d3', 'm³', 1.330, 2.162),
 (4,'4℃ Chilled Water','d2a3021a-4911-4611-856e-80133000f1d5','m³',1.000,1.000),
 (5,'7℃ Chilled Water','c1ad0696-e1ab-4e0c-a342-b194c0bc27e0','m³',1.000,1.000),
 (6,'Steam','ac91a5c4-4ae5-4a73-8e3f-044591f42eef','T',1.000,1.000),

database/install/myems_fdd_db.sql

@@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_rules` (
   `fdd_code` VARCHAR(128) NOT NULL COMMENT 'REALTIME01, REALTIME01... SYSTEM01, SYSTEM02, ... SPACE01, SPACE02, ... METER01, METER02, ...',
   `priority` VARCHAR(128) NOT NULL COMMENT 'CRITICAL, HIGH, MEDIUM, LOW',
   `channel` VARCHAR(128) NOT NULL COMMENT 'WEB, EMAIL, SMS, WECHAT, CALL',
-  `expression` JSON NOT NULL COMMENT 'JSON string of diagnosed objects, points, values, and recipients',
+  `expression` LONGTEXT NULL COMMENT 'MUST be in JSON format',
   `message_template` TEXT NOT NULL COMMENT 'Plain text template that supports $-substitutions',
   `is_enabled` BOOL NOT NULL,
   `last_run_datetime_utc` DATETIME,
@@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_wechat_messages_outbox` (
   `recipient_name` VARCHAR(32) NOT NULL,
   `recipient_openid` VARCHAR(32) NOT NULL,
   `message_template_id` VARCHAR(64) NOT NULL,
-  `message_data` JSON NOT NULL,
+  `message_data` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format',
   `created_datetime_utc` DATETIME NOT NULL,
   `scheduled_datetime_utc` DATETIME NOT NULL,
   `acknowledge_code` VARCHAR(32) NULL,

database/install/myems_reporting_db.sql

@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `myems_reporting_db`.`tbl_reports` (
   `uuid` CHAR(36) NOT NULL,
   `category` VARCHAR(128) NOT NULL COMMENT 'SPACE, METER, VIRTUALMETER, TENANT, STORE, SHOPFLOOR, EQUIPMENT, COMBINEDEQUIPMENT',
   `report_code` VARCHAR(128) NOT NULL COMMENT 'SPACE01, SPACE02, ... METER01, METER02, ... TENANT01, TENANT02, ...',
-  `expression` JSON NOT NULL COMMENT 'JSON string of reporting objects, peroids, date ranges, and recipients',
+  `expression` LONGTEXT NULL COMMENT 'MUST be in JSON format',
   `is_enabled` BOOL NOT NULL,
   `last_run_datetime_utc` DATETIME,
   `next_run_datetime_utc` DATETIME,

database/install/myems_system_db.sql

@@ -145,7 +145,7 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_data_sources` (
   `uuid` CHAR(36) NOT NULL,
   `gateway_id` BIGINT NOT NULL,
   `protocol` VARCHAR(16) NOT NULL,
-  `connection` JSON NOT NULL,
+  `connection` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format',
   `last_seen_datetime_utc` DATETIME NULL  COMMENT 'The last seen date time in UTC via PING or TELNET',
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_data_sources_index_1` ON  `myems_system_db`.`tbl_data_sources`   (`name`);
@@ -557,7 +557,7 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_points` (
   `ratio` DECIMAL(18, 3) DEFAULT 1.000 NOT NULL,
   `is_trend` BOOL NOT NULL,
   `is_virtual` BOOL DEFAULT FALSE NOT NULL,
-  `address` JSON NOT NULL,
+  `address` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format',
   `description` VARCHAR(255),
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_points_index_1` ON  `myems_system_db`.`tbl_points`   (`name`);
@@ -1246,6 +1246,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.5.0', '2021-12-12');
+(1, '1.5.1', '2021-12-18');
 
 COMMIT;

database/install/myems_user_db.sql

@@ -47,7 +47,7 @@ DROP TABLE IF EXISTS `myems_user_db`.`tbl_privileges` ;
 CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_privileges` (
   `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` VARCHAR(45) NOT NULL,
-  `data` JSON NOT NULL,
+  `data` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format',
   PRIMARY KEY (`id`));
 
 -- ---------------------------------------------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_logs` (
   `request_method` VARCHAR(256) NOT NULL,
   `resource_type` VARCHAR(256) NOT NULL,
   `resource_id` BIGINT NULL,
-  `request_body` JSON NULL,
+  `request_body` LONGTEXT NULL COMMENT 'MUST be in JSON format',
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_logs_index_1` ON  `myems_user_db`.`tbl_logs`  (`user_uuid`, `request_datetime_utc`, `request_method`);
 

database/upgrade/upgrade1.5.1.sql

@@ -1,6 +1,22 @@
+START TRANSACTION;
 
 ALTER TABLE `myems_user_db`.`tbl_users` ADD `failed_login_count` INT NOT NULL DEFAULT 0 AFTER password_expiration_datetime_utc;
 
+ALTER TABLE `myems_user_db`.`tbl_privileges` MODIFY COLUMN `data` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format';
+
+ALTER TABLE `myems_user_db`.`tbl_logs` MODIFY COLUMN `request_body` LONGTEXT NULL COMMENT 'MUST be in JSON format';
+
+ALTER TABLE `myems_fdd_db`.`tbl_rules` MODIFY COLUMN `expression` LONGTEXT NULL COMMENT 'MUST be in JSON format';
+
+ALTER TABLE `myems_fdd_db`.`tbl_wechat_messages_outbox` MODIFY COLUMN `message_data` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format';
+
+ALTER TABLE `myems_reporting_db`.`tbl_reports` MODIFY COLUMN `expression` LONGTEXT NULL COMMENT 'MUST be in JSON format';
+
+ALTER TABLE `myems_system_db`.`tbl_data_sources` MODIFY COLUMN `connection` LONGTEXT NULL COMMENT 'MUST be in JSON format';
+
+ALTER TABLE `myems_system_db`.`tbl_points` MODIFY COLUMN `address` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format';
 
 -- UPDATE VERSION NUMBER
 UPDATE myems_system_db.tbl_versions SET version='1.5.1', release_date='2021-12-18' WHERE id=1;
+
+COMMIT;

myems-api/core/version.py

@@ -15,8 +15,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS v1.5.0 Community Edition',
+        result = {"version": 'MyEMS v1.5.1',
-                  "release-date": '2021-12-12',
+                  "release-date": '2021-12-18',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)
 

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",

web/src/config.js

@@ -1,4 +1,4 @@
-export const version = '1.5.0';
+export const version = '1.5.1';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';