Merge branch 'zx_online_config_0920' of http://git.dayaedu.com/yonge/cooleshow into develop-new

# Conflicts:
#	pom.xml

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/TeacherController.java

@@ -127,6 +127,9 @@ public class TeacherController extends BaseController {
     @GetMapping("/queryHotTeacherList")
     public HttpResponseResult<List<HotTeacherVo>> queryHotTeacherList() {
         SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
         Long userId = null;
         if (user != null && null != user.getId()) {
             userId = user.getId();

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/TokenController.java

@@ -49,6 +49,7 @@ import java.util.Base64;
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -97,6 +98,9 @@ public class TokenController extends BaseController {
         if (authUser != null) {
             // 获取用户信息
             SysUser sysUser = userService.get(authUser.getUserId());
+            if (Objects.isNull(sysUser)) {
+                return null;
+            }
             // 获取用户机构信息
             sysUser.setTenantId(userService.getTenantByClient(authUser.getUserId(),authUser.getClientId()));
             return sysUser;

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

@@ -21,6 +21,9 @@ public class CourseScheduleStudentMusicSheetResult extends CourseScheduleStudent
     @ApiModelProperty("是否支持混音节拍器")
     private Boolean isMixBeat;
 
+    @ApiModelProperty("简谱谱面样式参数设置")
+    private String extJianStyleConfigJson;
+
     @ApiModelProperty("五线谱PDF文件")
     private String musicPdfUrl;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -320,6 +320,10 @@ public class MusicSheet implements Serializable {
 	@TableField(exist = false)
 	private Boolean isMixBeat;
 
+	@ApiModelProperty("简谱谱面样式参数设置")
+	@TableField(exist = false)
+	private String extJianStyleConfigJson;
+
 	@ApiModelProperty("总谱五线谱PDF文件")
 	@TableField(exist = false)
 	private String musicPdfUrl;

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

@@ -85,6 +85,7 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
                     record.setStatus(sheetApplication.getStatus()?YesOrNoEnum.YES:YesOrNoEnum.NO);
                     record.setMusicStatus(sheetApplication.getStatus()?YesOrNoEnum.YES:YesOrNoEnum.NO);
                     record.setIsMixBeat(sheetApplication.getIsMixBeat());
+                    record.setExtJianStyleConfigJson(sheetApplication.getExtJianStyleConfigJson());
                     record.setMusicPdfUrl(sheetApplication.getMusicPdfUrl());
                     record.setFirstPdfUrl(sheetApplication.getFirstPdfUrl());
                     record.setJianPdfUrl(sheetApplication.getJianPdfUrl());

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

@@ -208,6 +208,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             studentMusicScore.setFirstPdfUrl(sheetApplication.getFirstPdfUrl());
             studentMusicScore.setJianPdfUrl(sheetApplication.getJianPdfUrl());
             studentMusicScore.setIsMixBeat(sheetApplication.getIsMixBeat());
+            studentMusicScore.setExtJianStyleConfigJson(sheetApplication.getExtJianStyleConfigJson());
             result.add(studentMusicScore);
         }
         return result;

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

@@ -470,6 +470,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         detailVo.setTitleImg(musicSheet1.getMusicCover());
         detailVo.setPlaySpeed(musicSheet1.getPlaySpeed());
         detailVo.setIsMixBeat(musicSheet1.getIsMixBeat());
+        detailVo.setExtJianStyleConfigJson(musicSheet1.getExtJianStyleConfigJson());
         detailVo.setMusicPdfUrl(musicSheet1.getMusicPdfUrl());
         detailVo.setFirstPdfUrl(musicSheet1.getFirstPdfUrl());
         detailVo.setJianPdfUrl(musicSheet1.getJianPdfUrl());

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

@@ -1206,8 +1206,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         }
 
         Student student = studentService.getById(userId);
-        Long subjectId = null;
-        if (student.getSubjectId() != null) {
+        Long subjectId = -1L;
+        if (student !=null && student.getSubjectId() != null) {
             subjectId = Long.parseLong(student.getSubjectId());
         }
 

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

@@ -158,6 +158,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
                     m.setFirstTone(sheetApplication.getMusicFirstImg());
                     m.setFixedTone(sheetApplication.getMusicJianImg());
                     m.setIsMixBeat(sheetApplication.getIsMixBeat());
+                    m.setExtJianStyleConfigJson(sheetApplication.getExtJianStyleConfigJson());
                     m.setMusicPdfUrl(sheetApplication.getMusicPdfUrl());
                     m.setFirstPdfUrl(sheetApplication.getFirstPdfUrl());
                     m.setJianPdfUrl(sheetApplication.getJianPdfUrl());

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

@@ -45,6 +45,9 @@ public class CourseCoursewareVo extends CourseCourseware{
 	@ApiModelProperty("是否支持混音节拍器")
 	private Boolean isMixBeat;
 
+	@ApiModelProperty("简谱谱面样式参数设置")
+	private String extJianStyleConfigJson;
+
 	@ApiModelProperty("总谱五线谱PDF文件")
 	private String musicPdfUrl;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumMusicWrapper.java

@@ -278,6 +278,9 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("是否支持混音节拍器")
         private Boolean isMixBeat;
 
+        @ApiModelProperty("简谱谱面样式参数设置")
+        private String extJianStyleConfigJson;
+
         @ApiModelProperty("总谱五线谱PDF文件")
         private String musicPdfUrl;
 

pom.xml

@@ -23,7 +23,7 @@
 		<google.zxing.version>3.4.0</google.zxing.version>
 		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
-		<cbs.version>1.0.16</cbs.version>
+		<cbs.version>1.0.17</cbs.version>
 		<microsvc.version>1.0.8-RC1</microsvc.version>
 	</properties>