Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/quartz/quartz.sql

@@ -0,0 +1 @@
+INSERT INTO `sys_job`(`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (129, '恶劣天气预警', 'DEFAULT', 'WeatherTask.getDataFromApi', '0 0 7,10,14,17 * * ? *', '1', '1', '0', '超级管理员', '2023-09-25 11:46:50', '', NULL);

project_data/sql/0.0.2/soc/soc.sql

@@ -121,9 +121,59 @@ BEGIN
             add rec_status int null comment '推荐状态:0:正常案例、1:行社优秀案例、2:已推荐地区优秀案例、3:地区优秀案例、4:已推荐省级优秀案例、5:省级优秀案例' after status;
     END IF;
 
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'sync_fjnx_org_business_relation'
+                    AND column_name = 'tree_show_parent_code') THEN
+        ALTER TABLE `sync_fjnx_org_business_relation`
+            ADD COLUMN `tree_show_parent_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构树上显示的父级编码' AFTER `business_parent_code`;
+    END IF;
+
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'sync_fjnx_org_business_relation'
+                    AND column_name = 'org_type') THEN
+        ALTER TABLE `sync_fjnx_org_business_relation`
+            ADD COLUMN `org_type` int NULL DEFAULT NULL COMMENT '同步配置表自定义机构类型 1：省联社 2：办事处 3: 地区行社' AFTER `tree_show_parent_code`;
+    END IF;
+
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'sync_fjnx_org_business_relation'
+                    AND column_name = 'dqhs_org_code') THEN
+        ALTER TABLE `sync_fjnx_org_business_relation`
+            ADD COLUMN `dqhs_org_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL COMMENT '办事处对应的地区行社，机构编码是办事处时需要配置' AFTER `org_type`;
+    END IF;
+
 END??
 DELIMITER ;
 CALL schema_change();
+
+-- 新增fjnx机构同步 机构关系配置表数据
+delete from sync_fjnx_org_business_relation ;
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (1, 'M39000000', 'M31000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (2, 'M42000000', 'M33000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (3, 'M43000000', 'M34000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (4, 'M39000000', 'M35000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (5, 'M45000000', 'M36000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (6, 'M46000000', 'M37000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (7, 'M47000000', 'M38000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (8, '900000000', 'C900000000', 'C900000000', 1, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (9, 'M40000000', 'C900000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (10, 'M44000000', 'C900000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (11, 'M31000000', NULL, NULL, 2, 'M39000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (12, 'M32000000', NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (13, 'M33000000', NULL, NULL, 2, 'M42000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (14, 'M34000000', NULL, NULL, 2, 'M43000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (15, 'M35000000', NULL, NULL, 2, 'M39000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (16, 'M36000000', NULL, NULL, 2, 'M45000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (17, 'M37000000', NULL, NULL, 2, 'M46000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (18, 'M38000000', NULL, NULL, 2, 'M47000000', NULL, NULL, NULL, NULL);
+
+
 -- 新增演练任务推荐状态字典
 delete from sys_dict_type where dict_type='drill_task_rec_status';
 delete from sys_dict_data where dict_type='drill_task_rec_status';
@@ -146,7 +196,7 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 
 
 -- 公告通知start
-delete from sys_dict_type where dict_type in('messag_type','message_status');
+delete from sys_dict_type where dict_type in('messag_type','message_status') and dict_name in('消息类型','消息状态');
 INSERT INTO `sys_dict_type`( `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '消息类型', 'messag_type', '0', '超级管理员', '2023-09-13 17:03:11', '超级管理员', '2023-09-13 17:07:06', NULL);
 INSERT INTO `sys_dict_type`( `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '消息状态', 'message_status', '0', '超级管理员', '2023-09-13 17:08:11', '', NULL, NULL);
 
@@ -156,15 +206,33 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 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', 'message_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 17:09:11', '', 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 ( 0, '已发布', '1', 'message_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 17:09:19', '', NULL, NULL);
 
-delete from sys_menu where id in(2196,2208,2209,2210,2211,2212,2213);
-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 (2196, '公告通知', 2168, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
-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 (2208, '详情', 2196, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:query', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:27', '', 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 (2209, '编辑', 2196, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:edit', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:56', '', 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 (2210, '新增', 2196, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:add', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:18', '', 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 (2211, '删除', 2196, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:remove', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:42', '', 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 (2212, '发布', 2196, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:publish', '1', '#', NULL, '超级管理员', '2023-09-19 15:19:03', '', NULL, '');
+delete from sys_menu where menu_name in('公告通知','公告通知详情','公告通知编辑','新增公告通知','删除公告通知','发布公告通知','取消发布');
+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 (2196, '公告通知', 2207, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
+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 (2208, '公告通知详情', 2196, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:query', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:27', '', 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 (2209, '公告通知编辑', 2196, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:edit', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:56', '', 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 (2210, '新增公告通知', 2196, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:add', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:18', '', 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 (2211, '删除公告通知', 2196, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:remove', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:42', '', 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 (2212, '发布公告通知', 2196, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:publish', '1', '#', NULL, '超级管理员', '2023-09-19 15:19:03', '', 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 (2213, '取消发布', 2196, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:cancelPublish', '1', '#', NULL, '超级管理员', '2023-09-19 15:19:25', '', NULL, '');
 
+delete from sys_role_menu where menu_id in(2208,2209,2210,2211,2212,2213,2196) ;
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2196);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2208);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2209);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2210);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2211);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2212);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2213);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2196);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2208);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2209);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2210);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2211);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2212);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2213);
+
 DROP TABLE IF EXISTS `core_announcement_notification`;
 CREATE TABLE `core_announcement_notification`  (
    `id` bigint(0) NOT NULL,
@@ -222,10 +290,10 @@ INDEX `announcement_notification_id_index`(`announcement_notification_id`) USING
 
 
 -- 天气预警start
-delete from sys_menu where id=2166;
+delete from sys_menu where menu_name='天气预警数据';
 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 (2166, '天气预警数据', 1, 100, 'core/weather', 'core/weather/index', NULL, 1, 0, 'C', '0', '0', 'core:weather:list', '1', 'color', NULL, '超级管理员', '2023-09-12 11:40:46', '超级管理员', '2023-09-12 11:43:45', '');
 delete from sys_config where config_key='WEATHER_APP_CODE';
-INSERT INTO `sys_config`(`config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('天气接口AppCode', 'WEATHER_APP_CODE', '3ea812b74f67479e9ab0b3d1969a18d2...0', 'N', '超级管理员', '2023-09-13 14:08:42', '超级管理员', '2023-09-13 14:38:32', '天气接口的appcode（请根据购买的api接口填写）');
+INSERT INTO `sys_config`(`config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('天气接口AppCode', 'WEATHER_APP_CODE', '3ea812b74f67479e9ab0b3d1969a18d2', 'N', '超级管理员', '2023-09-13 14:08:42', '超级管理员', '2023-09-13 14:38:32', '天气接口的appcode（请根据购买的api接口填写）');
 DROP TABLE IF EXISTS `core_weather_warning`;
 CREATE TABLE `core_weather_warning`  (
  `id` bigint(0) NOT NULL AUTO_INCREMENT,
@@ -357,16 +425,13 @@ INSERT INTO `core_weather_city`(`AREACODE`, `AREAID`, `NAMEEN`, `NAMECN`, `DISTR
 
 -- 天气预警end
 
--- Web预案演练菜单
-delete from sys_menu where menu_name in ('预案演练管理','演练库管理','演练计划管理','演练任务管理');
+-- Web演练库按钮及权限
+delete from sys_menu where menu_name in ('预案演练管理','演练');
 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 (2319, '预案演练管理', 0, 6, '/drill', null, null, 1, 0, 'M', '0', '0', null, '1', 'dashboard', null, '超级管理员', now(), '', 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 (2320, '演练库管理', 2205, 1, '/dictionary', 'core/drill/drillDictionary/index', null, 1, 0, 'C', '0', '0', 'core:drillDictionary:list', '1', 'component', null, '超级管理员', now(), '超级管理员', now(), '');
-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 (2321, '演练计划管理', 2205, 2, '/drillPlan', 'core/drill/plan/index', null, 1, 0, 'C', '0', '0', 'core:drillPlan:list', '1', 'documentation', null, '超级管理员', now(), '', 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 (2322, '演练任务管理', 2205, 3, '/drillTask', 'core/drill/task/index', null, 1, 0, 'C', '0', '0', 'core:drillTask:list', '1', 'druid', null, '超级管理员', now(), '', 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 (2311, '演练', 0, 12, '/', null, null, 1, 0, 'M', '0', '0', null, '0', '#', null, '超级管理员', now(), '', null, '');
 
--- Web演练库按钮及权限
-delete from sys_menu where menu_name in ('演练库新增','演练库查询','演练库编辑','演练库详情','演练库删除');
+delete from sys_menu where menu_name in ('演练库管理','演练库新增','演练库查询','演练库编辑','演练库详情','演练库删除');
+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 (2320, '演练库管理', 2319, 1, '/dictionary', 'core/drill/drillDictionary/index', null, 1, 0, 'C', '0', '0', 'core:drillDictionary:list', '1', 'component', null, '超级管理员', now(), '超级管理员', now(), '');
 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 (2220, '演练库新增', 2320, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:add', '1', '#', null, '超级管理员', now(), '', 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 (2221, '演练库查询', 2320, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:list', '1', '#', null, '超级管理员', now(), '', 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 (2222, '演练库编辑', 2320, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:edit', '1', '#', null, '超级管理员', now(), '', null, '');
@@ -374,27 +439,231 @@ INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, quer
 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 (2224, '演练库删除', 2320, 5, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:remove', '1', '#', null, '超级管理员', now(), '', null, '');
 
 -- Web演练计划按钮及权限
-delete from sys_menu where menu_name in ('演练计划新增','演练计划列表','演练计划下发','演练计划编辑','演练计划删除');
+delete from sys_menu where menu_name in ('演练计划管理','演练计划新增','演练计划列表','演练计划下发','演练计划编辑','演练计划删除','演练计划详情');
+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 (2321, '演练计划管理', 2319, 2, '/drillPlan', 'core/drill/plan/index', null, 1, 0, 'C', '0', '0', 'core:drillPlan:list', '1', 'documentation', null, '超级管理员', now(), '超级管理员', now(), '');
 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 (2225, '演练计划新增', 2321, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:add', '1', null, null, '超级管理员', now(), '超级管理员', now(), '');
 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 (2226, '演练计划列表', 2321, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:list', '1', null, null, '超级管理员', now(), '', 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 (2227, '演练计划下发', 2321, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:publish', '1', null, null, '超级管理员', now(), '超级管理员', now(), '');
 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 (2228, '演练计划编辑', 2321, 4, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:edit', '1', null, null, '超级管理员', now(), '', 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 (2229, '演练计划删除', 2321, 5, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:remove', '1', null, null, '超级管理员', now(), '', 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 (2338, '演练计划详情', 2321, 6, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:query', '1', null, null, '超级管理员', now(), '', null, '');
 
 -- Web演练任务按钮及权限
-delete from sys_menu where menu_name in ('演练任务登记','演练任务详情','演练任务签名','演练任务评价');
+delete from sys_menu where menu_name in ('演练任务管理','演练任务登记','演练任务详情','演练任务签名','演练任务评价');
+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 (2322, '演练任务管理', 2319, 3, '/drillTask', 'core/drill/task/index', null, 1, 0, 'C', '0', '0', 'core:drillTask:list', '1', 'druid', null, '超级管理员', now(), '超级管理员', now(), '');
 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 (2215, '演练任务登记', 2322, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:edit', '1', '#', null, '超级管理员', now(), '', 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 (2216, '演练任务详情', 2322, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:query', '1', '#', null, '超级管理员', now(), '', 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 (2217, '演练任务签名', 2322, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:sign', '1', '#', null, '超级管理员', now(), '', 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 (2218, '演练任务评价', 2322, 4, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:evaluate', '1', '#', null, '超级管理员', now(), '', null, '');
 
 -- App端预案演练登记菜单目录
-delete from sys_menu where menu_name in ('演练','演练登记','演练统计排名','优秀案例管理','优秀案例学习');
-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 (2311, '演练', 0, 12, '/', null, null, 1, 0, 'M', '0', '0', null, '0', '#', null, '超级管理员', now(), '', 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 (2312, '演练登记', 2311, 1, '/rehearsalTask', null, null, 1, 0, 'C', '0', '0', '', '0', '#', null, '超级管理员', now(), '超级管理员', now(), '');
-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 (2313, '演练统计排名', 2311, 1, '/drillStatistics', null, null, 1, 0, 'C', '0', '0', null, '0', '#', null, '超级管理员', now(), '', 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 (2314, '优秀案例管理', 2311, 2, '/rehearsaloptimal', null, null, 1, 0, 'M', '0', '0', '', '0', null, null, '超级管理员', now(), '超级管理员', now(), '');
-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 (2315, '优秀案例学习', 2311, 4, '/rehearsallearning', null, null, 1, 0, 'M', '0', '0', '', '0', null, null, '超级管理员', now(), '超级管理员', now(), '');
+delete from sys_menu where menu_name in ('演练登记','演练统计排名','优秀案例管理','优秀案例学习');
+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 (2312, '演练登记', 2311, 1, '/rehearsalTask', null, null, 1, 0, 'C', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAM1BMVEVHcEzYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXHYvXF4gE2CAAAAEHRSTlMA0HAgQLDwgMAQYKCQUDDgVczG7QAAAAlwSFlzAAALEgAACxIB0t1+/AAAAhVJREFUWIXtmNtyhSAMRVFAUVH5/6/tGIkiBjmAnXZa9lsHXIVctvGwqqqqqoBaUyI10NSliGqMorF9Idb8AFb26dJrDCvy6lk+YwNhj2r5Hiyr2H+G5W2vVN/yV7FCYZ8qv23yscPkGoC++mA2dmiuxtJcuNlYZTzJN7DEq2N8AdvdsWs5dqR82zluJlZS2KkY21BYZ3cmlqK6oN+FXSlqU4wlU+Y0RCaWHKTKC2wg2qFzXCETS41SvbOci/UN7JKwAgfjXhheMkbvvM1LNr7tOA7ctd5SCZaxWSullJ5vC2XYoP4StqGXmJDqLnk2b2S+NZpc0pQjOB9NQ2Qa37ZetMBZA1T0sHkvvEfsVVCfpCvugqHJjhAJWB5wLxS8JcdUrGShl7lVB6FNxUKuybfuZceUhoWzPH8Lw33mNOx0HiUoqLE1CbtEEmawVnQYe8/MGkuYwcbkYaxv//YgjwnDK227JI1li9f4MMfzGHXvdz5N9++UB4Xs4NSagkNhZCi8ber7u4KIsEBB5WDCJqpZZrsWpy5n3mC6wA8RQWHFftwu8JuSI+fp0UnYSra2GM+dn2KhcTGiLY21rRIqLQoLEcOQDDQWGztaW+fT82Eh8C9o7IyX+RQL1SiP5wNYe51o6R5PaydhTcCNxWFvSwSL14Zw4QjeBsZxwT6Pwi7oHG7/2OpyIH7LO/fHK7eqqur3izH2BalxfxDJImssAAAAAElFTkSuQmCC', null, '超级管理员', now(), '超级管理员',now(), '');
+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 (2313, '演练统计排名', 2311, 1, '/drillStatistics', null, null, 1, 0, 'C', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAM1BMVEVHcEzB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pLB0pJW8V+EAAAAEHRSTlMAYLDgEPDQwIBAMKBwIJBQkhN9vAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAoZJREFUWIXtmNmSrCAMhlFZ4oLm/Z92Stkh2kJbp07N+F/1Ih8SsgF79epfS68SEeXCH50X0Ep0D1JnDFofowLG2h6iapFgRdXgCdXJPwumIs2roVdB3lJ8QJxorMqwM/FMlz2zE8eJsR4RRxqbjaBWNebPsIPYzydvcRO7DxeZEewi5Zmri8/YHQHZb9NwST3sE4vwXEWZkMsrarEdxBaQWMYXuAh2PnyywQn2g5J9FpQbNmFjMwgydtuwbHR2UHTINGIZ21alFJzEYTv2Wv8Rls+Jg/WELzZg92BJREROA9amjD2TnAZEPdb57O6vq/1cJPJqLHf5a4yK2vA11pfHGFu8bjXWpxkWB3H+urXYFBRyTpYZarG+PPbHV0y/tmK155iSElw49d1KLGSrDvVn+QYb6oLOppFfYKcQs12GtfM0YaMcc9SaOD0kVqjC8rhDEFOadBJfUIW198wvUVIlKq3kAtJUdvjCiqSkH030gTM9BlVwubztc/LbXaQP1yXlvRIiDH7ABTZ8omygypFglrERjZSV9H/1Bdb83hHYLh9BbdkkyGbFBK4g1gk2pnmCLVu7BYgDl+ntZwprtyO0nhV+a3ATiTXGHZJn72G5G0lhN/SbVok1KXulsWbO4Ou1WE0FxWbnEn5DKmwrbT+vc6qwkw7BeWpSzQTGFe3rCuf6hwOMEEd7Sw8GjmZTze2zw02serEv9sW+2F+KLbotvcCiy2crsHuGHyBo8+3H+RpuYLe8MPlzBtHa3ccWdfSitavBsi2+uTxu7cxMZ1eBN7Gl+N5Sr+cXYY3YT7L3t4vDXjhNjbSjGb58hmrPHas9P5G3dm0a1/mIIQ49PGSCV39UjLEf/p1q4sZjU5oAAAAASUVORK5CYII=', null, '超级管理员', now(), '超级管理员', now(), '');
+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 (2314, '优秀案例管理', 2311, 2, '/rehearsaloptimal', null, null, 1, 0, 'M', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFYAAABWCAMAAABiiJHFAAAAM1BMVEVHcEymgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKWmgKV36H0vAAAAEHRSTlMA0KAg8BAwQMCAYOCQULBwyOgprQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAllJREFUWIXtmFuSoCAMRQERiM/sf7VTPASCoNjdX1PcX/EYk0uCsqGhoaE/kgJQH0jzDrBMr8uURJS6G7qhk5jfqYi4dFI5Bq2Pb2ipxq6FLqzBKP5CPRgT9rU6qAtmagcySURus7RJxO1TsIhrc9ms9VVTrV+KYIVE73boFMV22+dbtBSrO9TASoIlWRPYoYYtjvxO4jDdQ0WsY8nNZAep32DZllYc9IpA5OZRHGXT6jGFR+nHV2doNO2Lu+sK672H/A5L9lA3dkE5tbFzZs2ygz1htfVWE6uIbw3N7gNWSVvgFpZSQ5NqYlOmJumWNrDzWrqQ9DyKPVdE4cEzR6naJQPPWufUIPPSEewe8qT9QHFX6tg5pMBkfVc0sJNEqW3AaJYD8WRtLGRvHnvDXMdyxN3aas0fXsde9VqyR4Q4SqyIadcmtaQqNo4xlbecbPAk7FKfn1VsHGMud5g/JGGv/MvaNqxhI8hfil5LHrPY8EqVjtHAbpQTa5ay4JJQ3dYP2Bieb5mxZqlOr6O7gk3Nnyu6jeW2dE7gCtZF5yOW+0WNmZDXw/UOYFrHuQrW9e7zSm+IdY4xGxAmWoU3knHHOh/IcrpeOz9JGgPQSvEd6yaYuGGv3YlcAHwvmTetvmMZUzsAnA0Q1V5ihXdoDRvlyiWeBrosB7rx++AJ+5NTjcOqP8fuvmmWByKyRjZARMVJexIbKw/jxZqp5yBa90roBOGF+z5iOhSwbGAHdmAHdmAHNsmfinkYh1/+ID7K/7PbPf7xc/sj9wSwnwUaoPPv4dDQ0H8jxtg/vgNYlsZOPYcAAAAASUVORK5CYII=', null, '超级管理员', now(), '超级管理员', now(), '');
+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 (2315, '优秀案例学习', 2311, 4, '/rehearsallearning', null, null, 1, 0, 'M', '0', '0', '', '0', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABWCAMAAACNSvr7AAAAM1BMVEVHcEx3max3max3max3max3max3max3max3max3max3max3max3max3max3max3max3mayxYUqyAAAAEHRSTlMAMNAgEPBggMBAUOCQoLBwPe7hCQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAjBJREFUWIXtmOtyhCAMhVFBQLzs+z9tRyRIFFwJbKed9fza2tmvkOQksezRo0fFGlRSM6fDh9eFFjpXXnHlt3FnHcpU4/bxmBdzBSo18bV5+5160FpPdbjD6bn5QD0opcyfiW+npVy074B1uFyCR9u+IncRwZeMrsTl8+Fr65H1Fbe/QWWsjX6vkatGeKTkrnvY8YQN61bZn9vuFipU9MLG18WGJQxKFY2gn4w2BgRsF8+Mcb9ebzPlUxlbEinvPJeEZVOC6zInqb0gHl5f+ryhYd9xyfoUN+aKVbqQ2ye4BSujFRdR7FyITRVaaRgSB1bF2OgGLUqja3VKnaCa4QjGoWgrYRnrguQJWSUIQJbWeGLua1IfuXF+0nmRzFOqnZFm5a6LbYky20GJYbypoKWFxxVriNGmRredCShbpsKxNFKxqJNtHTfcAQWVO5+5KMLEYuMI0py5tE0Hr1Du0njs00otzBpMHuyTewv0QQ1CuD0EDyXSmMOD2A1gHPNX/pp+nMPwGAWH8o8nPC3b+C3MNSMmcMBWAd5bhz0728u+5fQ48y6b7gU738tQUIIdzuW4IzEQkLWRxc8L98n0ss9a597Q3IF5C5XrPmR6GVqOgosLe+LOZxP+ct6qtmdtbzUTZ42vaeUdkuVlGBTrafYaHnerKH+lrHEErpqOrTHgQqvI8LJ/124uuFAyGV6GMFj3JrmuhDPGEXfrjS2uIbbvrJfni/1IasKPHv0DMcZ+AB6xa3Jz3P3pAAAAAElFTkSuQmCC', null, '超级管理员', now(), '超级管理员', now(), '');
+
+-- 演练相关菜单权限
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (115, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (116, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (117, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (118, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (119, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2218);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2313);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2314);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (120, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (121, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (122, 2338);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2215);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2216);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2217);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2220);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2221);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2222);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2223);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2224);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2225);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2226);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2227);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2228);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2229);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2311);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2312);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2315);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2319);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2320);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2321);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2322);
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES (128, 2338);
+
 
 
 -- 检查任务表

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/message/vo/MessageAppPageVo.java

@@ -0,0 +1,54 @@
+package com.xunmei.common.core.domain.message.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 公告通知对象 core_announcement_notification
+ *
+ * @author xunmei
+ * @date 2023-09-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+@ApiModel(value = "CoreAnnouncementNotification对象" , description = "公告通知")
+public class MessageAppPageVo
+        {
+private static final long serialVersionUID=1L;
+
+    /**  */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 标题 */
+    private String title;
+
+    /** 内容 */
+            @ApiModelProperty(value = "内容")
+    private String content;
+    /** 发布时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            @ApiModelProperty(value = "发布时间")
+    private Date publishTime;
+
+
+
+            @ApiModelProperty(value = "附件")
+            private List<String> fileList;
+
+            @ApiModelProperty(value = "附件")
+            private String strFileList;
+
+   private Integer isRead;
+        }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -532,12 +532,14 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         String typeText = task.getTypeText() == null ? StringUtil.EMPTY_STRING : task.getTypeText();
         String presetCase = task.getPresetCase() == null ? StringUtil.EMPTY_STRING : task.getPresetCase();
         String drillSituation = task.getDrillSituation() == null ? StringUtil.EMPTY_STRING : task.getDrillSituation();
+        String recorderName = task.getRecorderName() == null ? StringUtil.EMPTY_STRING : task.getRecorderName();
 
         data.put("orgName", StringUtils.isNotEmpty(orgName) ? orgName : StringUtil.EMPTY_STRING);
         data.put("drillSite", StringUtils.isNotEmpty(drillSite) ? drillSite : StringUtil.EMPTY_STRING);
         data.put("drillTime", StringUtils.isNotEmpty(drillTime) ? drillTime : StringUtil.EMPTY_STRING);
         data.put("hostName", StringUtils.isNotEmpty(hostName) ? hostName : StringUtil.EMPTY_STRING);
         data.put("typeText", StringUtils.isNotEmpty(typeText) ? typeText : StringUtil.EMPTY_STRING);
+        data.put("recorderName", StringUtils.isNotEmpty(recorderName) ? recorderName : StringUtil.EMPTY_STRING);
         data.put("presetCase", StringUtils.isNotEmpty(presetCase) ? "预设案由: " + presetCase : StringUtil.EMPTY_STRING);
         data.put("drillSituation", StringUtils.isNotEmpty(drillSituation) ? "演练情况: " + drillSituation : StringUtil.EMPTY_STRING);
         List<CoreDrillTaskToUser> taskUserList = task.getTaskUserList();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/controller/CoreAnnouncementNotificationController.java

@@ -6,6 +6,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationDto
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -105,7 +106,7 @@ public class CoreAnnouncementNotificationController extends BaseController {
 
     @ApiOperation(value = "App查询消息列表")
     @PostMapping("/appList")
-    public TableDataInfo<CoreAnnouncementNotificationAppPageVo> appList(@RequestBody CoreAnnouncementNotificationAppPageDto request) {
+    public TableDataInfo<MessageAppPageVo> appList(@RequestBody CoreAnnouncementNotificationAppPageDto request) {
         return coreAnnouncementNotificationService.selectAppPage(request);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/mapper/CoreAnnouncementNotificationMapper.java

@@ -10,6 +10,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationApp
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -83,9 +84,9 @@ public interface CoreAnnouncementNotificationMapper extends BaseMapper<CoreAnnou
 
     void deleteNotificationToUsers(@Param("notificationId")  Long notificationId);
 
-    Page<CoreAnnouncementNotificationAppPageVo> selectAppPage(@Param("page")Page<CoreAnnouncementNotificationAppPageVo> page, @Param("request")CoreAnnouncementNotificationAppPageDto request);
+    Page<MessageAppPageVo> selectAppPage(@Param("page")Page<MessageAppPageVo> page, @Param("request")CoreAnnouncementNotificationAppPageDto request);
 
-    List<CoreAnnouncementNotificationToUser> selectNotificationToUsers(@Param("request")CoreAnnouncementNotificationAppPageDto request, @Param("records")List<CoreAnnouncementNotificationAppPageVo> records);
+    List<CoreAnnouncementNotificationToUser> selectNotificationToUsers(@Param("request")CoreAnnouncementNotificationAppPageDto request, @Param("records")List<MessageAppPageVo> records);
 
     CoreAnnouncementNotificationToUser checkIsRead(@Param("request") CoreAnnouncementNotificationAppPageDto request);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/service/ICoreAnnouncementNotificationService.java

@@ -7,6 +7,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationDto
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 import java.util.List;
@@ -76,7 +77,7 @@ public interface ICoreAnnouncementNotificationService extends IService<CoreAnnou
 
     void publish(Long id);
 
-    TableDataInfo<CoreAnnouncementNotificationAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request);
+    TableDataInfo<MessageAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request);
 
     void markIsRead(CoreAnnouncementNotificationAppPageDto request);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/service/impl/CoreAnnouncementNotificationServiceImpl.java

@@ -18,6 +18,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationDto
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.bean.BeanUtils;
@@ -103,8 +104,8 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
     }
 
     @Override
-    public TableDataInfo<CoreAnnouncementNotificationAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request) {
-        Page<CoreAnnouncementNotificationAppPageVo> page;
+    public TableDataInfo<MessageAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request) {
+        Page<MessageAppPageVo> page;
         //分页
         if (request.getPageNum()!=null&&request.getPageSize()!=null)
         {
@@ -135,8 +136,8 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
         coreAnnouncementNotificationMapper.insertNotificationUser(notificationUser);
     }
 
-    private Page<CoreAnnouncementNotificationAppPageVo> buildNewNotificationAppPageVo(Page<CoreAnnouncementNotificationAppPageVo> page, CoreAnnouncementNotificationAppPageDto request) {
-        List<CoreAnnouncementNotificationAppPageVo> records = page.getRecords();
+    private Page<MessageAppPageVo> buildNewNotificationAppPageVo(Page<MessageAppPageVo> page, CoreAnnouncementNotificationAppPageDto request) {
+        List<MessageAppPageVo> records = page.getRecords();
         List<CoreAnnouncementNotificationToUser> list = coreAnnouncementNotificationMapper.selectNotificationToUsers(request,records);
             records.forEach(r->{
                 int num = (int) list.stream().filter(a->a.getUserId().equals(request.getUserId())&&a.getAnnouncementNotificationId().equals(r.getId())).count();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -343,7 +343,7 @@ public class SafetyCheckJobBusiness {
             checkTask.setCheckOrgId(taskPlan.getCheckOrg().getId());
             checkTask.setCheckOrgName(taskPlan.getCheckOrg().getName());
             checkTask.setStatus(1);
-            checkTask.setDoneStatus(0);
+            checkTask.setDoneStatus(1);
             checkTask.setCheckType(0L);
             checkTask.setCheckCycle(Long.valueOf(taskPlan.getPlanCycle()));
             checkTask.setYmdDate(datetime);

soc-modules/soc-modules-core/src/main/resources/mapper/message/CoreAnnouncementNotificationMapper.xml

@@ -81,7 +81,7 @@
         </foreach>
     </select>
     <select id="selectAppPage"
-            resultType="com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo">
+            resultType="com.xunmei.common.core.domain.message.vo.MessageAppPageVo">
         select T.*,T.file_list as strFileList from (select a.* from core_announcement_notification a
                          left join core_announcement_notification_to_role b on a.id = b.announcement_notification_id
                          left join core_announcement_notification_to_org c on a.id = c.announcement_notification_id

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -220,8 +220,8 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("hostName").toString(), Element.ALIGN_CENTER, 2, 1);
 
         //第三行
-        createPDFCell(tableFont, table, "演练项目", Element.ALIGN_CENTER, 5, 1);
-        createPDFCell(tableFont, table, data.get("typeText").toString(), Element.ALIGN_CENTER, 2, 1);
+        createPDFCell(tableFont, table, "演练项目", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("typeText").toString(), Element.ALIGN_CENTER, 5, 1);
 
         //内容
         PdfPCell contentCell = new PdfPCell();
@@ -263,6 +263,10 @@ public class PdfUtil {
         cell.addElement(imageTable);
         table.addCell(cell);
 
+        //第三行
+        createPDFCell(tableFont, table, "记录人", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("recorderName").toString(), Element.ALIGN_CENTER, 5, 1);
+
     /*    //第三行
         createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_CENTER, 1, 1);
         createPDFCell(tableFont, table, data.get("users").toString(), Element.ALIGN_CENTER, 5, 1);*/

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -88,7 +88,7 @@ public class SysUserController extends BaseController {
 
             if (i >= 0) {
                 String[] split = s.split(",");
-                for (int l = 0; l < split.length - 1; l++) {
+                for (int l = 0; l < split.length; l++) {
                     if (split[l].endsWith("管理人员") || split[l].equals("超级管理员")) {
                         admin = true;
                         break;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeptServiceImpl.java

@@ -324,15 +324,18 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
     private List<SysOrgVO> generateTree(List<SysOrgVO> orgs, SysOrg sysOrg) {
         Long parentId = Constants.TOP_ORG_PARENT_ID;
-        if (ObjectUtil.isNotEmpty(sysOrg) && ObjectUtil.notEqual(Constants.TOP_ORG_PARENT_ID, sysOrg.getParentId())) {
-            parentId = sysOrg.getParentId();
+        if (ObjectUtil.isNotEmpty(sysOrg) && ObjectUtil.notEqual(Constants.TOP_ORG_PARENT_ID, sysOrg.getTreeShowParentId())) {
+            parentId = sysOrg.getTreeShowParentId();
         }
 
         // 顶级机构存在多个的情况
-        final List<Long> parentIds = orgs.stream().filter(x -> !orgs.stream().anyMatch(y -> x.getTreeShowParentId().equals(y.getId()))).map(SysOrgVO::getTreeShowParentId).collect(Collectors.toList());
+        List<Long> parentIds = orgs.stream().filter(x -> !orgs.stream().anyMatch(y -> x.getTreeShowParentId().equals(y.getId()))).map(SysOrgVO::getTreeShowParentId).collect(Collectors.toList());
         if (parentIds.size() == 0) {
             parentIds.add(parentId);
         }
+        else {
+            parentIds=parentIds.stream().distinct().collect(Collectors.toList());
+        }
         final Map<Long, List<SysOrgVO>> collect = orgs.stream().collect(Collectors.groupingBy(SysOrgVO::getTreeShowParentId));
         List<SysOrgVO> result = new ArrayList<>();
         parentIds.forEach(pId -> {