update

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/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;
 	}