Merge branch 'feature/0923-callback' of http://git.dayaedu.com/yonge/mec into master_saas

# Conflicts:
#	mec-im/src/main/java/com/ym/controller/UserController.java

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -914,7 +914,7 @@ public class UserChannelContext {
 		int peakSize = 0;
 		
 		//int range = hardLevel.getAmplitudeThreshold();
-		int range = 10;
+		int range = 5;
 
 		for (int i = 1; i < chunkAmplitudeList.size(); i++) {
 			if (chunkAmplitudeList.get(i - 1) + range >= chunkAmplitudeList.get(i)) {

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

@@ -139,18 +139,21 @@ public class RoomController{
             if (roomId.startsWith("S") || roomId.startsWith("I")) {
                 // 进出用户信息
                 String userId = eventInfo.getEventInfo().getUserId();
-                switch (ETencentTRTCCallbackCommand.get(eventInfo.getEventType())){
-                    case EVENT_TYPE_ENTER_ROOM:
-                        //成员加入
-                        roomService.joinRoomSuccess(roomId, userId,null);
-                        break;
-                    case EVENT_TYPE_EXIT_ROOM:
-                        //成员退出
-                        roomService.leaveRoomSuccess(roomId, userId,null, eventInfo.getCallbackTs());
-                        break;
-                    default:
-                        // 默认事件，直接忽略
-                        break;
+
+                if (userId.matches("\\d+")) {
+                    switch (ETencentTRTCCallbackCommand.get(eventInfo.getEventType())){
+                        case EVENT_TYPE_ENTER_ROOM:
+                            //成员加入
+                            roomService.joinRoomSuccess(roomId, userId,null);
+                            break;
+                        case EVENT_TYPE_EXIT_ROOM:
+                            //成员退出
+                            roomService.leaveRoomSuccess(roomId, userId,null, eventInfo.getCallbackTs());
+                            break;
+                        default:
+                            // 默认事件，直接忽略
+                            break;
+                    }
                 }
             }
 
@@ -161,24 +164,27 @@ public class RoomController{
                     return;
                 }
 
-                roomId = values[1];
-                // 直播课回调事件处理, 课程编号
-                switch (ETencentTRTCCallbackCommand.get(eventInfo.getEventType())){
-                    case EVENT_TYPE_START_VIDEO:
-                    case EVENT_TYPE_START_AUDIO:
-                    case EVENT_TYPE_START_ASSIT:
-                        //成员加入
-                        roomService.joinRoomSuccess(roomId, eventInfo.getEventInfo().getUserId(), null);
-                        break;
-                    case EVENT_TYPE_STOP_VIDEO:
-                    case EVENT_TYPE_STOP_AUDIO:
-                    case EVENT_TYPE_STOP_ASSIT:
-                        //成员退出
-                        roomService.leaveRoomSuccess(roomId, eventInfo.getEventInfo().getUserId(),null, eventInfo.getCallbackTs());
-                        break;
-                    default:
-                        // 默认事件，直接忽略
-                        break;
+                String userId = eventInfo.getEventInfo().getUserId();
+                if (userId.matches("\\d+")) {
+                    roomId = values[1];
+                    // 直播课回调事件处理, 课程编号
+                    switch (ETencentTRTCCallbackCommand.get(eventInfo.getEventType())){
+                        case EVENT_TYPE_START_VIDEO:
+                        case EVENT_TYPE_START_AUDIO:
+                        case EVENT_TYPE_START_ASSIT:
+                            //成员加入
+                            roomService.joinRoomSuccess(roomId, eventInfo.getEventInfo().getUserId(), null);
+                            break;
+                        case EVENT_TYPE_STOP_VIDEO:
+                        case EVENT_TYPE_STOP_AUDIO:
+                        case EVENT_TYPE_STOP_ASSIT:
+                            //成员退出
+                            roomService.leaveRoomSuccess(roomId, eventInfo.getEventInfo().getUserId(),null, eventInfo.getCallbackTs());
+                            break;
+                        default:
+                            // 默认事件，直接忽略
+                            break;
+                    }
                 }
             }
 

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

@@ -703,6 +703,7 @@ public class RoomServiceImpl implements RoomService {
                     List<ImGroupMemberWrapper.ImGroupMember> groupMembers = Lists.newArrayList(ImGroupMemberWrapper.ImGroupMember
                             .builder()
                             .userId(Long.valueOf(actualTeacherId))
+                            .imUserId(String.valueOf(actualTeacherId))
                             .imUserIdFormat(false)
                             .build());
 
@@ -713,6 +714,7 @@ public class RoomServiceImpl implements RoomService {
                             groupMembers.add(ImGroupMemberWrapper.ImGroupMember
                                     .builder()
                                     .userId(Long.valueOf(item.getUserId()))
+                                    .imUserId(String.valueOf(item.getUserId()))
                                     .imUserIdFormat(false)
                                     .build());
                         }

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -300,7 +300,7 @@ public class StudentOrderController extends BaseController {
 				notifyMap.put("merOrderNo", dataObj.getString("orderId"));
 				studentPaymentOrderService.updateOrder(notifyMap);
 				
-				break;
+				return "SUCCESS";
 
 			default:
 				break;