From 4a3becb8376cdb5ec4cc829256c6ad11ac939ec2 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Mon, 22 Mar 2021 15:52:26 +0800
Subject: [PATCH] added columns to tbl_rules and upgraded database to v1.1.1

---
 database/myems_fdd_db.sql | 6 ++++--
 database/upgrade1.1.1.sql | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 database/upgrade1.1.1.sql

diff --git a/database/myems_fdd_db.sql b/database/myems_fdd_db.sql
index 39ee7567..caac4aac 100644
--- a/database/myems_fdd_db.sql
+++ b/database/myems_fdd_db.sql
@@ -72,13 +72,15 @@ CREATE TABLE IF NOT EXISTS `myems_fdd_db`.`tbl_rules` (
   `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` VARCHAR(128) NOT NULL,
   `uuid` CHAR(36) NOT NULL,
-  `fdd_code` VARCHAR(128) NOT NULL COMMENT 'SYSTEM01, SYSTEM02, ... SPACE01, SPACE02, ... METER01, METER02, ...',
-  `category` VARCHAR(128) NOT NULL COMMENT 'SYSTEM, SPACE, METER, TENANT, STORE, SHOPFLOOR, EQUIPMENT, COMBINEDEQUIPMENT',
+  `category` VARCHAR(128) NOT NULL COMMENT 'REALTIME, SYSTEM, SPACE, METER, TENANT, STORE, SHOPFLOOR, EQUIPMENT, COMBINEDEQUIPMENT',
+  `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',
   `message_template` TEXT NOT NULL COMMENT 'Plain text template that supports $-substitutions',
   `is_enabled` BOOL NOT NULL,
+  `last_run_datetime_utc` DATETIME,
+  `next_run_datetime_utc` DATETIME,
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_rules_index_1` ON  `myems_fdd_db`.`tbl_rules`  (`name`);
 
diff --git a/database/upgrade1.1.1.sql b/database/upgrade1.1.1.sql
new file mode 100644
index 00000000..5c088f81
--- /dev/null
+++ b/database/upgrade1.1.1.sql
@@ -0,0 +1,6 @@
+
+-- UPDATE VERSION NUMBER
+UPDATE myems_system_db.tbl_versions SET version='1.1.1', release_date='2021-03-22' WHERE id=1;
+
+ALTER TABLE myems_fdd_db.tbl_rules ADD last_run_datetime_utc DATETIME NULL;
+ALTER TABLE myems_fdd_db.tbl_rules ADD next_run_datetime_utc DATETIME NULL;