Merge branch 'zouxuan' of http://git.dayaedu.com/yonge/mec into zouxuan

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

@@ -26,6 +26,7 @@ import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.TeacherAttendanceService;
+import com.ym.mec.common.entity.ImPlayMidiMessage;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.im.IMHelper;
 import com.ym.mec.im.message.*;
@@ -1413,17 +1414,20 @@ public class RoomServiceImpl implements RoomService {
             throw new BizException("用户信息获取失败");
         }
 //        roomService.sendImPlayMidiMessage(playMidiMessageData);
-        GroupMessage groupMessage = new GroupMessage();
+//        GroupMessage groupMessage = new GroupMessage();
         String content = playMidiMessageData.getContent();
         String roomId = playMidiMessageData.getRoomId();
         CustomMessage customMessage = JSONObject.parseObject(content,CustomMessage.class);
-        groupMessage.setContent(customMessage);
-        groupMessage.setTargetId(roomId.split(","));
-        groupMessage.setSenderId(sysUser.getId().toString());
-        groupMessage.setObjectName("DY:PlayMidiMessage");
-        messageService.groupSend(groupMessage);
+//        groupMessage.setContent(customMessage);
+//        groupMessage.setTargetId(roomId.split(","));
+//        groupMessage.setSenderId(sysUser.getId().toString());
+//        groupMessage.setObjectName("DY:PlayMidiMessage");
+        String userId = sysUser.getId().toString();
+        MetronomeMessageMessage displayMessage = new MetronomeMessageMessage(customMessage);
+        imHelper.publishMessage(userId, roomId, displayMessage, 1);
+//        messageService.groupSend(groupMessage);
         //记录节拍器消息
-        String userId = playMidiMessageData.getUserId();
+
 //        long courseId = Long.parseLong(roomId.substring(1));
         courseScheduleStudentPaymentDao.adjustPlayMidi(Long.parseLong(roomId.substring(1)),userId,content);
         /*if(StringUtils.isEmpty(userId)){