更新im查找uid接口

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/controller/app/base/wukong/ChannelMessageSyncReqVo.java

@@ -10,6 +10,8 @@ public class ChannelMessageSyncReqVo {
     @JsonProperty("login_uid")
     private String  loginUid;
 
+
+    private Long enterpriseId;
     /**
      * 频道ID
      */
@@ -101,4 +103,12 @@ public class ChannelMessageSyncReqVo {
     public void setPullMode(Integer pullMode) {
         this.pullMode = pullMode;
     }
+
+    public Long getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Long enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
 }

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/controller/app/base/wukong/ConversationSyncReqVo.java

@@ -8,11 +8,12 @@ public class ConversationSyncReqVo {
 
     private Integer version=0;
 
+    private Long enterpriseId;
 
 //    private String last_msg_seqs;
 
     @JsonProperty("msg_count")
-    private Integer msgCount=50;
+    private Integer msgCount=20;
 
 
     public String getUid() {
@@ -38,4 +39,12 @@ public class ConversationSyncReqVo {
     public void setMsgCount(Integer msgCount) {
         this.msgCount = msgCount;
     }
+
+    public Long getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Long enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
 }

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/controller/app/base/wukong/ConversationsDeleteReqVo.java

@@ -9,6 +9,8 @@ public class ConversationsDeleteReqVo {
      */
     private String uid;
 
+    private Long enterpriseId;
+
     @JsonProperty("channel_id")
     private String channelId;
 
@@ -39,4 +41,12 @@ public class ConversationsDeleteReqVo {
     public void setChannelType(Integer channelType) {
         this.channelType = channelType;
     }
+
+    public Long getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Long enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
 }

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/service/UserService.java

@@ -1,15 +1,17 @@
 package com.citu.module.menduner.im.service;
 
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.im.controller.app.base.user.ImUserInfoVo;
 import com.citu.module.menduner.im.controller.app.base.user.ImUserReqVo;
 import com.citu.module.menduner.im.controller.app.base.user.ImUserResoVO;
 
+import java.util.List;
 import java.util.Set;
 
 public interface UserService {
     CommonResult<ImUserResoVO> getUser(ImUserReqVo reqVo);
 
-    String getCurrentLoginUid();
+    String getCurrentLoginUid(Long enterpriseId);
 
-//    CommonResult<List<ImUserInfoVo>> getUserByUids(Set<String> );
+    CommonResult<List<ImUserInfoVo>> getUserByUids(Set<String> uids);
 }

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/service/UserServiceImpl.java

@@ -80,10 +80,10 @@ public class UserServiceImpl implements UserService{
     }
 
     @Override
-    public String getCurrentLoginUid() {
-
+    public String getCurrentLoginUid(Long enterpriseId) {
+        enterpriseId = null==enterpriseId?DEFAULT_ENTERPRISE_ID:enterpriseId;
         Long userLoginId = LoginUserContext.getUserId();
-        UserDO userDO = mapper.selectById(userLoginId);
+        UserDO userDO = mapper.selectOne(new LambdaQueryWrapper<UserDO>().eq(UserDO::getUserId,userLoginId).eq(UserDO::getEnterpriseId,enterpriseId));
 
         if(null == userDO){
             // 开始注册
@@ -103,14 +103,14 @@ public class UserServiceImpl implements UserService{
         return userDO.getUid();
     }
 
-//    @Override
-//    public CommonResult<List<ImUserInfoVo>> getUserByUids(Set<String> uids) {
-//        if(null == uids || uids.isEmpty()){
-//            return CommonResult.success(new ArrayList<ImUserInfoVo>());
-//        }
-//        List<UserDO> userDOS = mapper.selectList(new LambdaQueryWrapper<UserDO>().in(UserDO::getUid, uids));
-//        return null;
-//    }
+    @Override
+    public CommonResult<List<ImUserInfoVo>> getUserByUids(Set<String> uids) {
+        if(null == uids || uids.isEmpty()){
+            return CommonResult.success(new ArrayList<ImUserInfoVo>());
+        }
+        List<UserDO> userDOS = mapper.selectList(new LambdaQueryWrapper<UserDO>().in(UserDO::getUid, uids));
+        return null;
+    }
 
 
     @Autowired

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/service/wukong/WuKongMessageServiceImpl.java

@@ -17,7 +17,7 @@ public class WuKongMessageServiceImpl implements WuKongMessageService{
 
     @Override
     public CommonResult channelMessageSync(ChannelMessageSyncReqVo reqVo) {
-        String currentLoginUid = userService.getCurrentLoginUid();
+        String currentLoginUid = userService.getCurrentLoginUid(reqVo.getEnterpriseId());
         reqVo.setLoginUid(currentLoginUid);
         return CommonResult.success(wuKongApiService.channelMessageSync(reqVo));
     }

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/service/wukong/WuKongSessionServiceImpl.java

@@ -24,7 +24,7 @@ public class WuKongSessionServiceImpl implements WuKongSessionService{
 
     @Override
     public CommonResult conversatioSync(ConversationSyncReqVo reqVo) {
-         String uid  =  userService.getCurrentLoginUid();
+         String uid  =  userService.getCurrentLoginUid(reqVo.getEnterpriseId());
         reqVo.setUid(uid);
         List<ConversationSyncRespVo> conversationSyncRespVos = wuKongApiService.conversationSync(reqVo);
 
@@ -33,14 +33,14 @@ public class WuKongSessionServiceImpl implements WuKongSessionService{
             conversationSyncRespVo.getRecents().forEach(item->uids.add(item.get("from_uid").toString()));
         }
 
-//        CommonResult<List<ImUserInfoVo>> result =   userService.getUserByUids(uids);
+        CommonResult<List<ImUserInfoVo>> result =   userService.getUserByUids(uids);
 
         return CommonResult.success(wuKongApiService.conversationSync(reqVo));
     }
 
     @Override
     public CommonResult conversatioSyncDelete(ConversationsDeleteReqVo reqVo) {
-        String uid  =  userService.getCurrentLoginUid();
+        String uid  =  userService.getCurrentLoginUid(reqVo.getEnterpriseId());
         reqVo.setUid(uid);
         return CommonResult.success(wuKongApiService.conversationsDelete(reqVo));
     }