消息通知代码调整

doc/045.20220413v2.4.0通用版_消息通知/qc_init_v2.4.0_通用版_消息通知.sql

@@ -12,18 +12,21 @@ INSERT INTO `sys_dictionary_info` (`is_deleted`, `gmt_create`, `gmt_modified`, `
 
 
 /**
-sys_menu 新增缺陷反馈记录菜单
+sys_menu 新增消息通知菜单
  */
 INSERT INTO `sys_menu` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `parent_id`, `code`, `show_status`, `maintain_status`, `order_no`, `remark`) VALUES ('120', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '消息通知', '-1', 'YH-XXTZ', '1', '1', '16', '用户-消息通知');
 INSERT INTO `sys_permission` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `code`, `permissionUrl`, `method`, `descritpion`, `remark`) VALUES ('210', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查看', 'FUNC000210', '/medNewsNotice/getNewsNoticeInfoById', 'ALL', '查看', '用户-消息通知-查看');
 INSERT INTO `sys_menu_permission` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `order_nu`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '120', '210', NULL, '用户-消息通知-查看');
 
 /**
-sys_role_menu 全院、科室、个人三个角色添加消息通知菜单
+sys_role_menu 全院、科室、个人、核查人员（院级、科室、质控科）六个角色添加消息通知菜单
  */
 INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ('N', '2022-05-05 10:36:44', '2022-05-05 10:36:44', '0', '0', '1', '120', NULL);
 INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ('N', '2022-05-05 10:36:44', '2022-05-05 10:36:44', '0', '0', '2', '120', NULL);
 INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ('N', '2022-05-05 10:36:44', '2022-05-05 10:36:44', '0', '0', '3', '120', NULL);
+INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ('N', '2022-05-05 10:36:44', '2022-05-05 10:36:44', '0', '0', '7', '120', NULL);
+INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ('N', '2022-05-05 10:36:44', '2022-05-05 10:36:44', '0', '0', '8', '120', NULL);
+INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ('N', '2022-05-05 10:36:44', '2022-05-05 10:36:44', '0', '0', '9', '120', NULL);
 
 
 /**
@@ -32,7 +35,7 @@ med_news_notice 消息通知表
 DROP TABLE IF EXISTS `med_news_notice`;
 CREATE TABLE `med_news_notice` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `hospital_id` int(11) DEFAULT NULL COMMENT '医院ID',
+  `hospital_id` bigint(11) DEFAULT NULL COMMENT '医院ID',
   `title` varchar(512) NOT NULL COMMENT '标题',
   `type` char(3) DEFAULT '0' COMMENT '通知类型,1:质控任务 0:其他',
   `news` longtext COMMENT '消息',

src/main/java/com/diagbot/aop/CheckInfoAspect.java

@@ -111,7 +111,8 @@ public class CheckInfoAspect {
                 newsNotice.setReceiver(paramJSON.getString("checkId"));
                 newsNotice.setType(NewsNoticeTypeEnum.CHECK_NEWS_WORK.getKey());
                 newsNotice.setGmtCreate(DateUtil.now());
-                newsNotice.setCreator(SysUserUtils.getCurrentPrinciple());
+                newsNotice.setCreator(SysUserUtils.getCurrentPrincipleID() == null ? "0" : SysUserUtils.getCurrentPrincipleID());
+                newsNotice.setHospitalId(SysUserUtils.getCurrentHospitalID() == null ? 0l : Long.parseLong(SysUserUtils.getCurrentHospitalID()));
                 if ("0".equals(paramJSON.getString("distributionType"))) {
                     newsNotice.setTitle("待核查质控任务提醒");
                 } else {

src/main/java/com/diagbot/entity/MedNewsNotice.java

@@ -31,7 +31,7 @@ public class MedNewsNotice implements Serializable {
     /**
      * 医院ID
      */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 标题