合并本地分支

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

@@ -58,6 +58,11 @@ public class TpMessage {
      * 未读消息图标
      */
     private String unreadMessageIcon;
+    
+    /**
+     * 消息详情url链接
+     */
+    private String messageDetailUrl;
 
     public Integer getId() {
         return id;
@@ -234,4 +239,12 @@ public class TpMessage {
     public void setUnreadMessageIcon(String unreadMessageIcon) {
         this.unreadMessageIcon = unreadMessageIcon;
     }
+    
+    public String getMessageDetailUrl() {
+        return messageDetailUrl;
+    }
+    
+    public void setMessageDetailUrl(String messageDetailUrl) {
+        this.messageDetailUrl = messageDetailUrl;
+    }
 }

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

@@ -24,6 +24,7 @@
     <result column="content" property="content" jdbcType="VARCHAR" />
     <result column="read_message_icon" property="readMessageIcon" jdbcType="VARCHAR" />
     <result column="unread_message_icon" property="unreadMessageIcon" jdbcType="VARCHAR" />
+    <result column="message_detail_url" property="messageDetailUrl" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -286,7 +287,8 @@
         r.content,
         d.name as ticket_status,
         i.read_message_icon,
-		i.unread_message_icon
+		i.unread_message_icon,
+		i.message_detail_url
     FROM
         tp_message t
     LEFT JOIN tp_ticket k on t.ticket_id = k.id  AND k.community_id = #{communityId,jdbcType=INTEGER}

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542706521" Name="smartCommunity" Objects="666" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542770145" Name="smartCommunity" Objects="655" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5947,7 +5947,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1542706044</a:CreationDate>
 <a:ModificationDate>1542706044</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-21601,-60237), (-4813,-55139))</a:Rect>
+<a:Rect>((-21601,-60687), (-4813,-54689))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -11170,9 +11170,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>type</a:Code>
 <a:CreationDate>1539759920</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1542166126</a:ModificationDate>
+<a:ModificationDate>1542770145</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>类型 ：  论坛:social 服务：service 可添加</a:Comment>
+<a:Comment>类型 ：  服务：service, 公告：announcement , 活动：activity  租赁 ： transaction可添加</a:Comment>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
@@ -12150,7 +12150,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>tp_message_icon</a:Code>
 <a:CreationDate>1542706044</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1542706508</a:ModificationDate>
+<a:ModificationDate>1542768591</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:Comment>消息图标表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -12204,9 +12204,21 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>varchar(255)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
+<o:Column Id="o610">
+<a:ObjectID>C445B8E4-084E-4063-AB92-2E31B6C816BE</a:ObjectID>
+<a:Name>message_detail_url</a:Name>
+<a:Code>message_detail_url</a:Code>
+<a:CreationDate>1542768554</a:CreationDate>
+<a:Creator>szc</a:Creator>
+<a:ModificationDate>1542768618</a:ModificationDate>
+<a:Modifier>szc</a:Modifier>
+<a:Comment>消息详情url</a:Comment>
+<a:DataType>varchar(255)</a:DataType>
+<a:Length>255</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o610">
+<o:Key Id="o611">
 <a:ObjectID>26A69CCB-020F-4EF0-9143-8764DED242E3</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -12220,12 +12232,12 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o610"/>
+<o:Key Ref="o611"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o611">
+<o:Group Id="o612">
 <a:ObjectID>9FAF56B5-A351-488F-9A3B-D4A944CD4081</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -12667,7 +12679,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o612">
+<o:TargetModel Id="o613">
 <a:ObjectID>B86EB932-C352-4174-86E4-2D2B1DDE4A45</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>