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

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

@@ -1,9 +1,11 @@
 package com.ym.pojo;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -34,7 +36,7 @@ public class RoomResult {
         boolean camera;
         boolean microphone;
         boolean handUpOn;
-        String examSongDownloadJson;
+        ExamSongDownloadData examSongDownloadJson;
         CustomMessage playMidiJson;
     }
 
@@ -57,7 +59,14 @@ 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(Integer.parseInt(member.getUid())));
+            ExamSongDownloadData examSongDownloadData;
+            String json = examSongMap.get(Integer.parseInt(member.getUid()));
+            if(StringUtils.isEmpty(json)){
+                examSongDownloadData = new ExamSongDownloadData();
+            }else {
+                examSongDownloadData = JSON.parseObject(json,ExamSongDownloadData.class);
+            }
+            result.setExamSongDownloadJson(examSongDownloadData);
             members.add(result);
         }
     }

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

@@ -201,8 +201,15 @@ public class RoomServiceImpl implements RoomService {
         } else if (roleEnum == RoleEnum.RoleAssistant && display.isEmpty()) {
             display = "display://type=0?userId=" + userId + "?uri=";
         }else {
+            ExamSongDownloadData examSongDownloadData;
+            String json = courseScheduleStudentPaymentDao.getExamJsonByCourseIdAndUserId(courseId, sysUser.getId());
+            if(StringUtils.isEmpty(json)){
+                examSongDownloadData = new ExamSongDownloadData();
+            }else {
+                examSongDownloadData = JSON.parseObject(json,ExamSongDownloadData.class);
+            }
             //获取学员曲目下载状态
-            userResult.setExamSongDownloadJson(courseScheduleStudentPaymentDao.getExamJsonByCourseIdAndUserId(courseId,sysUser.getId()));
+            userResult.setExamSongDownloadJson(examSongDownloadData);
             Room room = roomDao.findByRid(roomId);
             if (room != null) {
                 display = room.getDisplay();