chenkaiyang
/
chat-demo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
chanbook 2022-08-02 18:28:26 +08:00
parent c480cb062a 1a3a451377
commit 3260340ce6
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhangshu/chat/demo/controller/EventController.java
View File

@ -1,5 +1,6 @@
package com.zhangshu.chat.demo.controller;
import com.zhangshu.chat.demo.dto.AgoraEventDto;
import com.zhangshu.chat.demo.dto.CommonResult;
import com.zhangshu.chat.demo.service.EventService;
import io.swagger.annotations.Api;
@ -23,9 +24,9 @@ public class EventController {
@PostMapping("/agora")
@ApiOperation(value = "agora")
public CommonResult agora(@RequestBody Map<String,Object> body) {
log.info("事件回调：{}", body);
eventService.agora(body);
public CommonResult agora(@RequestBody AgoraEventDto dto) {
log.info("事件回调：{}", dto);
eventService.agora(dto);
return CommonResult.success();
}
}

4
src/main/java/com/zhangshu/chat/demo/service/EventService.java
View File

@ -2,8 +2,6 @@ package com.zhangshu.chat.demo.service;
import com.zhangshu.chat.demo.dto.AgoraEventDto;
import java.util.Map;
public interface EventService {
void agora(Map<String, Object> body);
void agora(AgoraEventDto body);
}

25
src/main/java/com/zhangshu/chat/demo/service/EventServiceImpl.java
View File

@ -3,10 +3,10 @@ package com.zhangshu.chat.demo.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.zhangshu.chat.demo.config.AgoraProperties;
import com.zhangshu.chat.demo.constant.EAgoraEventType;
import com.zhangshu.chat.demo.constant.ERoomUserType;
import com.zhangshu.chat.demo.dto.AgoraChannelEventDto;
import com.zhangshu.chat.demo.dto.AgoraChannelUserEventDto;
import com.zhangshu.chat.demo.dto.AgoraEventDto;
import com.zhangshu.chat.demo.entity.User;
import com.zhangshu.chat.demo.mapper.UserMapper;
import com.zhangshu.chat.demo.vo.RoomUserVo;
@ -26,29 +26,26 @@ public class EventServiceImpl implements EventService {
RoomCache roomCache;
@Autowired
UserMapper userMapper;
<T> T mapToBean(Map<String, Object> map, Class<T> targetClass) {
return BeanUtil.mapToBean(map, targetClass, false, CopyOptions.create());
}
@Override
public void agora(Map<String, Object> body) {
Object eventTypeObj = body.get("eventType");
EAgoraEventType eventType = EAgoraEventType.getByType((Integer) eventTypeObj);
switch (eventType) {
public void agora(AgoraEventDto dto) {
switch (dto.getEventType()) {
case channel_create: {
AgoraChannelEventDto eventDto = mapToBean(body, AgoraChannelEventDto.class);
AgoraChannelEventDto eventDto = dto.convert(AgoraChannelEventDto.class);
roomCache.add(eventDto.getChannelName());
}
break;
case channel_destroy: {
AgoraChannelEventDto eventDto = mapToBean(body, AgoraChannelEventDto.class);
AgoraChannelEventDto eventDto = dto.convert(AgoraChannelEventDto.class);
roomCache.remove(eventDto.getChannelName());
}
break;
case broadcaster_join_channel: {
AgoraChannelUserEventDto eventDto = mapToBean(body, AgoraChannelUserEventDto.class);
AgoraChannelUserEventDto eventDto = dto.convert(AgoraChannelUserEventDto.class);
User user = userMapper.selectById(eventDto.getUid());
if (Objects.isNull(user)) {
break;
@ -63,12 +60,12 @@ public class EventServiceImpl implements EventService {
break;
case broadcaster_leave_channel:
case audience_leave_channel: {
AgoraChannelUserEventDto eventDto = mapToBean(body, AgoraChannelUserEventDto.class);
AgoraChannelUserEventDto eventDto = dto.convert(AgoraChannelUserEventDto.class);
roomCache.removeUser(eventDto.getChannelName(), eventDto.getUid());
}
break;
case audience_join_channel: {
AgoraChannelUserEventDto eventDto = mapToBean(body, AgoraChannelUserEventDto.class);
AgoraChannelUserEventDto eventDto = dto.convert(AgoraChannelUserEventDto.class);
User user = userMapper.selectById(eventDto.getUid());
if (Objects.isNull(user)) {
break;
@ -82,12 +79,12 @@ public class EventServiceImpl implements EventService {
}
break;
case client_role_change_to_audience: {
AgoraChannelUserEventDto eventDto = mapToBean(body, AgoraChannelUserEventDto.class);
AgoraChannelUserEventDto eventDto = dto.convert(AgoraChannelUserEventDto.class);
roomCache.changeUserType(eventDto.getChannelName(), eventDto.getUid(), ERoomUserType.audience);
}
break;
case client_role_change_to_broadcaster: {
AgoraChannelUserEventDto eventDto = mapToBean(body, AgoraChannelUserEventDto.class);
AgoraChannelUserEventDto eventDto = dto.convert(AgoraChannelUserEventDto.class);
roomCache.changeUserType(eventDto.getChannelName(), eventDto.getUid(), ERoomUserType.broadcaster);
}
break;

2
src/main/java/com/zhangshu/chat/demo/vo/RoomVo.java
View File

@ -4,6 +4,6 @@ import lombok.Data;
@Data
public class RoomVo {
private Long id;
private String id;
private String name;
}