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

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

@@ -1,37 +1,26 @@
 package com.ym.mec.im.message;
 
 import com.ym.mec.im.BaseMessage;
+import com.ym.pojo.ExamSongMessage;
 
 public class ExamSongDownloadMessageMessage extends BaseMessage {
-    private String url;
-    private String songName;
+    private ExamSongMessage content;
     private static final transient String TYPE = "DY:examSongDownloadMessage";
 
-    public String getUrl() {
-        return url;
+    public ExamSongMessage getContent() {
+        return content;
     }
 
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getSongName() {
-        return songName;
-    }
-
-    public void setSongName(String songName) {
-        this.songName = songName;
-    }
-
-    public static String getTYPE() {
-        return TYPE;
+    public void setContent(ExamSongMessage content) {
+        this.content = content;
     }
 
     @Override
     public String toString() {
         return "{" +
-                "url='" + url + '\'' +
-                ", songName='" + songName + '\'' +
+                "url='" + content.getUrl() + '\'' +
+                ", songName='" + content.getSongName() + '\'' +
+                ", songId=" + content.getSongId() +
                 '}';
     }
 

mec-im/src/main/java/com/ym/pojo/ExamSongMessage.java

@@ -0,0 +1,48 @@
+package com.ym.pojo;
+
+import io.rong.messages.BaseMessage;
+import org.apache.commons.lang3.StringUtils;
+
+public class ExamSongMessage extends BaseMessage {
+    private String url;
+    private String songName;
+    private Integer songId;
+
+    public Integer getSongId() {
+        return songId;
+    }
+
+    public void setSongId(Integer songId) {
+        this.songId = songId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getSongName() {
+        return songName;
+    }
+
+    public void setSongName(String songName) {
+        this.songName = songName;
+    }
+
+    @Override
+    public String getType() {
+        return "DY:examSongDownloadMessage";
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                "url='" + url + '\'' +
+                ", songName='" + songName + '\'' +
+                ", songId=" + songId +
+                '}';
+    }
+}

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

@@ -1291,9 +1291,12 @@ public class RoomServiceImpl implements RoomService {
         if(sysExamSong == null){
             throw new BizException("曲目信息不存在");
         }
-        msg.setSongName(sysExamSong.getName());
-        msg.setUrl(sysExamSong.getUrl());
-        imHelper.publishMessage(authUser.getId().toString(), roomId, msg, 1);
+        ExamSongMessage examSongMessage = new ExamSongMessage();
+        examSongMessage.setSongName(sysExamSong.getName());
+        examSongMessage.setUrl(sysExamSong.getUrl());
+        examSongMessage.setSongId(examSongId);
+        msg.setContent(examSongMessage);
+        imHelper.publishMessage(authUser.getId().toString(), roomId, msg, 0);
         //学员曲目下载状态改为未下载
         ExamSongDownloadData json = new ExamSongDownloadData();
         json.setSongName(sysExamSong.getName());