消息id字段改为msgId

common/src/main/java/com/wecloud/im/param/add/ImMsgUpdate.java

@@ -24,7 +24,7 @@ public class ImMsgUpdate extends BaseEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty("消息id")
     @ApiModelProperty("消息id")
-    private Long id;
+    private Long msgId;
 
 
     @ApiModelProperty("内容")
     @ApiModelProperty("内容")
     private HashMap content;
     private HashMap content;

common/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java

@@ -91,7 +91,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
         }*/
         }*/
 
 
         ImMessage imMessage = new ImMessage();
         ImMessage imMessage = new ImMessage();
-        imMessage.setId(imMsgUpdate.getId());
+        imMessage.setId(imMsgUpdate.getMsgId());
 
 
         JsonMapper jsonMapper = new JsonMapper();
         JsonMapper jsonMapper = new JsonMapper();
 
 

common/src/main/java/com/wecloud/im/vo/OfflineMsgDto.java

@@ -17,7 +17,7 @@ import java.util.Date;
 public class OfflineMsgDto implements Serializable {
 public class OfflineMsgDto implements Serializable {
 
 
     @ApiModelProperty("消息id")
     @ApiModelProperty("消息id")
-    private Long id;
+    private Long msgId;
 
 
     @ApiModelProperty("创建时间")
     @ApiModelProperty("创建时间")
     private Date createTime;
     private Date createTime;

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

@@ -22,7 +22,7 @@
     </select>
     </select>
     <select id="getOfflineListByClientAndConversation" resultType="com.wecloud.im.vo.OfflineMsgDto">
     <select id="getOfflineListByClientAndConversation" resultType="com.wecloud.im.vo.OfflineMsgDto">
 
 
-        SELECT im_message.id         AS id,
+        SELECT im_message.id         AS msgId,
                im_message.create_time,
                im_message.create_time,
                im_message.withdraw_time,
                im_message.withdraw_time,
                im_message.update_date,
                im_message.update_date,
@@ -44,7 +44,7 @@
           AND im_inbox.read_msg = 0
           AND im_inbox.read_msg = 0
     </select>
     </select>
     <select id="getHistoryMsgConversationId" resultType="com.wecloud.im.vo.OfflineMsgDto">
     <select id="getHistoryMsgConversationId" resultType="com.wecloud.im.vo.OfflineMsgDto">
-        SELECT im_message.id         AS id,
+        SELECT im_message.id         AS msgId,
                im_message.create_time,
                im_message.create_time,
                im_message.withdraw_time,
                im_message.withdraw_time,
                im_message.update_date,
                im_message.update_date,
@@ -63,7 +63,7 @@
     </select>
     </select>
     <select id="getReceivedLastMsgByConversationId" resultType="com.wecloud.im.vo.OfflineMsgDto">
     <select id="getReceivedLastMsgByConversationId" resultType="com.wecloud.im.vo.OfflineMsgDto">
 
 
-        SELECT im_message.id         AS id,
+        SELECT im_message.id         AS msgId,
                im_message.create_time,
                im_message.create_time,
                im_message.withdraw_time,
                im_message.withdraw_time,
                im_message.update_date,
                im_message.update_date,
@@ -83,7 +83,7 @@
         ORDER BY create_time DESC LIMIT 1
         ORDER BY create_time DESC LIMIT 1
     </select>
     </select>
     <select id="getLastMsgByConversationId" resultType="com.wecloud.im.vo.OfflineMsgDto">
     <select id="getLastMsgByConversationId" resultType="com.wecloud.im.vo.OfflineMsgDto">
-        SELECT im_message.id         AS id,
+        SELECT im_message.id         AS msgId,
                im_message.create_time,
                im_message.create_time,
                im_message.withdraw_time,
                im_message.withdraw_time,
                im_message.update_date,
                im_message.update_date,