Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -463,7 +463,9 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param studentId
      * @return
      */
-    List<ClassGroup> queryStudentClassGroups(@Param("musicGroupId") String musicGroupId, @Param("studentId") Integer studentId);
+    List<ClassGroup> queryStudentClassGroups(@Param("musicGroupId") String musicGroupId,
+                                             @Param("studentId") Integer studentId,
+                                             @Param("classGroupType") String classGroupType);
 
     /**
      * 批量新增班级上的课次数
@@ -503,7 +505,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroup> findClassGroups(@Param("musicGroupId") String musicGroupId);
+    List<ClassGroup> findClassGroups(@Param("musicGroupId") String musicGroupId,@Param("classGroupType") String classGroupType);
 
     /**
      * 查询对应类型所有班级列表

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupTrainPlanSaveDto.java

@@ -34,8 +34,18 @@ public class MusicGroupTrainPlanSaveDto {
 	@ApiModelProperty(value = "课程上课时间",required = false)
 	private Date courseClassTime;
 
+	private String classGroupType;
+
 	private Boolean studentFlag = false;
 
+	public String getClassGroupType() {
+		return classGroupType;
+	}
+
+	public void setClassGroupType(String classGroupType) {
+		this.classGroupType = classGroupType;
+	}
+
 	public Boolean getStudentFlag() {
 		return studentFlag;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -2752,7 +2752,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if(sysUser == null){
             throw new BizException("请登录");
         }
-        List<ClassGroup> classGroups = classGroupDao.queryStudentClassGroups(musicGroupId, sysUser.getId());
+        List<ClassGroup> classGroups = classGroupDao.queryStudentClassGroups(musicGroupId, sysUser.getId(),null);
         if(classGroups.size() > 0){
             classGroups.forEach(e->{
                 e.setTeacherMapperList(classGroupTeacherMapperDao.findClassGroupTeachers(e.getId().toString()));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CooperationOrganServiceImpl.java

@@ -100,7 +100,7 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 			if(musicGroups.size() > 0){
 				for (MusicGroup musicGroup : musicGroups) {
 					//获取当前乐团所有班级
-					List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId());
+					List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId(),null);
 					if (classGroups == null || classGroups.size() == 0) {
 						continue;
 					}
@@ -155,7 +155,7 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 					if(musicGroups.size() > 0){
 						for (MusicGroup musicGroup : musicGroups) {
 							//获取当前乐团所有班级
-							List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId());
+							List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId(),null);
 							if (classGroups == null || classGroups.size() == 0) {
 								continue;
 							}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -2931,7 +2931,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     private void updateTeamTeacher(MusicGroup oldMusicGroup, MusicGroup newMusicGroup) {
         //获取当前乐团所有班级
-        List<ClassGroup> classGroups = classGroupDao.findClassGroups(newMusicGroup.getId());
+        List<ClassGroup> classGroups = classGroupDao.findClassGroups(newMusicGroup.getId(),null);
         if (classGroups == null || classGroups.size() == 0) {
             return;
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupTrainPlanServiceImpl.java

@@ -85,9 +85,9 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 			if(sysUser == null){
 				throw new BizException("请登录");
 			}
-			classGroups = classGroupDao.queryStudentClassGroups(musicGroupTrainPlanSaveDto.getMusicGroupId(),sysUser.getId());
+			classGroups = classGroupDao.queryStudentClassGroups(musicGroupTrainPlanSaveDto.getMusicGroupId(),sysUser.getId(),musicGroupTrainPlanSaveDto.getClassGroupType());
 		}else {
-			classGroups = classGroupDao.findClassGroups(musicGroupTrainPlanSaveDto.getMusicGroupId());
+			classGroups = classGroupDao.findClassGroups(musicGroupTrainPlanSaveDto.getMusicGroupId(),musicGroupTrainPlanSaveDto.getClassGroupType());
 		}
 		if(classGroups.size() == 0){
 			return null;

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -957,6 +957,9 @@
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         where cg.music_group_id_ = #{musicGroupId} AND cgsm.user_id_ = #{studentId}
         AND cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND cg.group_type_ = 'MUSIC'
+        <if test="classGroupType != null and classGroupType != ''">
+            AND cg.type_ = #{classGroupType}
+        </if>
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
@@ -1050,6 +1053,9 @@
     <select id="findClassGroups" resultMap="ClassGroup">
         SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId}
         AND del_flag_='0' AND group_type_ = 'MUSIC'
+        <if test="classGroupType != null and classGroupType != ''">
+            AND type_ = #{classGroupType}
+        </if>
     </select>
 
     <!-- 根据合奏班id获取子班及老师 -->

mec-student/src/main/java/com/ym/mec/student/config/WebSocketConfig.java

@@ -26,7 +26,8 @@ public class WebSocketConfig implements WebSocketConfigurer {
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry webSocketHandlerRegistry) {
         webSocketHandlerRegistry.addHandler(webSocketHandler, "/audioEvaluate")
-                .addInterceptors(webSocketHandshakeInterceptor);
+                .addInterceptors(webSocketHandshakeInterceptor)
+                .setAllowedOrigins("*");
     }
 
     @Bean

mec-teacher/src/main/java/com/ym/mec/teacher/config/WebSocketConfig.java

@@ -25,8 +25,9 @@ public class WebSocketConfig implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry webSocketHandlerRegistry) {
-        webSocketHandlerRegistry.addHandler(webSocketHandler, "/audioEvaluate")
-                .addInterceptors(webSocketHandshakeInterceptor);
+        webSocketHandlerRegistry.addHandler(webSocketHandler, "/audioEvaluate", "/ws")
+                .addInterceptors(webSocketHandshakeInterceptor)
+                .setAllowedOrigins("*");
     }
 
     @Bean

mec-web/src/main/java/com/ym/mec/web/config/WebSocketConfig.java

@@ -26,7 +26,8 @@ public class WebSocketConfig implements WebSocketConfigurer {
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry webSocketHandlerRegistry) {
         webSocketHandlerRegistry.addHandler(webSocketHandler, "/audioEvaluate")
-                .addInterceptors(webSocketHandshakeInterceptor);
+                .addInterceptors(webSocketHandshakeInterceptor)
+                .setAllowedOrigins("*");
     }
 
     @Bean