|
|
@@ -3,13 +3,13 @@ package cn.org.bjca.trust.java.imserver.im; |
|
|
|
|
|
|
|
import cn.org.bjca.trust.java.imserver.common.SpringUtilsAuTo; |
|
|
|
import cn.org.bjca.trust.java.imserver.common.json.GsonImplHelp; |
|
|
|
import cn.org.bjca.trust.java.imserver.entitys.Conversation; |
|
|
|
import cn.org.bjca.trust.java.imserver.entitys.GroupEntity; |
|
|
|
import cn.org.bjca.trust.java.imserver.entitys.UserInfo; |
|
|
|
import cn.org.bjca.trust.java.imserver.enums.PacketType; |
|
|
|
import cn.org.bjca.trust.java.imserver.im.bean.PacketMessage; |
|
|
|
import cn.org.bjca.trust.java.imserver.im.msg.ConnectMessage; |
|
|
|
import cn.org.bjca.trust.java.imserver.im.msg.ConnectedMessage; |
|
|
|
import cn.org.bjca.trust.java.imserver.im.msg.ConversationMessage; |
|
|
|
import cn.org.bjca.trust.java.imserver.im.msg.msg.SZYXMessage; |
|
|
|
import cn.org.bjca.trust.java.imserver.im.msg.msg.SendAckMessage; |
|
|
|
import cn.org.bjca.trust.java.imserver.repository.*; |
|
|
@@ -120,11 +120,17 @@ public class ImManager { |
|
|
|
|
|
|
|
private void saveConversation(SZYXMessage szyxMessage) { |
|
|
|
try { |
|
|
|
Conversation conversation = new Conversation(); |
|
|
|
ConversationMessage conversation = new ConversationMessage(); |
|
|
|
conversation.setGroup(szyxMessage.isGroup()); |
|
|
|
conversation.setSender(!szyxMessage.isArrive()); |
|
|
|
conversation.setMessage(szyxMessage); |
|
|
|
conversation.setSelf(userRepository.findFirstByUserIdAndOsTypeAndAppId(szyxMessage.getUserName(), szyxMessage.getOsType(), szyxMessage.getAppId())); |
|
|
|
|
|
|
|
conversation.setAppId(szyxMessage.getAppId()); |
|
|
|
conversation.setUserName(szyxMessage.getUserName()); |
|
|
|
conversation.setOsType(szyxMessage.getOsType()); |
|
|
|
conversation.setToken(szyxMessage.getToken()); |
|
|
|
|
|
|
|
if (szyxMessage.isGroup()) { |
|
|
|
conversation.setGroupEntity(groupRepository.findFirstByAppIdAndGroupId(szyxMessage.getAppId(), szyxMessage.getGroupID())); |
|
|
|
} else { |
|
|
@@ -138,6 +144,7 @@ public class ImManager { |
|
|
|
} |
|
|
|
|
|
|
|
conversationRepository.save(conversation); |
|
|
|
sendPacketMessage(PacketType.CONVERSATION, conversation); |
|
|
|
} catch (Exception e) { |
|
|
|
System.out.println("--------------" + e.getMessage()); |
|
|
|
} |
|
|
|