Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
fjnx
/
soc
2
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Merge branch 'V0.0.6-iot' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.6-iot

# Conflicts:
#	project_data/sql/0.0.6-iot/soc/soc.sql
jiawuxian 1 жил өмнө
parent
841a9044b6 1ffdd0821b
commit
847a220b7a
1 өөрчлөгдсөн 4 нэмэгдсэн , 2 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 4 2
      project_data/sql/0.0.6-iot/soc/soc.sql

+ 4 - 2
project_data/sql/0.0.6-iot/soc/soc.sql
Файл харах 

@@ -808,7 +808,7 @@ INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type
 
 DELETE from sys_role_menu WHERE menu_id in (SELECT id from sys_menu WHERE `menu_name`='物联感知' or parent_id in (SELECT id from sys_menu WHERE `menu_name`='物联感知'));
 
 DELETE from sys_menu WHERE `menu_name`='物联感知' or parent_id in (SELECT id from (SELECT id from sys_menu WHERE `menu_name`='物联感知') a);
 
 
-DELETE from `sys_menu` where id in (01747911340288892930,1749608698379771905,01762681378201595906,01762681622628855809,01762681985838804994,01747912241556742146,01760840909641408513,01749628217843228674,01761949441304440833,01764951130651414529);
 
+DELETE from `sys_menu` where id in (01747911340288892930,1749608698379771905,01762681378201595906,01762681622628855809,01762681985838804994,01747912241556742146,01760840909641408513,01749628217843228674,01761949441304440833,01764951130651414529,01765206797656702978);
 
 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 (01747911340288892930, '物联感知', 0, 27, 'iot', NULL, NULL, 1, 0, 'M', '0', '0', '', '1', 'job', NULL, '超级管理员', '2024-01-18 17:18:32', '超级管理员', '2024-02-01 09:34:05', '');
 
 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 (1749608698379771905, '物联•感知', 0, 5, '‘’', NULL, NULL, 1, 0, 'M', '0', '0', '', '0', NULL, NULL, '超级管理员', '2024-01-23 09:44:10', '超级管理员', '2024-01-23 09:44:26', '');
 
 
@@ -821,6 +821,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 (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 (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', '');
 
+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 (01765206797656702978, '告警中心', 1747911340288892930, 4, 'alarmData', 'warn/index', NULL, 1, 0, 'C', '0', '0', 'iot:warn:list', '1', 'row', NULL, '超级管理员', '2024-03-06 10:45:13', '超级管理员', '2024-03-06 10:48:03', '');
 
 
 
 update sys_menu set component ='iot/subSystem/index' WHERE menu_name='布撤防情况跟踪' and platform_type=1;
 
@@ -832,7 +833,7 @@ INSERT INTO `sys_dict_type`(`dict_name`, `dict_type`, `status`, `create_by`, `cr
 
 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);
 
+DELETE from sys_role_menu WHERE menu_id in (01747911340288892930,1749608698379771905,01747912241556742146,01749628217843228674,01752868420296888322,01760840909641408513,01761949441304440833,01762681378201595906,01762681622628855809,01762681985838804994,01764951130651414529,01765206797656702978);
 
 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 ,1749608698379771905 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);
 
@@ -844,6 +845,7 @@ INSERT into sys_role_menu SELECT id ,01762681378201595906 from sys_role WHERE id
 
 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_role_menu SELECT id ,01764951130651414529 from sys_role WHERE id in(116,118,120,121,122,128,143,144,145,146,151);
 
+INSERT into sys_role_menu SELECT id ,01765206797656702978 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);