shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-04-02 15:49:10 +08:00
parent eed3651173
commit 1a122b1433
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java
View File

@@ -1,8 +1,10 @@
package com.ruoyi.test.business; package com.ruoyi.test.business;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.notice.data.ImVideoAttachR; import com.ruoyi.cai.notice.data.ImVideoAttachR;
import com.ruoyi.cai.notice.data.child.ImVideoAttachData; 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.cache.RoomDataCache;
import com.ruoyi.cai.ws.job.JobResp; import com.ruoyi.cai.ws.job.JobResp;
import com.ruoyi.cai.ws.job.RoomCheckJobService; import com.ruoyi.cai.ws.job.RoomCheckJobService;
@@ -43,12 +45,16 @@ public class RoomTest {
@Autowired @Autowired
private Yunxin yunxin; private Yunxin yunxin;
@Autowired
private UserService userService;
@Test @Test
public void testCallBack(){ public void testCallBack(){
Long roomId = 1L; User anchor = userService.getByUserCode("1332"); // 主播
Long callId = 1L; User user = userService.getByUserCode("1323"); // 发起人用户
Long receiverId = 1L; Long roomId = 2222222222L;
Long callId = user.getId();
Long receiverId = anchor.getId();
ImVideoAttachData data = new ImVideoAttachData(); ImVideoAttachData data = new ImVideoAttachData();
data.setRoomid(roomId); data.setRoomid(roomId);
ImVideoAttachR<ImVideoAttachData> res = ImVideoAttachR.ok(data); ImVideoAttachR<ImVideoAttachData> res = ImVideoAttachR.ok(data);

3
ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java
View File

@@ -22,6 +22,7 @@ import com.ruoyi.cai.ws.service.RoomService;
import com.ruoyi.cai.ws.util.RoomWebSocketUtil; import com.ruoyi.cai.ws.util.RoomWebSocketUtil;
import com.ruoyi.cai.ws.util.TimeConverter; import com.ruoyi.cai.ws.util.TimeConverter;
import com.ruoyi.cai.ws.util.WsExceptionUtil; import com.ruoyi.cai.ws.util.WsExceptionUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Component @Component
@Slf4j
public class OpenLogic { public class OpenLogic {
@Autowired @Autowired
private RoomService roomService; private RoomService roomService;
@@ -150,6 +152,7 @@ public class OpenLogic {
RoomWebSocketUtil.sendSendMessage(session, WsRMsgGen.request(room.getRoomId())); RoomWebSocketUtil.sendSendMessage(session, WsRMsgGen.request(room.getRoomId()));
} }
if(isFirst){ if(isFirst){
log.info("开始调用IM，通知主播接通电话 roomId={}",room.getRoomId());
yunxinWsService.sendCallAsync(room.getRoomId(),room.getCallId(),room.getReceiverId()); yunxinWsService.sendCallAsync(room.getRoomId(),room.getCallId(),room.getReceiverId());
} }
} }