feat:小节评分

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

@@ -323,35 +323,35 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
                 //时间范围内匹配次数
                 float compareNum = 0;
 
-                boolean newMeasure = false;
-                float preMusicalNotesPitch = 0;
-                if(userSoundInfoMap.get(phone).getMusicalNotePitchMap().containsKey(musicXmlInfo.getMusicalNotesIndex()-1)){
-                    preMusicalNotesPitch = userSoundInfoMap.get(phone).getMusicalNotePitchMap().get(musicXmlInfo.getMusicalNotesIndex()-1);
-                }
-                if(userSoundInfoMap.get(phone).getMusicalNotePitchMap().get(musicXmlInfo.getMusicalNotesIndex())==-1){
-                    newMeasure = true;
-                }
-                int newNum = 0;
-
-                for (MusicPitchDetailDto recordInfo : userSoundInfoMap.get(phone).getRecordMeasurePithInfo()) {
-                    if(musicXmlInfo.getMusicalNotesIndex()==0){
-                        newMeasure = true;
-                    }
-                    if(newMeasure){
-                        break;
-                    }
-                    if(recordInfo.getTimeStamp()<preMeasureEndTimeStamp||recordInfo.getTimeStamp()>startTimeStamp){
-                        continue;
-                    }
-                    if(Math.abs(recordInfo.getFrequency()-preMusicalNotesPitch)>10){
-                        newNum++;
-                    }else{
-                        newNum = 0;
-                    }
-                    if(newNum>=2){
-                        newMeasure = true;
-                    }
-                }
+//                boolean newMeasure = false;
+//                float preMusicalNotesPitch = 0;
+//                if(userSoundInfoMap.get(phone).getMusicalNotePitchMap().containsKey(musicXmlInfo.getMusicalNotesIndex()-1)){
+//                    preMusicalNotesPitch = userSoundInfoMap.get(phone).getMusicalNotePitchMap().get(musicXmlInfo.getMusicalNotesIndex()-1);
+//                }
+//                if(userSoundInfoMap.get(phone).getMusicalNotePitchMap().get(musicXmlInfo.getMusicalNotesIndex())==-1){
+//                    newMeasure = true;
+//                }
+//                int newNum = 0;
+//
+//                for (MusicPitchDetailDto recordInfo : userSoundInfoMap.get(phone).getRecordMeasurePithInfo()) {
+//                    if(musicXmlInfo.getMusicalNotesIndex()==0){
+//                        newMeasure = true;
+//                    }
+//                    if(newMeasure){
+//                        break;
+//                    }
+//                    if(recordInfo.getTimeStamp()<preMeasureEndTimeStamp||recordInfo.getTimeStamp()>startTimeStamp){
+//                        continue;
+//                    }
+//                    if(Math.abs(recordInfo.getFrequency()-preMusicalNotesPitch)>10){
+//                        newNum++;
+//                    }else{
+//                        newNum = 0;
+//                    }
+//                    if(newNum>=2){
+//                        newMeasure = true;
+//                    }
+//                }
 
 //                List<Float> musicalNotesPitchs = new ArrayList<>();
 //                List<Float> decibels = new ArrayList<>();
@@ -367,9 +367,6 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
 //                    decibels.add(recordInfo.getDecibel());
                     measureSoundPitchInfos.add(recordInfo);
                     compareNum++;
-                    if(!newMeasure){
-                        continue;
-                    }
 //                    LOGGER.info("{}频率({}-{})：{}, {}", recordInfo.getTimeStamp(), startTimeStamp, endTimeStamp, musicXmlInfo.getFrequency(), recordInfo.getFrequency());
                     //如果在最低有效频率以下则跳过
                     if(recordInfo.getFrequency()<minValidFrequency&&musicXmlInfo.getFrequency()!=-1){