调整消息图标

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpMessage.java

@@ -50,9 +50,14 @@ public class TpMessage {
     private String content;
     
     /**
-     * 消息图标
+     * 已读消息图标
      */
-    private String messageIcon;
+    private String readMessageIcon;
+    
+    /**
+     * 未读消息图标
+     */
+    private String unreadMessageIcon;
 
     public Integer getId() {
         return id;
@@ -214,11 +219,19 @@ public class TpMessage {
         this.content = content;
     }
     
-    public String getMessageIcon() {
-        return messageIcon;
+    public String getReadMessageIcon() {
+        return readMessageIcon;
+    }
+    
+    public void setReadMessageIcon(String readMessageIcon) {
+        this.readMessageIcon = readMessageIcon;
+    }
+    
+    public String getUnreadMessageIcon() {
+        return unreadMessageIcon;
     }
     
-    public void setMessageIcon(String messageIcon) {
-        this.messageIcon = messageIcon;
+    public void setUnreadMessageIcon(String unreadMessageIcon) {
+        this.unreadMessageIcon = unreadMessageIcon;
     }
 }

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -22,7 +22,8 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="ticket_status" property="ticketStatus" jdbcType="VARCHAR" />
     <result column="content" property="content" jdbcType="VARCHAR" />
-    <result column="message_icon" property="messageIcon" jdbcType="VARCHAR" />
+    <result column="read_message_icon" property="readMessageIcon" jdbcType="VARCHAR" />
+    <result column="unread_message_icon" property="unreadMessageIcon" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -284,13 +285,14 @@
         k.status,
         r.content,
         d.name as ticket_status,
-        y.name as message_icon
+        i.read_message_icon,
+		i.unread_message_icon
     FROM
         tp_message t
     LEFT JOIN tp_ticket k on t.ticket_id = k.id  AND k.community_id = #{communityId,jdbcType=INTEGER}
     LEFT JOIN tp_ticket_record r on t.ticket_id = r.ticket_id AND r.community_id = #{communityId,jdbcType=INTEGER}  AND k.status = r.status
     LEFT JOIN sys_dictionary d on k.status = d.code AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
-    LEFT JOIN sys_dictionary y on t.message_type = y.code AND y.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "message_type_img" )
+    LEFT JOIN tp_message_icon i on t.message_type = i.message_type
     WHERE
         t.uuid_type = 1
         AND t.community_id = #{communityId,jdbcType=INTEGER}