zouxuan 4 年之前
父节点
当前提交
96351565fd

+ 2 - 1
mec-im/src/main/java/com/ym/service/Impl/HereWhiteServiceImpl.java

@@ -10,6 +10,7 @@ import com.ym.service.RoomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
 import java.util.Date;
 import java.util.Date;
@@ -30,7 +31,7 @@ public class HereWhiteServiceImpl implements HereWhiteService {
     private RoomService roomService;
     private RoomService roomService;
 
 
     @Override
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     public HereWhite create(String name, Integer userNum,Integer courseScheduleId) throws Exception {
     public HereWhite create(String name, Integer userNum,Integer courseScheduleId) throws Exception {
         courseScheduleId = roomService.getCurrentCourseId(courseScheduleId.toString());
         courseScheduleId = roomService.getCurrentCourseId(courseScheduleId.toString());
         JSONObject json = new JSONObject();
         JSONObject json = new JSONObject();

+ 3 - 17
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -118,7 +118,7 @@ public class RoomServiceImpl implements RoomService {
         return Integer.parseInt(roomId);
         return Integer.parseInt(roomId);
     }
     }
 
 
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public RoomResult joinRoom(String roomId) throws Exception {
     public RoomResult joinRoom(String roomId) throws Exception {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
@@ -1255,22 +1255,7 @@ public class RoomServiceImpl implements RoomService {
     }
     }
 
 
     @Override
     @Override
-    public void statusSync(ChannelStateNotify notify) throws Exception {
-        String roomId = notify.getChannelId();
-        String userId = notify.getUserId();
-        switch (notify.getEvent()){
-            case 11:
-                //成员加入
-                joinRoomSuccess(roomId, userId);
-                break;
-            case 12:
-                //成员退出
-                leaveRoomSuccess(roomId, userId);
-                break;
-        }
-    }
-
-    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void sendImPlayMidiMessage(PlayMidiMessageData playMidiMessageData) throws Exception {
     public void sendImPlayMidiMessage(PlayMidiMessageData playMidiMessageData) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
         if(sysUser == null){
@@ -1291,6 +1276,7 @@ public class RoomServiceImpl implements RoomService {
         return courseScheduleStudentPaymentDao.queryNoJoinStu(roomId,roomId.substring(1));
         return courseScheduleStudentPaymentDao.queryNoJoinStu(roomId,roomId.substring(1));
     }
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
     private void updateDisplay(String roomId, String senderId, String display, Integer isIncludeSender) throws Exception {
     private void updateDisplay(String roomId, String senderId, String display, Integer isIncludeSender) throws Exception {
         roomDao.updateDisplayByRid(roomId, display);
         roomDao.updateDisplayByRid(roomId, display);
         DisplayMessage displayMessage = new DisplayMessage(display);
         DisplayMessage displayMessage = new DisplayMessage(display);

+ 0 - 2
mec-im/src/main/java/com/ym/service/RoomService.java

@@ -66,8 +66,6 @@ public interface RoomService {
     Boolean memberOnlineStatus(List<ReqMemberOnlineStatus> statusList, String nonce, String timestamp, String signature) throws Exception;
     Boolean memberOnlineStatus(List<ReqMemberOnlineStatus> statusList, String nonce, String timestamp, String signature) throws Exception;
     void userIMOfflineKick(String userId);
     void userIMOfflineKick(String userId);
 
 
-    void statusSync(ChannelStateNotify notify) throws Exception;
-
     /**
     /**
      * 发送节拍器消息
      * 发送节拍器消息
      * @param playMidiMessageData
      * @param playMidiMessageData