diff --git a/kernel-s-message/message-sdk-db/pom.xml b/kernel-s-message/message-sdk-db/pom.xml index 3fbd51b84..821711aea 100644 --- a/kernel-s-message/message-sdk-db/pom.xml +++ b/kernel-s-message/message-sdk-db/pom.xml @@ -30,6 +30,7 @@ db-sdk-mp ${roses.version} + cn.stylefeng.roses @@ -37,13 +38,6 @@ ${roses.version} - - - cn.stylefeng.roses - socket-api - ${roses.version} - - diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java index 598d6a3a5..ca2d4f949 100644 --- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java @@ -41,8 +41,6 @@ import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse; import cn.stylefeng.roses.kernel.message.db.entity.SysMessage; import cn.stylefeng.roses.kernel.message.db.service.SysMessageService; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.socket.api.SocketOperatorApi; -import cn.stylefeng.roses.kernel.socket.api.enums.ServerMessageTypeEnum; import cn.stylefeng.roses.kernel.socket.api.exception.SocketException; import cn.stylefeng.roses.kernel.sys.api.SysUserServiceApi; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -64,9 +62,6 @@ import java.util.stream.Collectors; @Service public class MessageDbServiceImpl implements MessageApi { - @Resource - private SocketOperatorApi socketOperatorApi; - @Resource private SysUserServiceApi sysUserServiceApi; @@ -126,7 +121,7 @@ public class MessageDbServiceImpl implements MessageApi { // 给用户发送通知 for (SysMessage item : sendMsgList) { try { - socketOperatorApi.sendMsgOfUserSession(ServerMessageTypeEnum.SYS_NOTICE_MSG_TYPE.getCode(), item.getReceiveUserId().toString(), item); +// socketOperatorApi.sendMsgOfUserSession(ServerMessageTypeEnum.SYS_NOTICE_MSG_TYPE.getCode(), item.getReceiveUserId().toString(), item); } catch (SocketException socketException) { // 该用户不在线 diff --git a/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.0_20240109_2241__add_org_status.sql b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.0_20240109_2241__add_org_status.sql index 6c63b9c2e..362c59a1d 100644 --- a/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.0_20240109_2241__add_org_status.sql +++ b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.0_20240109_2241__add_org_status.sql @@ -15,11 +15,11 @@ ADD COLUMN `tenant_id` bigint NULL COMMENT '租户号' AFTER `del_flag`; -- 更新个人信息表 ALTER TABLE `sys_message` -MODIFY COLUMN `receive_user_id` bigint(0) NOT NULL COMMENT '接收用户id' AFTER `message_id`, +MODIFY COLUMN `receive_user_id` bigint NOT NULL COMMENT '接收用户id' AFTER `message_id`, MODIFY COLUMN `message_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '消息标题' AFTER `send_user_id`, MODIFY COLUMN `message_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '消息内容' AFTER `message_title`, MODIFY COLUMN `message_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'NORMAL' COMMENT '消息类型:NORMAL-普通类型,URL-带链接跳转' AFTER `message_content`, MODIFY COLUMN `priority_level` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'low' COMMENT '优先级:high-高优先级,middle-中,low-低' AFTER `message_url`, -MODIFY COLUMN `business_id` bigint(0) NULL DEFAULT NULL COMMENT '关联业务id' AFTER `message_send_time`, -ADD COLUMN `version_flag` bigint(0) NULL DEFAULT NULL COMMENT '乐观锁' AFTER `read_flag`, -ADD COLUMN `tenant_id` bigint(0) NULL DEFAULT NULL COMMENT '租户号' AFTER `update_time`; \ No newline at end of file +MODIFY COLUMN `business_id` varchar(255) NULL DEFAULT NULL COMMENT '关联业务id' AFTER `message_send_time`, +ADD COLUMN `version_flag` bigint NULL DEFAULT NULL COMMENT '乐观锁' AFTER `read_flag`, +ADD COLUMN `tenant_id` bigint NULL DEFAULT NULL COMMENT '租户号' AFTER `update_time`; \ No newline at end of file