|
|
@@ -6,18 +6,15 @@ import com.microsvc.toolkit.middleware.rtc.RTCRoomPluginService;
|
|
|
import com.microsvc.toolkit.middleware.rtc.impl.TencentCloudRTCPlugin;
|
|
|
import com.microsvc.toolkit.middleware.rtc.message.RTCRoomConfig;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.ImNetworkRoomDao;
|
|
|
-import com.yonge.cooleshow.biz.dal.dao.ImNetworkRoomMemberDao;
|
|
|
-import com.yonge.cooleshow.biz.dal.dto.BasicUserInfo;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.ImNetworkDisplayDataDto;
|
|
|
-import com.yonge.cooleshow.biz.dal.dto.ImNetworkRoomMemberChangedMessage;
|
|
|
-import com.yonge.cooleshow.biz.dal.entity.IMApiResultInfo;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.ImNetworkRoom;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.ImNetworkRoomMember;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.ImNetworkRoomMemberStatus;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.ImNetworkRoomMemberChangedEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.RoleEnum;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.*;
|
|
|
-import com.yonge.cooleshow.biz.dal.support.IMHelper;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.ImNetworkRoomMemberService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.ImNetworkRoomMemberStatusService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.ImService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.RoomService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -40,8 +37,6 @@ public class RoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNetworkRoom
|
|
|
|
|
|
private final static Logger log = LoggerFactory.getLogger(RoomServiceImpl.class);
|
|
|
|
|
|
- @Resource
|
|
|
- private IMHelper imHelper;
|
|
|
@Autowired
|
|
|
private RTCRoomPluginContext rtcRoomPluginContext;
|
|
|
@Autowired
|
|
|
@@ -72,15 +67,6 @@ public class RoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNetworkRoom
|
|
|
room.setRoomId(roomId);
|
|
|
room.setDisplay(display);
|
|
|
baseMapper.insert(room);
|
|
|
- IMApiResultInfo resultInfo = null;
|
|
|
- try {
|
|
|
- resultInfo = imHelper.createGroup(new String[]{imUserId}, roomId, roomId);
|
|
|
- } catch (Exception e) {
|
|
|
- throw new RuntimeException(e);
|
|
|
- }
|
|
|
- if(resultInfo.getCode() != 200){
|
|
|
- log.error("创建群聊失败 resultInfo:{}",resultInfo);
|
|
|
- }
|
|
|
}else {
|
|
|
if(userRole == RoleEnum.RoleTeacher){
|
|
|
room.setDisplay(display);
|
