diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java index fbaccb43..e5394b58 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java @@ -1,8 +1,10 @@ package com.ruoyi.test.business; import com.alibaba.fastjson.JSON; +import com.ruoyi.cai.domain.User; import com.ruoyi.cai.notice.data.ImVideoAttachR; import com.ruoyi.cai.notice.data.child.ImVideoAttachData; +import com.ruoyi.cai.service.UserService; import com.ruoyi.cai.ws.cache.RoomDataCache; import com.ruoyi.cai.ws.job.JobResp; import com.ruoyi.cai.ws.job.RoomCheckJobService; @@ -43,12 +45,16 @@ public class RoomTest { @Autowired private Yunxin yunxin; + @Autowired + private UserService userService; @Test public void testCallBack(){ - Long roomId = 1L; - Long callId = 1L; - Long receiverId = 1L; + User anchor = userService.getByUserCode("1332"); // 主播 + User user = userService.getByUserCode("1323"); // 发起人用户 + Long roomId = 2222222222L; + Long callId = user.getId(); + Long receiverId = anchor.getId(); ImVideoAttachData data = new ImVideoAttachData(); data.setRoomid(roomId); ImVideoAttachR res = ImVideoAttachR.ok(data); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java index 38190579..694ae999 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java @@ -22,6 +22,7 @@ import com.ruoyi.cai.ws.service.RoomService; import com.ruoyi.cai.ws.util.RoomWebSocketUtil; import com.ruoyi.cai.ws.util.TimeConverter; import com.ruoyi.cai.ws.util.WsExceptionUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -32,6 +33,7 @@ import java.util.List; import java.util.Map; @Component +@Slf4j public class OpenLogic { @Autowired private RoomService roomService; @@ -150,6 +152,7 @@ public class OpenLogic { RoomWebSocketUtil.sendSendMessage(session, WsRMsgGen.request(room.getRoomId())); } if(isFirst){ + log.info("开始调用IM,通知主播接通电话 roomId={}",room.getRoomId()); yunxinWsService.sendCallAsync(room.getRoomId(),room.getCallId(),room.getReceiverId()); } }