Merge branch 'V1.0.11' of http://10.87.21.221:8000/jzyd_yyds/soc into V1.0.11

 Conflicts:
	project_data/sql/1.0.11/quartz/quartz.sql
	project_data/sql/1.0.11/soc/soc.sql

project_data/sql/1.0.11/quartz/quartz.sql

@@ -20,11 +20,16 @@ VALUES ('删除三日前ws重试消息', 'DEFAULT', 'HostTask.deletedRetryMsg()'
         '超级管理员', '2024-11-28 15:26:34', '', NULL);
 
 
+delete from sys_job  where invoke_target = 'HostTask.getCameraMissionRules()';
 INSERT INTO `sys_job`(`job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`,
                       `status`, `create_by`, `create_time`, `update_by`, `update_time`)
 VALUES ('视频诊断绑定获取', 'DEFAULT', 'HostTask.getCameraMissionRules()', '0 0 2 * * ?', '1', '1', '1', NULL, now(), NULL,
         NULL);
 
+delete from sys_job where invoke_target = 'HostTask.checkWsOnLine()';
+INSERT INTO `sys_job`(`job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('WS在线状态检测', 'DEFAULT', 'HostTask.checkWsOnLine()', '0 0/1 * * * ?', '1', '1', '0', '景远超', '2024-12-12 16:01:15', '', NULL);
+        NULL);
+
 
 delete
 from sys_job

project_data/sql/1.0.11/soc/soc.sql

@@ -279,9 +279,11 @@ INSERT INTO `iot_server_product`(`id`, `name`, `display_name`, `enabled`, `categ
 INSERT INTO `iot_server_product`(`id`, `name`, `display_name`, `enabled`, `categories`, `models`) VALUES ('20fa2a1a-a069-4975-8d64-091a39539e02', 'DOOR_HOST', '门禁主机', 1, '[\r\n  \"Host_Door\"\r\n]', '[\r\n  \"Normal\"\r\n]');
 
 -- 摄像机诊断菜单
-delete from `sys_menu` where id in (01747915341556742146,01761830909641408513);
-INSERT INTO `sys_menu` VALUES (01747915341556742146, '视频诊断任务', 1747911340288892930, 3, 'diagnoseMission', 'iot/diagnoseMission', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseMission', '1', 'client', NULL, '超级管理员', '2024-11-18 17:22:07', '超级管理员', '2024-11-18 17:22:07', '');
-INSERT INTO `sys_menu` VALUES (01761830909641408513, '视频诊断阈值', 1747911340288892930, 2, 'diagnoseThreshold', 'iot/diagnoseThreshold', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseThreshold', '1', 'client', NULL, '超级管理员', '2024-11-18 09:37:19', '超级管理员', '2024-11-18 09:37:19', '');
+delete from `sys_menu` where id in (01747912341556742146,01747915341556742146,01761830909641408513,01858761159550345217);
+INSERT INTO `sys_menu` VALUES (01747912341556742146, '规则配置', 1747911340288892930, 31, 'rule', NULL, NULL, 1, 0, 'M', '0', '0', '', '1', 'system', NULL, '超级管理员', '2024-11-18 13:55:15', '超级管理员', '2024-11-18 13:55:15', '');
+INSERT INTO `sys_menu` VALUES (01747915341556742146, '视频诊断任务', 1747912341556742146, 3, 'diagnoseMission', 'iot/diagnoseMission', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseMission', '1', 'client', NULL, '超级管理员', '2024-11-18 17:22:07', '超级管理员', '2024-11-18 17:22:07', '');
+INSERT INTO `sys_menu` VALUES (01761830909641408513, '视频诊断阈值', 1747912341556742146, 2, 'diagnoseThreshold', 'iot/diagnoseThreshold', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseThreshold', '1', 'client', NULL, '超级管理员', '2024-11-18 09:37:19', '超级管理员', '2024-11-18 09:37:19', '');
+INSERT INTO `sys_menu` VALUES (01858761159550345217, '录像计划', 1747912341556742146, 4, 'videoChannelPlan', 'iot/videoChannelPlan/index', NULL, 1, 0, 'C', '0', '0', '', '1', 'date', NULL, '超级管理员', '2024-11-19 14:36:09', '超级管理员', '2024-11-21 11:20:07', '');
 
 update sys_multi_layer_dictionary set is_system=1 where id in (1,2,3,4);
 -- 新增预置品牌
@@ -311,7 +313,7 @@ CREATE TABLE `iot_dvs_plantype` (
                                     `id` bigint NOT NULL,
                                     `dvs_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'iot_device_info表device_code',
                                     `channel_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'iot_device_info表device_code',
-                                    `plan_type` int DEFAULT NULL COMMENT '录像计划类型（0：全天定时录像；1：分时段定时录像；2：全天移动侦测；3：混合录像计划）',
+                                    `plan_type` int DEFAULT NULL COMMENT '录像计划类型（0：全天定时录像；1：分时段定时录像；2：全天移动侦测；3：异常计划；4：分时段定时动检录像；5：分时段动检录像；-2：设备不支持；-3：通讯失败）',
                                     `create_time` datetime DEFAULT NULL COMMENT '创建时间',
                                     `update_time` datetime DEFAULT NULL COMMENT '更新时间',
                                     `min_time` datetime DEFAULT NULL COMMENT '录像时间段最小时间',
@@ -326,7 +328,7 @@ CREATE TABLE `iot_dvs_plantype` (
 drop table if exists `iot_dvs_template`;
 CREATE TABLE `iot_dvs_template` (
                                     `id` bigint NOT NULL,
-                                    `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '录像模板名称',
+                                    `name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '录像模板名称',
                                     `type` int DEFAULT NULL COMMENT '生成类型：0.系统 1.手动',
                                     `template_md5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name生成的MD5',
                                     `iot_token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
@@ -367,6 +369,21 @@ VALUES ('app token过期时间（单位:分钟）', 'TOKEN_APP_EXPIRETIME', '480
 ALTER TABLE `iot_alarm_subsystem_log`
     MODIFY COLUMN `org_path` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '机构' AFTER `alarm_host_code`;
 
+UPDATE `iot_server_product` SET `display_name` = 'Hik' WHERE `id` = '19ed86f7-780d-29ec-4bc7-3a13a7097ea1';
+UPDATE `iot_server_product` SET `display_name` = 'DaHua_V1' WHERE `id` = '783bb246-6ebe-7e69-e055-3a14adfe10c9';
+UPDATE `iot_server_product` SET `display_name` = 'DaHua' WHERE `id` = '92467897-92ef-647f-e55e-3a13b7f3ca9a';
+
+
+
+
+
+
+
+
+
+
+
+
 drop table if exists `sys_oper_log_history`;
 CREATE TABLE `sys_oper_log_history` (
                                         `oper_id` bigint NOT NULL AUTO_INCREMENT COMMENT '日志主键',