1.修改统计事件为7点上报；

2.alarm_plan表新增联动服务号字段

core/alarm_plan_manager.py

@@ -212,7 +212,7 @@ class AlarmPlanManager:
                     (event_type == EventType.NIGHT_TOILETING_FREQUENCY_ABNORMAL.value) or
                     (event_type == EventType.BATHROOM_STAY_FREQUENCY.value)):
                     cron = {
-                        "hour": 6,
+                        "hour": 7,
                         "minute": 0
                     }
 
@@ -327,7 +327,7 @@ def cb_handle_query_all_alarm_plan_info(result, userdata):
                     (event_type == EventType.NIGHT_TOILETING_FREQUENCY_ABNORMAL.value) or
                     (event_type == EventType.BATHROOM_STAY_FREQUENCY.value)):
                     cron = {
-                        "hour": 6,
+                        "hour": 7,
                         "minute": 0
                     }
 

db/db_scripts/create_alarm_time_plan.sql

@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS `lnxx_dev`.`alarm_time_plan2` (
+CREATE TABLE IF NOT EXISTS `lnxx_dev`.`alarm_time_plan` (
   `id` INT NOT NULL AUTO_INCREMENT COMMENT '索引',
   `start_date` CHAR(255) NULL COMMENT '开始日期',
   `stop_date` CHAR(255) NULL COMMENT '结束日期',
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `lnxx_dev`.`alarm_time_plan2` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='时间计划表';
 
-ALTER TABLE `lnxx_dev`.`alarm_time_plan2`
+ALTER TABLE `lnxx_dev`.`alarm_time_plan`
   MODIFY COLUMN `start_date` CHAR(255) NULL COMMENT '开始日期',
   MODIFY COLUMN `stop_date` CHAR(255) NULL COMMENT '结束日期',
   MODIFY COLUMN `time_range` CHAR(255) NULL COMMENT '生效时间',

db/db_scripts/create_alram_plan.sql

@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS `lnxx_dev`.`alarm_plan2` (
+CREATE TABLE IF NOT EXISTS `lnxx_dev`.`alarm_plan` (
   `id` INT NOT NULL AUTO_INCREMENT COMMENT '索引',
   `uuid` VARCHAR(255) NULL COMMENT 'uuid',
   `name` VARCHAR(255) NULL COMMENT '计划名称',
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `lnxx_dev`.`alarm_plan2` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='报警计划表';
 
-ALTER TABLE `lnxx_dev`.`alarm_plan2`
+ALTER TABLE `lnxx_dev`.`alarm_plan`
   MODIFY COLUMN `uuid` VARCHAR(255) NULL COMMENT 'uuid',
   MODIFY COLUMN `name` VARCHAR(255) NULL COMMENT '计划名称',
   MODIFY COLUMN `dev_id` VARCHAR(255) NULL COMMENT '设备id',
@@ -30,3 +30,6 @@ ALTER TABLE `lnxx_dev`.`alarm_plan2`
   MODIFY COLUMN `create_time` DATETIME NULL COMMENT '创建时间',
   MODIFY COLUMN `update_time` DATETIME NULL COMMENT '更新时间',
   MODIFY COLUMN `remark` VARCHAR(255) NULL COMMENT 'remark';
+
+ALTER TABLE `lnxx_dev`.`alarm_plan` 
+ADD COLUMN `linkage_push_wechat_service` int(0) NULL COMMENT '联动推送微信服务号 0-禁用,1-启用' AFTER `param`;

db/db_scripts/create_event_type.sql

@@ -18,7 +18,6 @@ CREATE TABLE IF NOT EXISTS `lnxx_dev`.`event_type` (
   UNIQUE KEY `uniq_event_val` (`event_val`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件类型表';
 
--- 幂等化插入
 INSERT INTO lnxx_dev.event_type (
     event_val,
     event_str,