Merge remote-tracking branch 'origin/master'

mec-im/src/main/java/com/ym/mec/im/message/MetronomeMessageMessage.java

@@ -0,0 +1,39 @@
+package com.ym.mec.im.message;
+
+import com.ym.mec.im.BaseMessage;
+import com.ym.pojo.CustomMessage;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by weiqinxiao on 2019/3/6.
+ */
+public class MetronomeMessageMessage extends BaseMessage {
+    private CustomMessage content;
+    private static final transient String TYPE = "DY:PlayMidiMessage";
+
+    public MetronomeMessageMessage(CustomMessage content) {
+        this.content = content;
+    }
+
+    public CustomMessage getContent() {
+        return content;
+    }
+
+    public void setContent(CustomMessage content) {
+        this.content = content;
+    }
+
+    @Override
+    public String toString() {
+        return "{\"enable\":" + content.getEnable() +
+                ", \"customType\":" + content.getCustomType() +
+                ", \"rate\":" + content.getRate() +
+                ", \"userId\":" + (StringUtils.isEmpty(content.getUserId())?"\"\"":"\"" + content.getUserId() + "\"") +
+                '}';
+    }
+
+    @Override
+    public String getObjectName() {
+        return TYPE;
+    }
+}

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

@@ -1415,13 +1415,9 @@ public class RoomServiceImpl implements RoomService {
         groupMessage.setTargetId(roomId.split(","));
         groupMessage.setSenderId(sysUser.getId().toString());
         groupMessage.setObjectName("DY:PlayMidiMessage");
-        String userId = playMidiMessageData.getUserId();
-        DeviceStateChangedMessage deviceResourceMessage = new DeviceStateChangedMessage(DeviceTypeEnum.PlayMidi.ordinal(), customMessage.getEnable());
-        deviceResourceMessage.setUserId(userId);
-        imHelper.publishMessage(userId, roomId, deviceResourceMessage, 1);
-//        messageService.groupSend(groupMessage);
+        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)){