网络教室

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -46,7 +46,5 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
     List<CourseSchedule> queryStudentCourse(@Param("studentId") Long studentId, @Param("classDate") String classDate);
 
     <T> IPage<T> queryLiveTeacherCourse(Page<T> page, @Param("param") Map<String, Object> param);
-
-    CourseSchedule findOne(@Param("courseScheduleId") Long courseScheduleId);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -35,7 +35,6 @@ public interface CourseScheduleStudentPaymentDao extends BaseMapper<CourseSchedu
      * @param groupId 课程组id
      */
     List<LiveCourseInfoVo.CourseBuyStudentVo> queryStudentInfoByGroupId(@Param("groupId") Long groupId);
-                                 @Param("courseGroupType") String courseGroupType);
 
     //重置节拍器设置
     void cleanPlayMidi(@Param("courseScheduleId") Long courseScheduleId);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetAccompanimentDao.java

@@ -1,9 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 
 /**
  * MusicSheetAccompanimentDao数据库访问类

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImNetworkMusicSheetDownloadMessage.java

@@ -22,23 +22,6 @@ public class ImNetworkMusicSheetDownloadMessage extends BaseMessage {
     }
 
     @Override
-    public String toString() {
-        return "{\"id\":\"" + content.getId() +
-                "\", \"examSongId\":\"" + content.getExamSongId() +
-                "\", \"subjectId\":\"" + content.getSubjectId() +
-                "\", \"subjectName\":\"" + content.getSubjectName() +
-                "\", \"mp3Url\":\"" + content.getMp3Url() +
-                "\", \"speed\":\"" + content.getSpeed() +
-                "\", \"xmlUrl\":\"" + content.getXmlUrl() +
-                "\", \"examSongName\":\"" + content.getExamSongName() +
-                "\", \"categoriesName\":\"" + content.getCategoriesName() +
-                "\", \"categoriesId\":\"" + content.getCategoriesId() +
-                "\", \"type\":\"" + content.getType() +
-                "\", \"url\":\"" + content.getUrl() +
-                "\"}";
-    }
-
-    @Override
     public String getObjectName() {
         return TYPE;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImNetworkMusicSheetDownloadMessageContent.java

@@ -1,154 +1,46 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
 
-public class ImNetworkMusicSheetDownloadMessageContent {
-    /**  */
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class ImNetworkMusicSheetDownloadMessageContent{
+    //伴奏编号
     private Integer id;
 
-    /**  */
-    private Integer examSongId;
+    //曲目编号
+    private Integer musicSheetId;
 
-    /**  */
+    //声部
     private Integer subjectId;
 
-    /**  */
+    //声部
     private String subjectName;
 
-    /**  */
+    //原音url
     private String mp3Url = "";
 
-    /** 速度 */
+    //速度
     private Integer speed;
 
-    /**  */
+    //xmlUrl
     private String xmlUrl = "";
 
-    /**  */
+    //曲目名
     private String examSongName;
 
-    /**  */
+    //标签名
     private String categoriesName;
 
-    /**  */
+    //标签分类
     private Integer categoriesId;
 
-    /**  */
     private String type;
 
     /**  */
     private String url = "";
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getExamSongId() {
-        return examSongId;
-    }
-
-    public void setExamSongId(Integer examSongId) {
-        this.examSongId = examSongId;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public String getMp3Url() {
-        return mp3Url;
-    }
-
-    public void setMp3Url(String mp3Url) {
-        this.mp3Url = mp3Url;
-    }
-
-    public Integer getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Integer speed) {
-        this.speed = speed;
-    }
-
-    public String getXmlUrl() {
-        return xmlUrl;
-    }
-
-    public void setXmlUrl(String xmlUrl) {
-        this.xmlUrl = xmlUrl;
-    }
-
-    public String getExamSongName() {
-        return examSongName;
-    }
-
-    public void setExamSongName(String examSongName) {
-        this.examSongName = examSongName;
-    }
-
-    public String getCategoriesName() {
-        return categoriesName;
-    }
-
-    public void setCategoriesName(String categoriesName) {
-        this.categoriesName = categoriesName;
-    }
-
-    public Integer getCategoriesId() {
-        return categoriesId;
-    }
-
-    public void setCategoriesId(Integer categoriesId) {
-        this.categoriesId = categoriesId;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
     @Override
     public String toString() {
-        return "MusicSheetMessage{" +
-                "id='" + id + '\'' +
-                ", examSongId='" + examSongId + '\'' +
-                ", subjectId='" + subjectId + '\'' +
-                ", subjectName='" + subjectName + '\'' +
-                ", mp3Url='" + mp3Url + '\'' +
-                ", speed='" + speed + '\'' +
-                ", xmlUrl='" + xmlUrl + '\'' +
-                ", examSongName='" + examSongName + '\'' +
-                ", categoriesName='" + categoriesName + '\'' +
-                ", categoriesId='" + categoriesId + '\'' +
-                ", type='" + type + '\'' +
-                ", url='" + url + '\'' +
-                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  **/
 public interface MusicSheetAccompanimentService extends IService<MusicSheetAccompaniment> {
 
+    MusicSheetAccompanimentDao getDao();
 }

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
@@ -8,7 +7,10 @@ import com.yonge.cooleshow.biz.dal.constant.SysConfigConstant;
 import com.yonge.cooleshow.biz.dal.dao.ImNetworkRoomDao;
 import com.yonge.cooleshow.biz.dal.dao.SysConfigDao;
 import com.yonge.cooleshow.biz.dal.dto.*;
-import com.yonge.cooleshow.biz.dal.entity.*;
+import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
+import com.yonge.cooleshow.biz.dal.entity.IMApiResultInfo;
+import com.yonge.cooleshow.biz.dal.entity.ImNetworkRoom;
+import com.yonge.cooleshow.biz.dal.entity.ImNetworkRoomMember;
 import com.yonge.cooleshow.biz.dal.enums.ImNetworkRoomErrorEnum;
 import com.yonge.cooleshow.biz.dal.enums.ImNetworkRoomMemberChangedEnum;
 import com.yonge.cooleshow.biz.dal.enums.UserRoleEnum;
@@ -25,8 +27,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * 网络教室房间(ImNetworkRoom)表服务实现类
@@ -65,7 +69,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<ImNetworkRoomResult> joinRoom(Long courseScheduleId, UserRoleEnum userRole) throws Exception {
         log.info("joinRoom params：courseScheduleId:{},userRole:{}",courseScheduleId,userRole);
-        CourseSchedule courseSchedule = Optional.ofNullable(courseScheduleService.getDao().findOne(courseScheduleId)).
+        CourseSchedule courseSchedule = Optional.ofNullable(courseScheduleService.getBaseMapper().selectById(courseScheduleId)).
                 orElseThrow(()-> new BizException("课程信息不存在"));
         Date now = new Date();
         courseSchedule.setUpdatedTime(now);
@@ -194,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 content = 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-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetAccompanimentServiceImpl.java

@@ -23,6 +23,7 @@ public class MusicSheetAccompanimentServiceImpl extends ServiceImpl<MusicSheetAc
     @Autowired
     private MusicSheetAccompanimentDao musicSheetAccompanimentDao;
 
+    @Override
     public MusicSheetAccompanimentDao getDao() {
         return musicSheetAccompanimentDao;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetAccompanimentMapper.xml

@@ -18,5 +18,4 @@
 	</sql>
 
 
-
 </mapper>