ソースを参照

Merge remote-tracking branch 'origin/V0.0.6-iot' into V0.0.6-iot

jingyuanchao 1 年間 前
コミット
1cfd181e39
1 ファイル変更116 行追加2 行削除
  1. 116 2
      project_data/sql/0.0.6-iot/soc/soc.sql

+ 116 - 2
project_data/sql/0.0.6-iot/soc/soc.sql

@@ -1066,8 +1066,111 @@ CREATE TABLE `mediator_network_device_detection_log` (
      KEY `idx_user_orgPath` (`org_path`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT=' 网络设备检测日志';
 
+drop table if exists iot_alarm_data;
+CREATE TABLE `iot_alarm_data` (
+    `id` bigint NOT NULL,
+    `rule_id` bigint DEFAULT NULL COMMENT '规则id',
+    `org_id` bigint DEFAULT NULL COMMENT '机构id',
+    `device_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '设备名称',
+    `device_id` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '设备id',
+    `source_type` int DEFAULT NULL COMMENT '报警源类型(设备类型):4:烟雾传感器;5: 温湿度采集器;6:水浸; 7:门磁、窗磁;8:卷帘门门磁;9:地磁;10燃气报警器;50:报警防区',
+    `source_type_des` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '报警源类型(设备类型) 中文',
+    `field_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性code',
+    `time` datetime DEFAULT NULL COMMENT '告警时间',
+    `end_time` datetime DEFAULT NULL COMMENT '告警结束时间',
+    `operator` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '操作符,GT(大于)、GTE(大于等于)、LT(小于)、LTE(小于等	于)、EQUALS(等于)',
+    `value` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '对比值key',
+    `value_text` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '对比值value',
+    `content` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '告警内容',
+    `alarm_value` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '告警值',
+    `is_do` int DEFAULT NULL COMMENT '0未处理1已处理',
+    `do_time` datetime DEFAULT NULL COMMENT '处理时间',
+    `do_type` tinyint DEFAULT '0' COMMENT '处理方式:0:为处理,1:(暂无)2:误报,3:正常告警,4:报修',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+    `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警数据表';
+
+drop table if exists iot_alarm_rule;
+CREATE TABLE `iot_alarm_rule` (
+  `id` bigint NOT NULL DEFAULT '0',
+  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '规则名称',
+  `enabled` int NOT NULL DEFAULT '0' COMMENT '是否启用',
+  `isdeleted` int NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'alarm:告警,inspection:一键巡检',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注信息',
+  `create_by` varchar(125) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建人名称',
+  `update_by` varchar(125) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL COMMENT '修改人名称',
+  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警规则表';
+
+drop table if exists iot_alarm_rule_express;
+CREATE TABLE `iot_alarm_rule_express` (
+  `id` bigint NOT NULL DEFAULT '0',
+  `rule_id` bigint NOT NULL DEFAULT '0' COMMENT '规则编码',
+  `fieldCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性code',
+  `operator` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作符,GT(大于)、GTE(大于等于)、LT(小于)、LTE(小于等\r\n于)、EQUALS(等于)、STARTS_WITH(以什么开始)、\r\nENDS_WITH(以什么结束)、CONTAIN(包含)',
+  `value` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对比值',
+  `value_text` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '对比值',
+  `source_type` int NOT NULL COMMENT '报警源类型:4:烟雾传感器;5: 温湿度采集器;6:水浸; 7:门磁、窗磁;8:卷帘门门磁;9:地磁;10燃气报警器;50:报警防区',
+  `week_day` int DEFAULT NULL COMMENT '规则使用周期:1.周一,2.周二,3.周三,4.周四,5.周五,6.周六,7.周日',
+  `start_time` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '开始时间如:07:30',
+  `end_time` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '结束时间如:16:00',
+  `create_by` varchar(125) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建人名称',
+  `update_by` varchar(125) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL COMMENT '修改人名称',
+  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `rule_id` (`rule_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警规则表达式表';
+
+drop table if exists iot_alarm_rule_source;
+CREATE TABLE `iot_alarm_rule_source` (
+     `id` bigint NOT NULL,
+     `org_id` bigint DEFAULT NULL COMMENT 'value_type=Device时有值为设备所属机构Id,否则为空',
+     `rule_id` bigint DEFAULT NULL COMMENT '报警规则编码',
+     `source_type` int DEFAULT NULL COMMENT '报警源类型:4:烟雾传感器;5:温湿度采集器;6:水浸,7:门磁:窗磁,8:卷帘门门磁;9:地磁,10:燃气报警器,50:报警防区',
+     `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'value_type=Device时有值为设备Id,否则为空',
+     `value_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'AllDevice:所有设备,Device:单个设备',
+     `create_by` varchar(125) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+     `create_time` datetime DEFAULT NULL COMMENT '创建人名称',
+     `update_by` varchar(125) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL COMMENT '修改人名称',
+     `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+     PRIMARY KEY (`id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警规则与设备源关系表';
+
+drop table if exists iot_alarm_system_field;
+CREATE TABLE `iot_alarm_system_field` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `source_type` int NOT NULL COMMENT '报警源类型(设备类型):4:烟雾传感器;5: 温湿度采集器;6:水浸; 7:门磁、窗磁;8:卷帘门门磁;9:地磁;10燃气报警器;50:报警防区',
+  `source_type_des` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '报警源类型(设备类型) 中文',
+  `sys_field_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '系统属性code(报警类型编码,全表唯一)',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '系统属性名称',
+  `specs` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性规格信息,eg:{ \r\n"0": "门已关闭", \r\n"1": "门已打开" \r\n}',
+  `operators` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '该属性拥有哪些操作符eg:{ \r\n"GT": "大于", \r\n"LT": "小于" \r\n}\r\n\r\nGT(大于)、GTE(大于等于)、LT(小于)、LTE(小于等\r\n于)、EQUALS(等于)、STARTS_WITH(以什么开始)、\r\nENDS_WITH(以什么结束)、CONTAIN(包含)',
+  `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据值类型,eg:”FLOAT“、"ENUM"',
+  `type_des` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据值类型中午描述,eg:”浮点型“、"枚举"',
+  `unit` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性单位,非必填',
+  `enable` int NOT NULL DEFAULT '0' COMMENT '是否启用0 是1否',
+  `create_by` varchar(125) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建人名称',
+  `update_by` varchar(125) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL COMMENT '修改人名称',
+  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='系统报警属性字段表';
 
-
+delete from iot_alarm_system_field;
+INSERT INTO `iot_alarm_system_field` (`id`, `source_type`, `source_type_des`, `sys_field_code`, `name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (1, 4184, '水浸', '4184', '水浸告警', '{\"0\": \"正常\",\"1\": \"告警\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, '2022-07-26 16:14:26', NULL, '2022-07-26 16:14:30', NULL);
+INSERT INTO `iot_alarm_system_field` (`id`, `source_type`, `source_type_des`, `sys_field_code`, `name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (2, 4182, '烟感', '4182', '烟雾告警', '{\"0\": \"正常\",\"1\": \"告警\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, '2022-07-26 16:14:26', NULL, '2022-07-26 16:14:30', NULL);
+INSERT INTO `iot_alarm_system_field` (`id`, `source_type`, `source_type_des`, `sys_field_code`, `name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (3, 4183, '温湿度', '4183_1', '环境温度', '{}', '{\"GT\": \"大于\",\"GTE\": \"大于等于\",\"LT\": \"小于\",\"LTE\": \"小于等于\",\"EQUALS\": \"等于\"}', 'FLOAT', '浮点型', '%RH', 1, '2022-07-26 16:14:26', NULL, '2022-07-26 16:14:30', NULL);
+INSERT INTO `iot_alarm_system_field` (`id`, `source_type`, `source_type_des`, `sys_field_code`, `name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (4, 4183, '温湿度', '4183_2', '环境湿度', '{}', '{\"GT\": \"大于\",\"GTE\": \"大于等于\",\"LT\": \"小于\",\"LTE\": \"小于等于\",\"EQUALS\": \"等于\"}', 'FLOAT', '浮点型', '°C', 1, '2022-07-26 16:14:26', NULL, '2022-07-26 16:14:30', NULL);
+INSERT INTO `iot_alarm_system_field` (`id`, `source_type`, `source_type_des`, `sys_field_code`, `name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (5, 41885, '燃气', '41885', '可燃气体告警', '{\"0\": \"正常\",\"1\": \"告警\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', '', 1, '2022-07-26 16:14:26', NULL, '2022-07-26 16:14:30', NULL);
+INSERT INTO `iot_alarm_system_field` (`id`, `source_type`, `source_type_des`, `sys_field_code`, `name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (6, 4188, '门磁', '4188', '门磁开关状态', '{\"0\":\"门已打开\",\"1\":\"门已关闭\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', '', 1, '2022-07-26 16:14:26', NULL, '2022-07-26 16:14:30', NULL);
+INSERT INTO `iot_alarm_system_field` (`id`, `source_type`, `source_type_des`, `sys_field_code`, `name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (7, 4181, '红外', '4181', '红外告警', '{\"0\": \"正常\",\"1\": \"告警\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', '', 1, '2022-07-26 16:14:26', NULL, '2022-07-26 16:14:30', NULL);
 
 
 DELETE FROM `sys_dict_type` WHERE `dict_type` in('video_integrity_state','video_days_state','video_diagnosis_state');
@@ -1091,7 +1194,7 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01747912241556742146, '硬盘诊断', 1747911340288892930, 6, 'videoRecorder', 'iot/videoRecorder', NULL, 1, 0, 'C', '0', '0', 'iot:videoRecorder', '1', 'chart', NULL, '超级管理员', '2024-01-18 17:22:07', '超级管理员', '2024-02-23 09:39:39', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01760840909641408513, '录像诊断', 1747911340288892930, 5, 'videoDiagnosis', 'iot/videoDiagnosis', NULL, 1, 0, 'C', '0', '0', 'iot:videoDiagnosis', '1', 'sentinel', NULL, '超级管理员', '2024-02-23 09:37:19', '超级管理员', '2024-02-23 09:39:31', '');
-INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01749628217843228674, '告警规则管理', 1, 100, 'warnRule', 'warnRule/index', NULL, 1, 0, 'C', '0', '0', NULL, '1', 'bug', NULL, '超级管理员', '2024-01-23 11:00:48', '', NULL, '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01749628217843228674, '告警规则', 1, 100, 'warnRule', 'warnRule/index', NULL, 1, 0, 'C', '0', '0', NULL, '1', 'bug', NULL, '超级管理员', '2024-01-23 11:00:48', '', NULL, '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01761949441304440833, '动环诊断', 1747911340288892930, 7, 'sensorData', 'iot/sensorData', NULL, 1, 0, 'C', '0', '0', 'iot:sensorData', '1', 'nested', NULL, '超级管理员', '2024-02-26 11:01:32', '超级管理员', '2024-02-29 17:45:01', '');
 
 
@@ -1103,6 +1206,17 @@ delete from sys_dict_data where dict_type in ('sensor_alarm_status','sensor_devi
 INSERT INTO `sys_dict_type`(`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('动环传感器告警状态', 'sensor_alarm_status', '0', '超级管理员', '2024-03-01 09:12:16', '', NULL, NULL);
 INSERT INTO `sys_dict_type`(`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('动环传感器设备类型', 'sensor_device_type', '0', '超级管理员', '2024-03-01 09:31:11', '', NULL, NULL);
 
+-- 给各级保卫干部,及网点所有人增加权限
+DELETE from sys_role_menu WHERE menu_id in (01747911340288892930,01747912241556742146,01749628217843228674,01752868420296888322,01760840909641408513,01761949441304440833,01762681378201595906,01762681622628855809,01762681985838804994);
+INSERT into sys_role_menu SELECT id,01747911340288892930 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id,01747912241556742146 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id ,01749628217843228674 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id ,01752868420296888322 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id ,01760840909641408513 from sys_role WHERE id in (116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id ,01761949441304440833 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id ,01762681378201595906 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id ,01762681622628855809 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
+INSERT into sys_role_menu SELECT id ,01762681985838804994 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
 INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (0, '正常', '0', 'sensor_alarm_status', NULL, 'default', 'N', '0', NULL, now(), NULL, NULL, NULL);
 INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '告警', '1', 'sensor_alarm_status', NULL, 'default', 'N', '0', NULL, now(), NULL, NULL, NULL);
 INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (100, '温湿度采集器', '4183', 'sensor_device_type', NULL, 'default', 'N', '0', NULL, now(), NULL, NULL, NULL);