From 04e6df680350a2786fb26c29c10938fea6d41ed5 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 20 Feb 2023 17:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E9=98=85=E5=B7=B2=E9=98=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messagelist/app/MessageReadListQuery.java | 24 +++++++
 .../messagelist/app/MessageReadListVo.java    | 62 +++++++++++++++++++
 .../biz/messagelist/MessageListRest.java      | 13 +++-
 3 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java
 create mode 100644 message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java

diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java
new file mode 100644
index 0000000..908dd75
--- /dev/null
+++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java
@@ -0,0 +1,24 @@
+package com.yxt.messagecenter.api.messagelist.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/20 15:18
+ * @Description
+ */
+@Data
+public class MessageReadListQuery implements Query {
+    private static final long serialVersionUID = 2963827640039055901L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构全路径")
+    private String orgPath;
+    @ApiModelProperty("0 待阅 1 已阅")
+    private int state;
+
+    private String names;
+}
diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java
new file mode 100644
index 0000000..859c5dd
--- /dev/null
+++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java
@@ -0,0 +1,62 @@
+package com.yxt.messagecenter.api.messagelist.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/20 16:35
+ * @Description
+ */
+@Data
+public class MessageReadListVo implements Vo {
+    private static final long serialVersionUID = -6064144224800959448L;
+
+    @ApiModelProperty("消息列表sid")
+    private String sid;
+
+    @ApiModelProperty("消息体sid")
+    private String msgSid;
+
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String type;
+
+    @ApiModelProperty("apk下载地址（type = 2有）")
+    private String path;
+
+    @ApiModelProperty("RePlugin插件名称(type = 2有)")
+    private String modulePluginName;
+
+    @ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名)")
+    private String moduleAction;
+
+    @ApiModelProperty("模块的版本（type = 2，3有）")
+    private int moduleVersion;
+
+    @ApiModelProperty("插件Sid(type = 2有)")
+    private String moduleSid;
+
+    @ApiModelProperty("参数（规则），json类型的传参（必须为 string、string）")
+    private String json;
+
+    @ApiModelProperty("消息标题")
+    private String msgTitle;
+
+    @ApiModelProperty("消息内容")
+    private String msgContent;
+
+    @ApiModelProperty("状态(阅读状态，0未阅，1已阅)")
+    private String state;
+
+    @ApiModelProperty("发送时间")
+    private String sendTime;
+
+    //发起人
+    private String senderName;
+    //来源
+    private String msgSource;
+    //红点更新时间
+    private String redTime;
+
+}
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
index 1319c38..9333b76 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
@@ -9,9 +9,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.Message;
 import com.yxt.messagecenter.api.messagelist.*;
-import com.yxt.messagecenter.api.messagelist.app.AppMessageListQuery;
-import com.yxt.messagecenter.api.messagelist.app.AppMessageListVo;
-import com.yxt.messagecenter.api.messagelist.app.AppMsgMainVo;
+import com.yxt.messagecenter.api.messagelist.app.*;
 import com.yxt.messagecenter.biz.message.MessageService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -216,4 +214,13 @@ public class MessageListRest implements MessageListFeign {
         }
         return new ResultBean().success();
     }
+
+    @Override
+    public ResultBean<PagerVo<MessageReadListVo>> getAppReadListByUserSid(PagerQuery<MessageReadListQuery> pq) {
+        if (StringUtils.isBlank(pq.getParams().getUserSid())) {
+            return new ResultBean().fail().setMsg("用户sid不能为空");
+        }
+        PagerVo<MessageReadListVo> pagerVo = messageListService.getAppReadListByUserSid(pq);
+        return new ResultBean<PagerVo<MessageReadListVo>>().success().setData(pagerVo);
+    }
 }