From 061eaaa4ccf11be24f5d27c48200c6d3b55d9b8e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 13 Sep 2021 10:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8Cgov-mine=E3=80=81message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/StaffMessageResultDTO.java  | 12 ++++++++++++
 .../src/main/resources/mapper/UserMessageDao.xml     |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java
index 43a31a5e00..0e29e1175f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java
@@ -35,5 +35,17 @@ public class StaffMessageResultDTO implements Serializable {
      * 通知时间
      */
     private Long createdTime;
+
+
+
+
+    /**
+     * 消息分类:info-上传下达消息 详见UserMessageTypeConstant
+     */
+    private String messageType;
+    /**
+     * 消息对应的业务id,比如message_type=info时，此列存储的是消息id,可跳转到消息详情
+     */
+    private String targetId;
 }
 
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml
index fa4266f1e7..7aca569542 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml
@@ -35,7 +35,9 @@
             customer_id,
             created_time,
             grid_id,
-            message_content
+            message_content,
+            message_type,
+            target_id
         FROM
             user_message
         WHERE
@@ -66,7 +68,9 @@
             title,
             message_content as messageContent,
             read_flag as readFlag,
-            unix_timestamp(CREATED_TIME) as createdTime
+            unix_timestamp(CREATED_TIME) as createdTime,
+            message_type AS messageType,
+            target_id AS targetId
         from
             user_message
         where