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

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

@@ -21,8 +21,8 @@ public class ExamSongDownloadMessageMessage extends BaseMessage {
 
     @Override
     public String toString() {
-        return "{\"songName\":\"" + content.getSongName() +
-                "\", \"songId\":\"" + content.getSongId() +
+        return "{\"examSongName\":\"" + content.getExamSongName() +
+                "\", \"examSongId\":\"" + content.getExamSongId() +
                 "\", \"url\":\"" + content.getUrl() +
                 "\"}";
     }

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

@@ -9,9 +9,12 @@ public class ExamSongDownloadStatusMessage extends BaseMessage {
 
     private @Setter @Getter Integer studentId;
 
-    public ExamSongDownloadStatusMessage(Integer status,Integer studentId) {
+    private @Setter @Getter Integer examSongId;
+
+    public ExamSongDownloadStatusMessage(Integer status,Integer studentId,Integer examSongId) {
         this.status = status;
         this.studentId = studentId;
+        this.examSongId = examSongId;
     }
 
     @Override

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

@@ -3,8 +3,8 @@ package com.ym.pojo;
 public class ExamSongDownloadData {
 	private Integer status;
 	private String url;
-	private String songName;
-	private Integer songId;
+	private String examSongName;
+	private Integer examSongId;
 	private Boolean enable = false;
 
 	public Boolean getEnable() {
@@ -15,14 +15,6 @@ public class ExamSongDownloadData {
 		this.enable = enable;
 	}
 
-	public Integer getSongId() {
-		return songId;
-	}
-
-	public void setSongId(Integer songId) {
-		this.songId = songId;
-	}
-
 	public Integer getStatus() {
 		return status;
 	}
@@ -39,11 +31,19 @@ public class ExamSongDownloadData {
 		this.url = url;
 	}
 
-	public String getSongName() {
-		return songName;
+	public String getExamSongName() {
+		return examSongName;
+	}
+
+	public void setExamSongName(String examSongName) {
+		this.examSongName = examSongName;
+	}
+
+	public Integer getExamSongId() {
+		return examSongId;
 	}
 
-	public void setSongName(String songName) {
-		this.songName = songName;
+	public void setExamSongId(Integer examSongId) {
+		this.examSongId = examSongId;
 	}
 }

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

@@ -2,16 +2,8 @@ package com.ym.pojo;
 
 public class ExamSongMessage{
     private String url;
-    private String songName;
-    private Integer songId;
-
-    public Integer getSongId() {
-        return songId;
-    }
-
-    public void setSongId(Integer songId) {
-        this.songId = songId;
-    }
+    private String examSongName;
+    private Integer examSongId;
 
     public String getUrl() {
         return url;
@@ -21,11 +13,19 @@ public class ExamSongMessage{
         this.url = url;
     }
 
-    public String getSongName() {
-        return songName;
+    public String getExamSongName() {
+        return examSongName;
+    }
+
+    public void setExamSongName(String examSongName) {
+        this.examSongName = examSongName;
+    }
+
+    public Integer getExamSongId() {
+        return examSongId;
     }
 
-    public void setSongName(String songName) {
-        this.songName = songName;
+    public void setExamSongId(Integer examSongId) {
+        this.examSongId = examSongId;
     }
 }

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

@@ -11,7 +11,6 @@ public class ReqDeviceControlData {
 	private Boolean microphoneOn;
 	private Boolean musicModeOn;
 	private Boolean handUpOn;
-	private Boolean downloadSongStatusOn;
 	private Boolean playSongOn;
 	private String roomId;
 	private String userId;
@@ -19,14 +18,6 @@ public class ReqDeviceControlData {
 	private Integer status;
 	private Integer examSongId;
 
-	public Boolean getDownloadSongStatusOn() {
-		return downloadSongStatusOn;
-	}
-
-	public void setDownloadSongStatusOn(Boolean downloadSongStatusOn) {
-		this.downloadSongStatusOn = downloadSongStatusOn;
-	}
-
 	public Boolean getPlaySongOn() {
 		return playSongOn;
 	}

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

@@ -1304,16 +1304,16 @@ public class RoomServiceImpl implements RoomService {
         }
         //学员曲目下载状态改为未下载
         ExamSongDownloadData json = new ExamSongDownloadData();
-        json.setSongName(sysExamSong.getName());
+        json.setExamSongName(sysExamSong.getName());
         json.setUrl(sysExamSong.getUrl());
         json.setStatus(0);
-        json.setSongId(examSongId);
+        json.setExamSongId(examSongId);
         courseScheduleStudentPaymentDao.adjustExamSong(Long.parseLong(roomId.substring(1)),null, JSON.toJSONString(json));
 
         ExamSongMessage examSongMessage = new ExamSongMessage();
-        examSongMessage.setSongName(sysExamSong.getName());
+        examSongMessage.setExamSongName(sysExamSong.getName());
         examSongMessage.setUrl(sysExamSong.getUrl());
-        examSongMessage.setSongId(examSongId);
+        examSongMessage.setExamSongId(examSongId);
         ExamSongDownloadMessageMessage msg = new ExamSongDownloadMessageMessage(examSongMessage);
         imHelper.publishMessage(authUser.getId().toString(), roomId, msg, 0);
     }
@@ -1340,10 +1340,10 @@ public class RoomServiceImpl implements RoomService {
         String examJson = courseScheduleStudentPaymentDao.getExamJsonByCourseIdAndUserId(scheduleId, authUser.getId());
         if(StringUtils.isEmpty(examJson)){
             msg = new ExamSongDownloadData();
-            msg.setSongName(sysExamSong.getName());
+            msg.setExamSongName(sysExamSong.getName());
             msg.setUrl(sysExamSong.getUrl());
             msg.setStatus(status);
-            msg.setSongId(examSongId);
+            msg.setExamSongId(examSongId);
         }else {
             msg = JSON.parseObject(examJson, ExamSongDownloadData.class);
             msg.setStatus(status);
@@ -1352,7 +1352,7 @@ public class RoomServiceImpl implements RoomService {
 
         //给老师发送学员曲目下载状态
         CourseSchedule courseSchedule = courseScheduleDao.get(scheduleId);
-        ExamSongDownloadStatusMessage deviceResourceMessage = new ExamSongDownloadStatusMessage(status,authUser.getId());
+        ExamSongDownloadStatusMessage deviceResourceMessage = new ExamSongDownloadStatusMessage(status,authUser.getId(),examSongId);
         imHelper.publishMessage(authUser.getId().toString(),courseSchedule.getActualTeacherId().toString(), roomId, deviceResourceMessage);
     }