酷乐秀曲目来源改为内容平台

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImNetworkDeviceStateChangedMessage.java

@@ -6,7 +6,7 @@ import com.yonge.cooleshow.biz.dal.entity.BaseMessage;
 public class ImNetworkDeviceStateChangedMessage extends BaseMessage {
     private boolean enable;
     private int type;
-    private Integer musicSheetAccompanimentId;
+    private String musicSheetAccompanimentId;
     private String userId;
     private String userName;
     private Integer soundVolume = 100;
@@ -32,11 +32,11 @@ public class ImNetworkDeviceStateChangedMessage extends BaseMessage {
         this.type = type;
     }
 
-    public Integer getMusicSheetAccompanimentId() {
+    public String getMusicSheetAccompanimentId() {
         return musicSheetAccompanimentId;
     }
 
-    public void setMusicSheetAccompanimentId(Integer musicSheetAccompanimentId) {
+    public void setMusicSheetAccompanimentId(String musicSheetAccompanimentId) {
         this.musicSheetAccompanimentId = musicSheetAccompanimentId;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseCoursewareServiceImpl.java

@@ -18,6 +18,7 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
 import com.yonge.cooleshow.biz.dal.service.CourseCoursewareService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.service.TenantAlbumMusicService;
 import com.yonge.cooleshow.biz.dal.vo.CourseCoursewareVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
@@ -30,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Date;
@@ -45,22 +47,22 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
     private final static Logger log = LoggerFactory.getLogger(CourseCoursewareServiceImpl.class);
 
 
-    @Autowired
+    @Resource
     private SysUserMapper userMapper;
 
-    @Autowired
+    @Resource
     private MusicSheetService musicSheetService;
 
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
+    @Resource
+    private SysUserService sysUserService;
 
-    @Autowired
+    @Resource
     private MusicSheetAccompanimentDao musicSheetAccompanimentDao;
 
-    @Autowired
+    @Resource
     private TeacherDao teacherDao;
 
-    @Autowired
+    @Resource
     private TenantAlbumMusicService tenantAlbumMusicService;
 
 	@Override
@@ -207,11 +209,8 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
     public CourseCourseware submit(CourseCourseware courseCourseware) {
 
         // 判断用户
-        com.yonge.cooleshow.auth.api.entity.SysUser user = sysUserFeignService.queryUserById(
+        com.yonge.cooleshow.auth.api.entity.SysUser user = sysUserService.getByUserId(
                 courseCourseware.getUserId());
-        if (user == null) {
-            throw new BizException("用户信息未找到");
-        }
 
         // 判断是否已经添加到附件
         Integer count = this.lambdaQuery()

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -193,7 +193,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                 .distinct().collect(Collectors.toList());
         List<CbsMusicSheetWrapper.MusicSheetAccApplication> sheetApplications = this.getSheetApplications(musicSheetSoundIds);
         Map<Long, CbsMusicSheetWrapper.MusicSheetAccApplication> sheetApplicationMap = sheetApplications.stream()
-                .collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetAccApplication::getMusicSheetSoundId, Function.identity()));
+                .collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetAccApplication::getId, Function.identity()));
         for (CourseScheduleStudentMusicSheetResult studentMusicScore : scheduleStudentMusicScores) {
             CbsMusicSheetWrapper.MusicSheetAccApplication sheetApplication =
                     sheetApplicationMap.get(Long.parseLong(studentMusicScore.getMusicScoreAccompanimentId()));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/RoomServiceImpl.java

@@ -18,7 +18,6 @@ import com.yonge.cooleshow.biz.dal.service.RoomService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,13 +36,13 @@ public class RoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNetworkRoom
 
     private final static Logger log = LoggerFactory.getLogger(RoomServiceImpl.class);
 
-    @Autowired
+    @Resource
     private RTCRoomPluginContext rtcRoomPluginContext;
-    @Autowired
+    @Resource
     private ImNetworkRoomMemberStatusService imNetworkRoomMemberStatusService;
-    @Autowired
+    @Resource
     private ImNetworkRoomMemberService imNetworkRoomMemberService;
-    @Autowired
+    @Resource
     private ImService imService;
     @Resource
     private RedisTemplate<String,Object> redisTemplate;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseCoursewareVo.java

@@ -14,7 +14,7 @@ public class CourseCoursewareVo extends CourseCourseware{
 	@ApiModelProperty("用户名")
 	private String username;
 
-	private Long musicSheetAccompanimentId;
+	private String musicSheetAccompanimentId;
 
 	private String url;
 

pom.xml

@@ -24,6 +24,7 @@
 		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
 		<cbs.version>1.0.11</cbs.version>
+		<microsvc.version>1.0.7</microsvc.version>
 	</properties>
 
 
@@ -69,7 +70,7 @@
 			<dependency>
 				<groupId>com.microsvc.toolkit</groupId>
 				<artifactId>microsvc-dependencies-bom</artifactId>
-				<version>1.0.4</version>
+				<version>${microsvc.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>