|
@@ -2,14 +2,12 @@ package com.ym.mec.biz.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.google.common.collect.Lists;
|
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
|
import com.ym.mec.biz.dal.dto.*;
|
|
|
-import com.ym.mec.biz.dal.entity.IndexBaseMonthData;
|
|
|
-import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
|
|
|
-import com.ym.mec.biz.dal.entity.SysMusicScore;
|
|
|
-import com.ym.mec.biz.dal.entity.UserMusicCompareCampDayData;
|
|
|
+import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.enums.FeatureType;
|
|
|
import com.ym.mec.biz.dal.enums.HeardLevelEnum;
|
|
|
import com.ym.mec.biz.dal.enums.IndexDataType;
|
|
@@ -72,6 +70,9 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
|
|
|
@Autowired
|
|
|
private UserMusicCompareCampDayDataDao userMusicCompareCampDayDataDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private UserMusicService userMusicService;
|
|
|
+
|
|
|
@Override
|
|
|
public BaseDAO<Long, SysMusicCompareRecord> getDAO() {
|
|
|
return sysMusicCompareRecordDao;
|
|
@@ -185,6 +186,15 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
|
|
|
if(Objects.nonNull(sysMusicScore)){
|
|
|
jsonObject.put("sysMusicScoreName", sysMusicScore.getName());
|
|
|
}
|
|
|
+
|
|
|
+ // 上传过作品,用作品视频路径覆盖上传视频路径
|
|
|
+ // ID集合
|
|
|
+ Map<Long, UserMusic> userMusicMap = userMusicService.getMapByMusicPracticeRecordIds(Lists.newArrayList(recordId));
|
|
|
+
|
|
|
+ UserMusic userMusic = userMusicMap.get(recordId);
|
|
|
+ if (Objects.nonNull(userMusic)) {
|
|
|
+ jsonObject.put("videoFilePath", userMusic.getVideoUrl());
|
|
|
+ }
|
|
|
return jsonObject;
|
|
|
}
|
|
|
|