diff --git a/kernel-s-message/message-business/pom.xml b/kernel-s-message/message-business/pom.xml
index d7246c704..6bc394eaa 100644
--- a/kernel-s-message/message-business/pom.xml
+++ b/kernel-s-message/message-business/pom.xml
@@ -20,7 +20,22 @@
cn.stylefeng.roses
- message-api
+ message-sdk-db
+ ${roses.version}
+
+
+
+
+
+ cn.stylefeng.roses
+ wrapper-api
+ ${roses.version}
+
+
+
+
+ cn.stylefeng.roses
+ system-api
${roses.version}
diff --git a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/controller/SysMessageController.java
similarity index 96%
rename from kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java
rename to kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/controller/SysMessageController.java
index 41a492c8f..1be5d39f3 100644
--- a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/SysMessageController.java
+++ b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/controller/SysMessageController.java
@@ -22,7 +22,7 @@
* 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns
* 6.若您的项目无法满足以上几点,可申请商业授权
*/
-package cn.stylefeng.roses.kernel.message.modular;
+package cn.stylefeng.roses.kernel.message.modular.controller;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.roses.kernel.message.api.MessageApi;
@@ -30,11 +30,13 @@ import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum;
import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageRequest;
import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest;
import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse;
+import cn.stylefeng.roses.kernel.message.modular.wrapper.MessageWrapper;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
+import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -127,6 +129,7 @@ public class SysMessageController {
* @date 2021/1/8 13:50
*/
@GetResource(name = "分页查询系统消息列表", path = "/sysMessage/page")
+ @Wrapper(MessageWrapper.class)
public ResponseData page(MessageRequest messageRequest) {
return new SuccessResponseData(messageApi.queryPageCurrentUser(messageRequest));
}
diff --git a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/wrapper/MessageWrapper.java b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/wrapper/MessageWrapper.java
new file mode 100644
index 000000000..68e4ff2eb
--- /dev/null
+++ b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/wrapper/MessageWrapper.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright [2020-2030] [https://www.stylefeng.cn]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Guns源码头部的版权声明。
+ * 3.请保留源码和相关描述文件的项目出处,作者声明等。
+ * 4.分发源码时候,请注明软件出处 https://gitee.com/stylefeng/guns
+ * 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns
+ * 6.若您的项目无法满足以上几点,可申请商业授权
+ */
+package cn.stylefeng.roses.kernel.message.modular.wrapper;
+
+import cn.hutool.extra.spring.SpringUtil;
+import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse;
+import cn.stylefeng.roses.kernel.system.api.UserServiceApi;
+import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO;
+import cn.stylefeng.roses.kernel.wrapper.api.BaseWrapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 消息的包装
+ *
+ * @author fengshuonan
+ * @date 2021/6/14 17:28
+ */
+public class MessageWrapper implements BaseWrapper {
+
+ @Override
+ public Map doWrap(MessageResponse beWrappedModel) {
+
+ HashMap resultMap = new HashMap<>();
+ UserServiceApi userServiceApi = SpringUtil.getBean(UserServiceApi.class);
+
+ if (beWrappedModel.getSendUserId() != null) {
+ SysUserDTO sysUserDTO = userServiceApi.getUserInfoByUserId(beWrappedModel.getSendUserId());
+ if (sysUserDTO != null) {
+ resultMap.put("sendUserName", sysUserDTO.getRealName());
+ }
+ }
+
+ return resultMap;
+ }
+
+}