Merge remote-tracking branch 'origin/master'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AlbumFavoriteController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/favor/album")
 @Api(tags = "专辑收藏表 web 控制层")
 public class AlbumFavoriteController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AlbumMusicRelateController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/album/relate")
 @Api(tags = "专辑曲谱关联表 web 控制层")
 public class AlbumMusicRelateController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicAlbumController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/music/album")
 @Api(tags = "专辑表 web 控制层")
 public class MusicAlbumController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicFavoriteController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/favor/music")
 @Api(tags = "乐谱收藏表 web 控制层")
 public class MusicFavoriteController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetAccompanimentController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/music/detail")
 @Api(tags = "曲谱伴奏表 web 控制层")
 public class MusicSheetAccompanimentController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -12,6 +12,8 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 
+import java.util.Date;
+
 /**
  * 曲谱表 web 控制层
  * @author yzp
@@ -19,7 +21,7 @@ import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/music/sheet")
 @Api(tags = "曲谱表 web 控制层")
 public class MusicSheetController extends BaseController {
     @Autowired
@@ -36,8 +38,8 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        //musicSheet.setCreateBy(sysUser.getId());
-        //musicSheet.setCreateTime(new Date());
+        musicSheet.setCreateBy(sysUser.getId());
+        musicSheet.setCreateTime(new Date());
         musicSheetService.insert(musicSheet);
         return succeed();
     }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetPurchaseRecordController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/music/buy/record")
 @Api(tags = "曲谱购买记录表 web 控制层")
 public class MusicSheetPurchaseRecordController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonEvaluateController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/videolesson/evaluate")
 @Api(tags = "视频课学员评价 web 控制层")
 public class VideoLessonEvaluateController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonGroupController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/videolesson/group")
 @Api(tags = "视频课基本信息表 web 控制层")
 public class VideoLessonGroupController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonGroupDetailController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/videolesson/group/detail")
 @Api(tags = "视频课明细表 web 控制层")
 public class VideoLessonGroupDetailController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonPurchaseRecordController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/videolesson/buy/record")
 @Api(tags = "视频课购买记录表 web 控制层")
 public class VideoLessonPurchaseRecordController extends BaseController {
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonStudyRecordController.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("")
+@RequestMapping("/admin/videolesson/study/record")
 @Api(tags = "视频课学习记录表 web 控制层")
 public class VideoLessonStudyRecordController extends BaseController {
     @Autowired

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

@@ -7,6 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
@@ -22,22 +27,29 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "主键id")
     private Long id;  //主键ID
 
+    @NotBlank(message = "曲谱名称不能为空!")
+    @Size(max = 64, message = "曲谱名称长度不能超过64位!")
     @TableField("music_sheet_name_")
     @ApiModelProperty(value = "曲谱名称")
     private String musicSheetName;  //曲谱名称
 
+    @NotNull(message = "曲谱来源不能为空")
     @TableField("user_id_")
     @ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)")
     private Long userId;  //曲谱来源(0:平台;非0:老师ID)
 
+    @NotBlank(message = "作曲人不能为空!")
+    @Size(max = 32, message = "作曲人长度不能超过64位!")
     @TableField("composer_")
     @ApiModelProperty(value = "作曲人")
     private String composer;  //作曲人
 
+    @NotBlank(message = "作曲人不能为空!")
     @TableField("music_subject_")
     @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
     private String musicSubject;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
 
+    @NotBlank(message = "作曲人不能为空!")
     @TableField("audio_type_")
     @ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)")
     private String audioType;  //曲谱音频文件类型(midi;mp3)
@@ -58,10 +70,12 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "是否展示指法(0:否;1:是)")
     private Integer showFingering;  //是否展示指法(0:否;1:是)
 
+    @NotNull(message = "收费类型不能为空!")
     @TableField("charge_type_")
     @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
     private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
+    @NotNull(message = "审核状态不能为空!")
     @TableField("audit_status_")
     @ApiModelProperty(value = "审核状态")
     private Integer auditStatus;  //审核状态
@@ -94,10 +108,12 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)")
     private Integer hasBeat;  //是否自带节拍器(0:否;1:是)
 
+    @NotNull(message = "创建时间不能为空!")
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;  //创建时间
 
+    @NotNull(message = "创建人不能为空!")
     @TableField("create_by_")
     @ApiModelProperty(value = "创建人(老师或者是后台平台用户)")
     private Long createBy;  //创建人(老师或者是后台平台用户)