|
@@ -120,10 +120,13 @@ public class SoundCompareHandler implements WebSocketEventHandler {
|
|
|
if(bodyObject.containsKey("speed")){
|
|
|
userSoundInfoMap.get(phone).setSpeed(bodyObject.getIntValue("speed"));
|
|
|
}
|
|
|
- List<Integer> subjectIds = sysMusicScoreAccompanimentDao.findSubjectByMusicScoreId(userSoundInfoMap.get(phone).getMusicScoreId(), null);
|
|
|
+ if(bodyObject.containsKey("subjectId")){
|
|
|
+ userSoundInfoMap.get(phone).setSubjectId(bodyObject.getIntValue("subjectId"));
|
|
|
+ }
|
|
|
+ /*List<Integer> subjectIds = sysMusicScoreAccompanimentDao.findSubjectByMusicScoreId(userSoundInfoMap.get(phone).getMusicScoreId(), null);
|
|
|
if(!CollectionUtils.isEmpty(subjectIds)){
|
|
|
userSoundInfoMap.get(phone).setSubjectId(subjectIds.get(0));
|
|
|
- }
|
|
|
+ }*/
|
|
|
userSoundInfoMap.get(phone).setMeasureXmlInfoMap(musicXmlInfos.stream().collect(Collectors.groupingBy(MusicPitchDetailDto::getMeasureIndex)));
|
|
|
musicXmlInfos.forEach(e->userSoundInfoMap.get(phone).getMusicalNotePitchMap().put(e.getMusicalNotesIndex(), e.getFrequency()));
|
|
|
for (Map.Entry<Integer, List<MusicPitchDetailDto>> userMeasureXmlInfoEntry : userSoundInfoMap.get(phone).getMeasureXmlInfoMap().entrySet()) {
|