diff --git a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java b/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java deleted file mode 100644 index 96109ddd5..000000000 --- a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.stylefeng.roses.kernel.message.api; - -/** - * 系统消息相关接口 - *

- * 接口可以有多种实现，目前只实现数据库存储方式 - * - * @author liuhanqing - * @date 2021/1/1 20:21 - */ -public interface MessageApi { - - -} \ No newline at end of file diff --git a/kernel-d-message/README.md b/kernel-s-message/README.md similarity index 100% rename from kernel-d-message/README.md rename to kernel-s-message/README.md diff --git a/kernel-d-message/message-api/README.md b/kernel-s-message/message-api/README.md similarity index 100% rename from kernel-d-message/message-api/README.md rename to kernel-s-message/message-api/README.md diff --git a/kernel-d-message/message-api/pom.xml b/kernel-s-message/message-api/pom.xml similarity index 100% rename from kernel-d-message/message-api/pom.xml rename to kernel-s-message/message-api/pom.xml diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java new file mode 100644 index 000000000..3687e057f --- /dev/null +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java @@ -0,0 +1,87 @@ +package cn.stylefeng.roses.kernel.message.api; + +import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.message.api.pojo.MessageResponse; +import cn.stylefeng.roses.kernel.message.api.pojo.MessageSendParam; +import cn.stylefeng.roses.kernel.message.api.pojo.MessageParam; + + +import java.util.List; + +/** + * 系统消息相关接口 + *

+ * 接口可以有多种实现，目前只实现数据库存储方式 + * + * @author liuhanqing + * @date 2021/1/2 21:21 + */ +public interface MessageApi { + + /** + * 发送系统消息 + * + * @param messageSendParam 系统消息参数 + * @author liuhanqing + * @date 2021/1/2 21:21 + */ + void sendMessage(MessageSendParam messageSendParam); + + /** + * 更新阅读状态 + * + * @param messageParam 系统消息参数 + * @author liuhanqing + * @date 2021/1/2 22:15 + */ + void updateReadFlag(MessageParam messageParam); + + /** + * 删除系统消息 + * + * @param messageId 消息id + * @author liuhanqing + * @date 2021/1/2 21:21 + */ + void deleteByMessageId(Long messageId); + + /** + * 批量删除系统消息 + * + * @param messageIds 消息id字符串，多个用逗号分隔 + * @author liuhanqing + * @date 2021/1/2 21:21 + */ + void batchDeleteByMessageId(String messageIds); + + /** + * 查看系统消息 + * + * @param messageParam 查看参数 + * @return 系统消息 + * @author liuhanqing + * @date 2021/1/2 21:21 + */ + MessageResponse messageDetail(MessageParam messageParam); + + /** + * 查询系统消息 + * + * @param messageParam 查询参数 + * @return 查询分页结果 + * @author liuhanqing + * @date 2021/1/2 21:21 + */ + PageResult queryMessagePage(MessageParam messageParam); + + /** + * 查询系统消息 + * + * @param messageParam 查询参数 + * @return 系统消息列表 + * @author liuhanqing + * @date 2021/1/2 21:21 + */ + List queryMessageList(MessageParam messageParam); + +} \ No newline at end of file diff --git a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/constants/MessageConstants.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/constants/MessageConstants.java similarity index 100% rename from kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/constants/MessageConstants.java rename to kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/constants/MessageConstants.java diff --git a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/context/MessageContext.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/context/MessageContext.java similarity index 100% rename from kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/context/MessageContext.java rename to kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/context/MessageContext.java diff --git a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java similarity index 100% rename from kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java rename to kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/MessageException.java diff --git a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java similarity index 100% rename from kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java rename to kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/exception/enums/MessageExceptionEnum.java diff --git a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageParam.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageParam.java similarity index 95% rename from kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageParam.java rename to kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageParam.java index 8d28ea806..60d62f4d1 100644 --- a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageParam.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageParam.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.message.api.pojo.manage; +package cn.stylefeng.roses.kernel.message.api.pojo; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java new file mode 100644 index 000000000..2d6c01f2d --- /dev/null +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java @@ -0,0 +1,67 @@ +package cn.stylefeng.roses.kernel.message.api.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 系统消息的查询参数 + * + * @author liuhanqing + * @date 2021/1/2 21:23 + */ +@Data +public class MessageResponse implements Serializable { + + /** + * 消息id + */ + private Long messageId; + + /** + * 接收用户id + */ + private Long receiveUserId; + + /** + * 发送用户id + */ + private Long sendUserId; + + /** + * 消息标题 + */ + private String messageTitle; + + /** + * 消息的内容 + */ + private String messageContent; + + /** + * 消息类型 + */ + private String messageType; + + /** + * 消息发送时间 + */ + private Date messageSendTime; + + /** + * 业务id + */ + private Long businessId; + + /** + * 业务类型 + */ + private String businessType; + + /** + * 阅读状态：0-未读，1-已读 + */ + private Integer readFlag; + +} diff --git a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageSendParam.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageSendParam.java similarity index 95% rename from kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageSendParam.java rename to kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageSendParam.java index 6a9b334bf..a044b4320 100644 --- a/kernel-d-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageSendParam.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageSendParam.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.message.api.pojo.manage; +package cn.stylefeng.roses.kernel.message.api.pojo; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; diff --git a/kernel-d-message/message-business/README.md b/kernel-s-message/message-business/README.md similarity index 100% rename from kernel-d-message/message-business/README.md rename to kernel-s-message/message-business/README.md diff --git a/kernel-d-message/message-business/pom.xml b/kernel-s-message/message-business/pom.xml similarity index 100% rename from kernel-d-message/message-business/pom.xml rename to kernel-s-message/message-business/pom.xml diff --git a/kernel-d-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java similarity index 100% rename from kernel-d-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java rename to kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java diff --git a/kernel-d-message/message-sdk-db/README.md b/kernel-s-message/message-sdk-db/README.md similarity index 100% rename from kernel-d-message/message-sdk-db/README.md rename to kernel-s-message/message-sdk-db/README.md diff --git a/kernel-d-message/message-sdk-db/pom.xml b/kernel-s-message/message-sdk-db/pom.xml similarity index 100% rename from kernel-d-message/message-sdk-db/pom.xml rename to kernel-s-message/message-sdk-db/pom.xml 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 new file mode 100644 index 000000000..380e501fc --- /dev/null +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java @@ -0,0 +1,63 @@ +package cn.stylefeng.roses.kernel.message.db; + +import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.message.api.MessageApi; +import cn.stylefeng.roses.kernel.message.api.constants.MessageConstants; +import cn.stylefeng.roses.kernel.message.api.pojo.MessageParam; +import cn.stylefeng.roses.kernel.message.api.pojo.MessageResponse; +import cn.stylefeng.roses.kernel.message.api.pojo.MessageSendParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 系统消息，数据库实现 + * + * @author liuhanqing + * @date 2021/1/2 22:00 + */ +@Slf4j +@Service +public class MessageDbServiceImpl implements MessageApi { + + @Override + public void sendMessage(MessageSendParam messageSendParam) { + String receiveUserIds = messageSendParam.getReceiveUserIds(); + // 发送所有人判断 + if (MessageConstants.RECEIVE_ALL_USER_FLAG.equals(receiveUserIds)) { + + } + + } + + @Override + public void updateReadFlag(MessageParam messageParam) { + + } + + @Override + public void deleteByMessageId(Long messageId) { + + } + + @Override + public void batchDeleteByMessageId(String messageIds) { + + } + + @Override + public MessageResponse messageDetail(MessageParam messageParam) { + return null; + } + + @Override + public PageResult queryMessagePage(MessageParam messageParam) { + return null; + } + + @Override + public List queryMessageList(MessageParam messageParam) { + return null; + } +} diff --git a/kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java similarity index 100% rename from kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java rename to kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/entity/SysMessage.java diff --git a/kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/SysMessageMapper.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/SysMessageMapper.java similarity index 100% rename from kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/SysMessageMapper.java rename to kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/SysMessageMapper.java diff --git a/kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/mapping/SysMessageMapper.xml b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/mapping/SysMessageMapper.xml similarity index 100% rename from kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/mapping/SysMessageMapper.xml rename to kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/mapper/mapping/SysMessageMapper.xml diff --git a/kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java similarity index 100% rename from kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java rename to kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java diff --git a/kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java similarity index 100% rename from kernel-d-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java rename to kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java diff --git a/kernel-d-message/message-spring-boot-starter/README.md b/kernel-s-message/message-spring-boot-starter/README.md similarity index 100% rename from kernel-d-message/message-spring-boot-starter/README.md rename to kernel-s-message/message-spring-boot-starter/README.md diff --git a/kernel-d-message/message-spring-boot-starter/pom.xml b/kernel-s-message/message-spring-boot-starter/pom.xml similarity index 100% rename from kernel-d-message/message-spring-boot-starter/pom.xml rename to kernel-s-message/message-spring-boot-starter/pom.xml diff --git a/kernel-d-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java b/kernel-s-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java similarity index 100% rename from kernel-d-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java rename to kernel-s-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java diff --git a/kernel-d-message/message-spring-boot-starter/src/main/resources/META-INF/spring.factories b/kernel-s-message/message-spring-boot-starter/src/main/resources/META-INF/spring.factories similarity index 100% rename from kernel-d-message/message-spring-boot-starter/src/main/resources/META-INF/spring.factories rename to kernel-s-message/message-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/kernel-d-message/pom.xml b/kernel-s-message/pom.xml similarity index 95% rename from kernel-d-message/pom.xml rename to kernel-s-message/pom.xml index 9429be1b9..728ea6b52 100644 --- a/kernel-d-message/pom.xml +++ b/kernel-s-message/pom.xml @@ -11,7 +11,7 @@ ../pom.xml - kernel-d-message + kernel-s-message pom diff --git a/pom.xml b/pom.xml index a9d5a5486..1c04eed85 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ kernel-s-dict - kernel-d-message + kernel-s-message kernel-s-system