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

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

@@ -4,6 +4,15 @@ public class ExamSongDownloadData {
 	private Integer status;
 	private String url;
 	private String songName;
+	private Integer songId;
+
+	public Integer getSongId() {
+		return songId;
+	}
+
+	public void setSongId(Integer songId) {
+		this.songId = songId;
+	}
 
 	public Integer getStatus() {
 		return status;
@@ -35,6 +44,7 @@ public class ExamSongDownloadData {
 				"status=" + status +
 				", url='" + url + '\'' +
 				", songName='" + songName + '\'' +
+				", songId='" + songId + '\'' +
 				'}';
 	}
 }

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

@@ -57,7 +57,7 @@ public class RoomResult {
             result.setHandUpOn(member.isHand());
             result.setHeadUrl(member.getHeadUrl());
             result.setPlayMidiJson(JSONObject.parseObject(midiMap.get(Integer.parseInt(member.getUid())),CustomMessage.class));
-            result.setExamSongDownloadJson(examSongMap.get(member.getRid()));
+            result.setExamSongDownloadJson(examSongMap.get(Integer.parseInt(member.getUid())));
             members.add(result);
         }
     }

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

@@ -1295,6 +1295,7 @@ public class RoomServiceImpl implements RoomService {
         json.setSongName(sysExamSong.getName());
         json.setUrl(sysExamSong.getUrl());
         json.setStatus(0);
+        json.setSongId(examSongId);
         courseScheduleStudentPaymentDao.adjustExamSong(roomId,null, JSON.toJSONString(json));
     }
 
@@ -1320,6 +1321,7 @@ public class RoomServiceImpl implements RoomService {
         msg.setSongName(sysExamSong.getName());
         msg.setUrl(sysExamSong.getUrl());
         msg.setStatus(status);
+        msg.setSongId(examSongId);
         courseScheduleStudentPaymentDao.adjustExamSong(roomId,authUser.getId(),JSON.toJSONString(msg));
     }