Merge branch 'develop'

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Added
 - added new property 'faults' to point
+- added `myems_historical_db`.`tbl_text_value` in database
+- added `myems_historical_db`.`tbl_text_value_latest` in database
+- added columns to `myems_fdd_db`.`tbl_web_messages` in database
 ### Changed
 - updated dockerfiles to reduce images size
 - updated command actions in myems-api

database/install/myems_fdd_db.sql

@@ -128,6 +128,9 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_web_messages` (
   `update_datetime_utc` DATETIME NULL,
   `status` VARCHAR(32) NOT NULL COMMENT 'new, acknowledged, read',
   `reply` LONGTEXT NULL,
+  `belong_to_object_type` VARCHAR(128)
+  COMMENT 'SYSTEM, SPACE, METER, TENANT, STORE, SHOPFLOOR, EQUIPMENT, COMBINEDEQUIPMENT, MICROGRID, ENERGYSTORAGECONTAINER, PHOTOVOLTAICPOWERSTATION',
+  `belong_to_object_id` BIGINT,
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_web_messages_index_1`
 ON `myems_fdd_db`.`tbl_web_messages` (`user_id`, `status`, `created_datetime_utc`);

database/install/myems_historical_db.sql

@@ -111,6 +111,37 @@ CREATE INDEX `tbl_energy_value_latest_index_1`
 ON `myems_historical_db`.`tbl_energy_value_latest` (`point_id`, `utc_date_time`);
 CREATE INDEX `tbl_energy_value_latest_index_2` ON `myems_historical_db`.`tbl_energy_value_latest` (`utc_date_time`);
 
+
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_historical_db`.`tbl_text_value`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_historical_db`.`tbl_text_value` ;
+
+CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_text_value` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `point_id` BIGINT NOT NULL,
+  `utc_date_time` DATETIME NOT NULL,
+  `actual_value` LONGTEXT NOT NULL,
+  `is_bad` BOOL,
+  PRIMARY KEY (`id`));
+CREATE INDEX `tbl_text_value_index_1` ON `myems_historical_db`.`tbl_text_value` (`point_id`, `utc_date_time`);
+CREATE INDEX `tbl_text_value_index_2` ON `myems_historical_db`.`tbl_text_value` (`utc_date_time`);
+
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_historical_db`.`tbl_text_value_latest`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_historical_db`.`tbl_text_value_latest` ;
+
+CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_text_value_latest` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `point_id` BIGINT NOT NULL,
+  `utc_date_time` DATETIME NOT NULL,
+  `actual_value` LONGTEXT NOT NULL,
+  PRIMARY KEY (`id`));
+CREATE INDEX `tbl_energy_value_latest_index_1`
+ON `myems_historical_db`.`tbl_text_value_latest` (`point_id`, `utc_date_time`);
+CREATE INDEX `tbl_text_value_latest_index_2` ON `myems_historical_db`.`tbl_text_value_latest` (`utc_date_time`);
+
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_historical_db`.`tbl_offline_meter_files`
 -- ---------------------------------------------------------------------------------------------------------------------

database/upgrade/upgrade5.1.0RC.sql

@@ -716,6 +716,33 @@ ADD COLUMN `cooling_control_hysteresis_point_id` BIGINT AFTER `cooling_off_tempe
 ALTER TABLE `myems_system_db`.`tbl_energy_storage_containers_hvacs`
 ADD COLUMN `high_humidity_alarm_set_point_id` BIGINT AFTER `low_temperature_alarm_set_point_id`;
 
+CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_text_value` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `point_id` BIGINT NOT NULL,
+  `utc_date_time` DATETIME NOT NULL,
+  `actual_value` LONGTEXT NOT NULL,
+  `is_bad` BOOL,
+  PRIMARY KEY (`id`));
+CREATE INDEX `tbl_text_value_index_1` ON `myems_historical_db`.`tbl_text_value` (`point_id`, `utc_date_time`);
+CREATE INDEX `tbl_text_value_index_2` ON `myems_historical_db`.`tbl_text_value` (`utc_date_time`);
+
+CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_text_value_latest` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `point_id` BIGINT NOT NULL,
+  `utc_date_time` DATETIME NOT NULL,
+  `actual_value` LONGTEXT NOT NULL,
+  PRIMARY KEY (`id`));
+CREATE INDEX `tbl_energy_value_latest_index_1`
+ON `myems_historical_db`.`tbl_text_value_latest` (`point_id`, `utc_date_time`);
+CREATE INDEX `tbl_text_value_latest_index_2` ON `myems_historical_db`.`tbl_text_value_latest` (`utc_date_time`);
+
+ALTER TABLE `myems_fdd_db`.`tbl_web_messages`
+ADD `belong_to_object_id` BIGINT AFTER `reply`;
+
+ALTER TABLE `myems_fdd_db`.`tbl_web_messages`
+ADD `belong_to_object_type` VARCHAR(128)
+COMMENT 'SYSTEM, SPACE, METER, TENANT, STORE, SHOPFLOOR, EQUIPMENT, COMBINEDEQUIPMENT, MICROGRID, ENERGYSTORAGECONTAINER, PHOTOVOLTAICPOWERSTATION'
+AFTER `reply`;
 
 -- UPDATE VERSION NUMBER
 UPDATE `myems_system_db`.`tbl_versions` SET version='5.1.0RC', release_date='2025-01-15' WHERE id=1;

myems-api/core/datasource.py

@@ -465,6 +465,9 @@ def on_get(req, resp, id_):
                 elif row[2] == 'ENERGY_VALUE':
                     latest_value = energy_value_dict.get(row[0], None)
                     latest_value = Decimal(latest_value) if latest_value is not None else None
+                elif row[2] == 'TEXT_VALUE':
+                    # todo
+                    continue
 
                 meta_result = {"id": row[0],
                                "name": row[1],