房间列表兼容 wxToken

src/main/java/com/fdkankan/tk/controller/RoomController.java

@@ -43,7 +43,7 @@ public class RoomController extends BaseController{
      */
     @PostMapping("/roomList")
     public ResultData pageList(@RequestBody RoomListParam param){
-        return ResultData.ok(roomService.pageList(param,getToken()));
+        return ResultData.ok(roomService.pageList(param,getToken(),getWxToken()));
     }
     /**
      * 创建房间

src/main/java/com/fdkankan/tk/service/IRoomService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.tk.service;
 
 import com.fdkankan.tk.common.PageInfo;
+import com.fdkankan.tk.common.util.StringUtils;
 import com.fdkankan.tk.entity.Room;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.tk.request.RoomAddParam;
@@ -19,7 +20,7 @@ import java.io.IOException;
  */
 public interface IRoomService extends IService<Room> {
 
-    PageInfo pageList(RoomListParam param, String token);
+    PageInfo pageList(RoomListParam param, String token, String wxToken);
 
     Room addOrUpdate(RoomAddParam param, String token);
 

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -22,17 +22,15 @@ import com.fdkankan.tk.common.util.RedisKeyUtil;
 import com.fdkankan.tk.common.util.RoomUtil;
 import com.fdkankan.tk.common.util.UploadToOssUtil;
 import com.fdkankan.tk.entity.Room;
+import com.fdkankan.tk.entity.WxUser;
 import com.fdkankan.tk.exception.BusinessException;
 import com.fdkankan.tk.mapper.IRoomMapper;
 import com.fdkankan.tk.request.RoomAddParam;
 import com.fdkankan.tk.request.RoomListParam;
 import com.fdkankan.tk.response.RoomVo;
 import com.fdkankan.tk.response.SceneVo;
-import com.fdkankan.tk.service.IRoomNumService;
-import com.fdkankan.tk.service.IRoomService;
+import com.fdkankan.tk.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.tk.service.ISceneService;
-import com.fdkankan.tk.service.IWxService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,9 +60,11 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     private String queryPath;
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    IWxUserService wxUserService;
 
     @Override
-    public PageInfo pageList(RoomListParam param, String token) {
+    public PageInfo pageList(RoomListParam param, String token,String wxToken) {
         LambdaQueryWrapper<Room> wrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(token)){
             String fdToken = String.format(RedisKey.TOKEN_V3,token);
@@ -75,6 +75,15 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             String userName = JwtUtil.getUserName(token);
             wrapper.eq(Room::getRoomUserName,userName);
         }
+        if(StringUtils.isNotBlank(wxToken)){
+            String wxUserId = JwtUtil.getUserName(token);
+            WxUser wxUser = wxUserService.getById(wxUserId);
+            if(wxUser != null){
+                wrapper.eq(Room::getRoomUserName,wxUser.getPhoneNumber());
+            }
+        }
+
+
         if (StringUtils.isNotBlank(param.getRoomTitle()) ) {
             wrapper.like(Room::getRoomTitle,param.getRoomTitle());
         }