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/soc/soc.sql

@@ -2,6 +2,10 @@
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
+ -- 处理菜单图标字段
+update sys_menu set icon='#' where icon is null or icon ='';
+alter table sys_menu modify icon mediumtext null comment '菜单图标';
+
 -- ----------------------------
 -- Table structure for core_announcement_notification
 -- ----------------------------
@@ -24,9 +28,9 @@ INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `com
 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 (2198, '详情', 2073, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:query', '1', '#', NULL, '超级管理员', '2023-09-14 16:10:35', '超级管理员', '2023-09-14 19:26:20', '');
 
 -- 修改教育培训菜单名称
-update sys_menu set menu_name ='安全教育' where id=2127;
+update sys_menu set menu_name ='教育培训管理' where id=2127;
 update sys_menu set menu_name ='知识库标签管理' where id=2038;
-update sys_menu set menu_name ='上传学习资料' where id=2045;
+update sys_menu set menu_name ='知识库管理' where id=2045;
 update sys_menu set menu_name ='培训计划管理' where id=2059;
 update sys_menu set menu_name ='培训任务管理' where id=2079;
 
@@ -207,7 +211,7 @@ 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, '已发布', '1', 'message_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 17:09:19', '', NULL, NULL);
 
 delete from sys_menu where menu_name in('公告通知','公告通知详情','公告通知编辑','新增公告通知','删除公告通知','发布公告通知','取消发布');
-delete from sys_menu where menu_name in(2208,2209,2210,2211,2212,2213,2196);
+delete from sys_menu where id in(2208,2209,2210,2211,2212,2213,2196);
 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, '');
@@ -465,6 +469,8 @@ 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 (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(), '');
 
 -- 演练相关菜单权限
+delete from sys_role_menu where menu_id in(2216, 2217, 2218, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2313, 2314, 2315, 2319, 2320, 2321, 2322, 2338, 2216, 2217, 2218, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2313, 2314, 2315, 2319, 2320, 2321, 2322, 2338, 2216, 2218, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2313, 2314, 2315, 2319, 2320, 2321, 2322, 2338, 2216, 2218, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2313, 2314, 2315, 2319, 2320, 2321, 2322, 2338, 2215, 2216, 2217, 2218, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2313, 2314, 2315, 2319, 2320, 2321, 2322, 2338, 2215, 2216, 2217, 2218, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2313, 2314, 2315, 2319, 2320, 2321, 2322, 2338, 2216, 2217, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2228, 2229, 2311, 2312, 2315, 2319, 2320, 2321, 2322, 2338, 2215, 2216, 2217, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2315, 2319, 2320, 2321, 2322, 2338, 2215, 2216, 2217, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2311, 2312, 2315, 2319, 2320, 2321, 2322, 2338);
+
 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);

project_data/sql/base/quartz.sql

@@ -325,7 +325,8 @@ INSERT INTO `sys_job` VALUES (121, '生成每周履职任务', 'DEFAULT', 'CoreR
 INSERT INTO `sys_job` VALUES (122, '生成每月履职任务', 'DEFAULT', 'CoreResumptionTask.buildMonthTask', '0 20 6 1 * ?', '1', '1', '1', '超级管理员', '2023-09-07 16:57:22', '', NULL);
 INSERT INTO `sys_job` VALUES (123, '获取恶劣天气预警数据', 'DEFAULT', 'WeatherTask.getDataFromApi', '0 0 7,10,14,17 * * ?', '1', '1', '1', '超级管理员', '2023-09-12 16:18:55', '', NULL);
 INSERT INTO `sys_job` VALUES (124, 'Edu定时处理逾期任务(每日凌晨一点)', 'DEFAULT', 'CoreEduTrainingTask.updateEduTaskStatus', '0 0 1 * * ?', '1', '1', '0', '超级管理员', '2023-09-13 11:23:29', '', '2023-09-13 11:26:41');
-
+INSERT INTO `sys_job` VALUES (128, '履职临期提醒(除了每日的）', 'DEFAULT', 'CoreMessageSendTask.resumptionRemind', '0 0 0 * * ?', '1', '1', '0', '超级管理员', '2023-09-22 17:03:31', '', '2023-09-22 20:29:13');
+INSERT INTO `sys_job` VALUES (125, '消息发送管理(每日凌晨零点）', 'DEFAULT', 'CoreMessageSendTask.messageSendTask', '0 0 0 * * ? *', '1', '1', '0', '超级管理员', '2023-09-21 12:30:22', '超级管理员', '2023-09-22 19:04:39');
 -- ----------------------------
 -- Table structure for sys_job_log
 -- ----------------------------