Merge branch 'music_score'

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

@@ -34,8 +34,8 @@
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_
-		FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		FROM sys_music_score ses
+		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		WHERE sesa.id_ = #{id}
 	</select>
@@ -120,8 +120,8 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_
-		FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		FROM sys_music_score ses
+		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
@@ -131,8 +131,9 @@
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(sesa.id_) FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		SELECT COUNT(sesa.id_)
+		FROM sys_music_score ses
+		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
@@ -154,8 +155,8 @@
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_
-		FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		FROM sys_music_score ses
+		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
@@ -163,8 +164,9 @@
 	</select>
 
 	<select id="findAccCount" resultType="java.lang.Integer">
-		SELECT COUNT(DISTINCT sesa.id_) FROM sys_music_score_accompaniment sesa
-		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		SELECT COUNT(DISTINCT sesa.id_)
+		FROM sys_music_score ses
+		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>

mec-teacher/src/main/java/com/ym/mec/teacher/handler/WebSocketHandler.java

@@ -181,6 +181,7 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
             randomAccessFile.close();
             userSoundInfoMap.get(phone).setAccessFile(null);
         }
+        userSoundInfoMap.get(phone).setRecordMeasurePithInfo(null);
         LOGGER.info("评分数据：{}", JSON.toJSONString(userSoundInfoMap.get(phone)));
         userSoundInfoMap.remove(phone);
     }