Merge branch 'feature_camp_20230328' into master_saas

audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java

@@ -157,7 +157,7 @@ public class AudioCompareHandler implements MessageHandler {
 				
 				MusicXmlNote musicXmlNote = musicXmlBasicInfo.getMusicXmlInfos().stream().max(Comparator.comparing(MusicXmlNote::getTimeStamp)).get();
 				sysMusicCompareRecord.setSourceTime((float) ((musicXmlNote.getTimeStamp()+musicXmlNote.getDuration())/1000));
-				sysMusicCompareRecordService.insert(sysMusicCompareRecord,musicXmlBasicInfo.getCampId());
+				sysMusicCompareRecordService.insert(sysMusicCompareRecord,null);
 				channelContext.setRecordId(sysMusicCompareRecord.getId());
 			}
 			break;

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

@@ -516,15 +516,16 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
     public boolean insert(SysMusicCompareRecord record, Integer campId) {
         this.insert(record);
 
-        if (campId == null) {
-            return true;
-        }
         updateCampData(record, campId);
 
         return true;
     }
 
     private void updateCampData(SysMusicCompareRecord record, Integer campId) {
+
+        if (campId == null) {
+            return;
+        }
         // 保存训练营评测记录
         int i = userMusicCompareCampDayDataDao.updateCampDayData(record.getUserId(), campId, record.getPlayTime());
         if (i == 0) {