网络教室

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -198,34 +198,34 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         Long courseScheduleId = musicSheetData.getCourseScheduleId();
         log.info("pushDownloadMusicSheetMsg: roomId={}, userId={}", courseScheduleId, userId);
         //获取已通知下载的伴奏列表
-//        List<CourseScheduleStudentMusicSheetResult> musicSheetResults = courseScheduleStudentMusicSheetService.getDao().queryBySheetIdAndCourseId(musicSheetData.getMusicSheetAccompanimentId(),
-//                courseScheduleId, null, null, UserRoleEnum.STUDENT.ordinal());
-//        ImNetworkMusicSheetDownloadMessageContent downloadMessageContent = musicSheetAccompanimentService.getDao().findMsgContentByAccompanimentId(musicSheetData.getMusicSheetAccompanimentId());
-//        if (musicSheetResults.size() == 0) {
-//            //第一次下载,生成数据
-//            List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentService.getDao().queryByCourseId(courseScheduleId);
-//            Set<Long> studentIds = courseScheduleStudentPayments.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-//            studentIds.forEach(e -> {
-//                CourseScheduleStudentMusicSheetResult musicSheetResult = new CourseScheduleStudentMusicSheetResult();
-//                musicSheetResult.setMusicSheetAccompanimentId(accompaniment.getId());
-//                musicSheetResult.setSpeed(100);
-//                musicSheetResult.setCourseScheduleId(courseScheduleId);
-//                musicSheetResult.setUserId(e);
-//                musicSheetResult.setUserType(UserRoleEnum.STUDENT.ordinal());
-//                musicSheetResults.add(musicSheetResult);
-//            });
-//            CourseScheduleStudentMusicSheetResult musicSheetResult = new CourseScheduleStudentMusicSheetResult();
-//            musicSheetResult.setMusicSheetAccompanimentId(accompaniment.getId());
-//            musicSheetResult.setSpeed(100);
-//            musicSheetResult.setCourseScheduleId(courseScheduleId);
-//            musicSheetResult.setUserId(userId);
-//            musicSheetResult.setUserType(UserRoleEnum.TEACHER.ordinal());
-//            musicSheetResults.add(musicSheetResult);
-//            courseScheduleStudentMusicSheetService.getDao().batchInsert(musicSheetResults);
-//        }
-//        ImNetworkRoomMusicSheetData musicScoreMessage = JSON.parseObject(JSON.toJSONString(accompaniment), ImNetworkRoomMusicSheetData.class);
-//        ImNetworkMusicSheetDownloadMessage msg = new ImNetworkMusicSheetDownloadMessage(musicScoreMessage);
-//        imHelper.publishMessage(authUser.getId().toString(), roomId, msg, 0);
+        List<CourseScheduleStudentMusicSheetResult> musicSheetResults = courseScheduleStudentMusicSheetService.getDao().queryBySheetIdAndCourseId(musicSheetData.getMusicSheetAccompanimentId(),
+                courseScheduleId, null, null, UserRoleEnum.STUDENT.ordinal());
+        ImNetworkMusicSheetDownloadMessageContent downloadMessageContent = musicSheetAccompanimentService.getDao().findMsgContentByAccompanimentId(musicSheetData.getMusicSheetAccompanimentId());
+        if (musicSheetResults.size() == 0) {
+            //第一次下载,生成数据
+            List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentService.getDao().queryByCourseId(courseScheduleId);
+            Set<Long> studentIds = courseScheduleStudentPayments.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+            studentIds.forEach(e -> {
+                CourseScheduleStudentMusicSheetResult musicSheetResult = new CourseScheduleStudentMusicSheetResult();
+                musicSheetResult.setMusicSheetAccompanimentId(accompaniment.getId());
+                musicSheetResult.setSpeed(100);
+                musicSheetResult.setCourseScheduleId(courseScheduleId);
+                musicSheetResult.setUserId(e);
+                musicSheetResult.setUserType(UserRoleEnum.STUDENT.ordinal());
+                musicSheetResults.add(musicSheetResult);
+            });
+            CourseScheduleStudentMusicSheetResult musicSheetResult = new CourseScheduleStudentMusicSheetResult();
+            musicSheetResult.setMusicSheetAccompanimentId(accompaniment.getId());
+            musicSheetResult.setSpeed(100);
+            musicSheetResult.setCourseScheduleId(courseScheduleId);
+            musicSheetResult.setUserId(userId);
+            musicSheetResult.setUserType(UserRoleEnum.TEACHER.ordinal());
+            musicSheetResults.add(musicSheetResult);
+            courseScheduleStudentMusicSheetService.getDao().batchInsert(musicSheetResults);
+        }
+        ImNetworkRoomMusicSheetData musicScoreMessage = JSON.parseObject(JSON.toJSONString(accompaniment), ImNetworkRoomMusicSheetData.class);
+        ImNetworkMusicSheetDownloadMessage msg = new ImNetworkMusicSheetDownloadMessage(musicScoreMessage);
+        imHelper.publishMessage(authUser.getId().toString(), roomId, msg, 0);
     }
 
     //校验用户是否提前进入教室

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImNetworkRoomController.java

@@ -1,11 +1,9 @@
 package com.yonge.cooleshow.teacher.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.yonge.cooleshow.biz.dal.dto.ImNetworkCustomMessage;
 import com.yonge.cooleshow.biz.dal.dto.ImNetworkRoomMusicSheetData;
 import com.yonge.cooleshow.biz.dal.dto.ImNetworkRoomResult;
-import com.yonge.cooleshow.biz.dal.dto.ImNetworkRoomStatusNotify;
 import com.yonge.cooleshow.biz.dal.enums.UserRoleEnum;
 import com.yonge.cooleshow.biz.dal.service.ImNetworkRoomService;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -13,10 +11,12 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.Optional;