|
|
@@ -26,6 +26,8 @@ import shop.alien.util.common.safe.TextModerationResultVO;
|
|
|
import shop.alien.util.common.safe.TextModerationUtil;
|
|
|
import shop.alien.util.common.safe.TextReviewServiceEnum;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
+import shop.alien.util.type.PhoneTypeIdResult;
|
|
|
+import shop.alien.util.type.TypeUtil;
|
|
|
|
|
|
import javax.websocket.*;
|
|
|
import javax.websocket.server.PathParam;
|
|
|
@@ -68,6 +70,8 @@ public class WebSocketProcess implements ApplicationContextAware {
|
|
|
*/
|
|
|
private static final ConcurrentHashMap<String, Map<String, String>> connectionInfoMap = new ConcurrentHashMap<>(12);
|
|
|
|
|
|
+ private TypeUtil typeUtil;
|
|
|
+
|
|
|
@Override
|
|
|
public void setApplicationContext(ApplicationContext context) {
|
|
|
WebSocketProcess.applicationContext = context;
|
|
|
@@ -133,6 +137,15 @@ public class WebSocketProcess implements ApplicationContextAware {
|
|
|
|
|
|
// 保存消息记录
|
|
|
LifeMessage lifeMessage = new LifeMessage();
|
|
|
+ //新增传入发送人的分类和id
|
|
|
+ PhoneTypeIdResult phoneTypeIdResult =typeUtil.resolveTypeAndId(webSocketVo.getSenderId());
|
|
|
+ lifeMessage.setSenderRefId(phoneTypeIdResult.getId());
|
|
|
+ lifeMessage.setSenderUserType(phoneTypeIdResult.getType());
|
|
|
+ //新增传入接收人的分类和id
|
|
|
+ PhoneTypeIdResult phoneTypeIdResultNew =typeUtil.resolveTypeAndId(webSocketVo.getReceiverId());
|
|
|
+ lifeMessage.setReceiverRefId(phoneTypeIdResultNew.getId());
|
|
|
+ lifeMessage.setReceiverUserType(phoneTypeIdResultNew.getType());
|
|
|
+
|
|
|
lifeMessage.setSenderId(webSocketVo.getSenderId());
|
|
|
lifeMessage.setReceiverId(webSocketVo.getReceiverId());
|
|
|
lifeMessage.setContent(webSocketVo.getText());
|