Merge remote-tracking branch 'origin/feature-cluster' into feature-cluster

core/src/main/java/com/wecloud/im/param/ImHistoryMessagePageParam.java

@@ -41,4 +41,7 @@ public class ImHistoryMessagePageParam extends BasePageOrderParam {
      * 当前操作人client主键id
      * 当前操作人client主键id
      */
      */
     private Long currentFkClientId;
     private Long currentFkClientId;
+
+    @ApiModelProperty("是否获取最后一条 0-否 1-是")
+    private Integer getLast;
 }
 }

core/src/main/resources/mapper/ImMessageMapper.xml

@@ -111,9 +111,15 @@
         <if test="param.msgIdStart != null">
         <if test="param.msgIdStart != null">
             AND im_message.id > #{param.msgIdStart}
             AND im_message.id > #{param.msgIdStart}
         </if>
         </if>
-        <if test="param.msgIdEnd != null">
+        <if test="param.getLast != null and param.getLast == 1">
+            AND im_message.id <![CDATA[ < ]]> #{param.msgIdEnd}
+        </if>
+        <if test="param.getLast != null and param.getLast == 0">
             AND im_message.id <![CDATA[ <= ]]> #{param.msgIdEnd}
             AND im_message.id <![CDATA[ <= ]]> #{param.msgIdEnd}
         </if>
         </if>
+        <if test="param.getLast == null">
+            AND im_message.id <![CDATA[ < ]]> #{param.msgIdEnd}
+        </if>
 
 
         ORDER BY `im_message`.`create_time` DESC
         ORDER BY `im_message`.`create_time` DESC
     </select>
     </select>