Merge remote-tracking branch 'origin/master'

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -2,13 +2,20 @@ package com.ym.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ym.common.BaseResponse;
+import com.ym.dao.RoomDao;
+import com.ym.dao.RoomMemberDao;
 import com.ym.pojo.*;
 import com.ym.service.MessageService;
 import com.ym.service.RoomService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -275,4 +282,30 @@ public class RoomController{
         Boolean result = roomService.memberOnlineStatus(statusList, nonce, timestamp, signature);
         return new BaseResponse<>(result);
     }
+
+    @Autowired
+    private RoomMemberDao roomMemberDao;
+
+    @RequestMapping(value = "saveRoomMember")
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public Object saveRoomMember(String userId, String headUrl, String userName, String roomId, int role) throws InterruptedException {
+        RoomMember roomMember = new RoomMember();
+        roomMember.setUid(userId);
+        roomMember.setName(userName);
+        roomMember.setRid(roomId);
+        roomMember.setRole(role);
+        roomMember.setCamera(true);
+        roomMember.setJoinDt(new Date());
+        roomMember.setMusicMode(false);
+        roomMember.setHeadUrl(headUrl);
+        roomMemberDao.save(roomMember);
+        return roomMember;
+    }
+
+    @RequestMapping(value = "deleteRoomMember")
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public Object deleteRoomMember(String userId) throws InterruptedException {
+        roomMemberDao.deleteByRid("1");
+        return null;
+    }
 }