feat:智能陪练一期

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

@@ -343,9 +343,9 @@ public class SoundCompareHandler implements WebSocketEventHandler {
                     }
                     cadenceValidNum++;
                     //如果频率差值在节奏误差范围内
-                    if(Math.abs(recordInfo.getFrequency()-musicXmlInfo.getFrequency())<=soundCompareConfig.integrityFrequencyRange){
-                        integrityValidNum++;
-                    }
+//                    if(Math.abs(recordInfo.getFrequency()-musicXmlInfo.getFrequency())<=soundCompareConfig.integrityFrequencyRange){
+//                        integrityValidNum++;
+//                    }
                 }
 
                 //非正常频率次数
@@ -418,7 +418,7 @@ public class SoundCompareHandler implements WebSocketEventHandler {
                     cadenceRight = true;
                 }
                 //音准、完成度
-                if (!CollectionUtils.isEmpty(measureSoundPitchInfos)){
+                if (cadenceRight && !CollectionUtils.isEmpty(measureSoundPitchInfos)){
                     //音准
                     Double avgPitch = measureSoundPitchInfos.stream().filter(pitch -> Math.abs((pitch.getFrequency()-musicXmlInfo.getFrequency()))<5).collect(Collectors.averagingDouble(pitch -> pitch.getFrequency()));
                     //音分