1

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

@@ -6,6 +6,7 @@ import cn.hutool.jwt.JWTUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.tk.common.ResultCode;
 import com.fdkankan.tk.common.ResultData;
+import com.fdkankan.tk.common.util.JwtUtil;
 import com.fdkankan.tk.common.util.RedisKeyUtil;
 import com.fdkankan.tk.entity.Room;
 import com.fdkankan.tk.exception.BusinessException;
@@ -188,8 +189,12 @@ public class RoomController extends BaseController{
 
     //根据场景码获取房间号
     @GetMapping("/getRoomIdByNum")
-    public ResultData getRoomIdByNum(@RequestParam(required = false) String num){
-        Room room = roomService.getRoomIdByNum(num);
+    public ResultData getRoomIdByNum(@RequestParam(required = false) String num,
+                                     @RequestParam(required = false) String userName){
+        if(StringUtils.isBlank(userName)){
+            userName = JwtUtil.getUserName(getToken());
+        }
+        Room room = roomService.getRoomIdByNum(num,userName);
         if(room == null){
             throw new BusinessException(ResultCode.ROOM_MISS);
         }

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

@@ -56,5 +56,5 @@ public interface IRoomService extends IService<Room> {
 
     void openTheRoom(String roomId);
 
-    Room getRoomIdByNum(String num);
+    Room getRoomIdByNum(String num,String userName);
 }

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

@@ -575,18 +575,19 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public Room getRoomIdByNum(String num) {
+    public Room getRoomIdByNum(String num,String userName) {
         List<RoomNum> roomNums = roomNumService.getByNum(num);
         List<String> roomIds = roomNums.stream().map(RoomNum::getRoomId).collect(Collectors.toList());
-        return this.getUcenterPlatform(roomIds);
+        return this.getUcenterPlatform(roomIds,userName);
     }
 
-    private Room getUcenterPlatform(List<String> roomIds) {
+    private Room getUcenterPlatform(List<String> roomIds,String userName) {
         if(roomIds.isEmpty()){
             return null;
         }
         LambdaQueryWrapper<Room> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(Room::getRoomId,roomIds);
+        wrapper.eq(Room::getRoomUserName,userName);
         wrapper.eq(Room::getPlatform,"ucenter");
         wrapper.gt(Room::getUseEndTime,new Date());
         List<Room> list = this.list(wrapper);