|
@@ -94,13 +94,19 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object getLastEvaluationMusicalNotesPlayStats(Integer userId) {
|
|
|
- SysMusicCompareRecord userLastEvaluationData = sysMusicCompareRecordDao.getUserLastEvaluationData(userId);
|
|
|
+ public Object getLastEvaluationMusicalNotesPlayStats(Integer userId, Long recordId) {
|
|
|
+ SysMusicCompareRecord userLastEvaluationData;
|
|
|
+ if(Objects.nonNull(recordId)){
|
|
|
+ userLastEvaluationData = sysMusicCompareRecordDao.get(recordId);
|
|
|
+ }else{
|
|
|
+ userLastEvaluationData = sysMusicCompareRecordDao.getUserLastEvaluationData(userId);
|
|
|
+ }
|
|
|
if(StringUtils.isBlank(userLastEvaluationData.getScoreData())){
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
JSONObject jsonObject = JSON.parseObject(userLastEvaluationData.getScoreData());
|
|
|
+ jsonObject.put("recordId", userLastEvaluationData.getId());
|
|
|
jsonObject.put("score", userLastEvaluationData.getScore());
|
|
|
jsonObject.put("cadence", userLastEvaluationData.getCadence());
|
|
|
jsonObject.put("intonation", userLastEvaluationData.getIntonation());
|