Merge branch 'feature_camp_20230328' into 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;
@@ -227,7 +227,7 @@ public class AudioCompareHandler implements MessageHandler {
 					
 					sysMusicCompareRecord.setHeardLevel(HeardLevelEnum.valueOf(channelContext.getHardLevel().name()));
 					
-					sysMusicCompareRecordService.saveMusicCompareData(sysMusicCompareRecord);
+					sysMusicCompareRecordService.saveMusicCompareData(sysMusicCompareRecord,musicXmlBasicInfo.getCampId());
 				}
 				
 				int totalPlayTimeOfCurrentDate = sysMusicCompareRecordService.queryCurrentDatePlayTimeByUserId(sysMusicCompareRecord.getUserId());

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicCompareRecordService.java

@@ -33,7 +33,7 @@ public interface SysMusicCompareRecordService extends BaseService<Long, SysMusic
      * @param sysMusicCompareRecord
      * @return void
      */
-    void saveMusicCompareData(SysMusicCompareRecord sysMusicCompareRecord);
+    void saveMusicCompareData(SysMusicCompareRecord sysMusicCompareRecord,Integer campId);
 
     /**
      * @describe 用户最后一次评测数据

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

@@ -143,12 +143,13 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
 	@Override
 	@Transactional
-	public void saveMusicCompareData(SysMusicCompareRecord sysMusicCompareRecord) {
+	public void saveMusicCompareData(SysMusicCompareRecord sysMusicCompareRecord,Integer campId) {
 		
 		Integer userId = sysMusicCompareRecord.getUserId();
 		
 		sysMusicCompareRecordDao.update(sysMusicCompareRecord);
 		studentDao.addStudentCloudStudySequenceDays(userId);
+        updateCampData(sysMusicCompareRecord,campId);
 		sysMusicCompareWeekDataService
 				.updateUserWeekTrainData(userId, LocalDate.now().with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()));
 	}
@@ -511,11 +512,19 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
      * @param campId 训练营id
      */
     @Override
+    @Transactional
     public boolean insert(SysMusicCompareRecord record, Integer campId) {
         this.insert(record);
 
+        updateCampData(record, campId);
+
+        return true;
+    }
+
+    private void updateCampData(SysMusicCompareRecord record, Integer campId) {
+
         if (campId == null) {
-            return true;
+            return;
         }
         // 保存训练营评测记录
         int i = userMusicCompareCampDayDataDao.updateCampDayData(record.getUserId(), campId, record.getPlayTime());
@@ -528,7 +537,5 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
             campDayData.setTrainTime(record.getPlayTime());
             userMusicCompareCampDayDataDao.insert(campDayData);
         }
-
-        return true;
     }
 }