Browse Source

添加实体类验证

jelly 3 years ago
parent
commit
aad9a9a8ed

+ 3 - 0
.gitignore

@@ -23,6 +23,9 @@ mvnw.cmd
 *.ipr
 /toolset/codegen/src/main/resources/generateConfigration.xml
 /cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml
+/cooleshow-user/user-student/src/main/resources/bootstrap-dev.yml
+/cooleshow-user/user-teacher/src/main/resources/bootstrap-dev.yml
+/cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.yml
 
 ### 忽略子模块的文件 ###
 **/*.ims

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

@@ -30,7 +30,7 @@ public class MusicSheetController extends BaseController {
 	@Autowired
 	private MusicSheetService musicSheetService;
 
-	@ApiOperation(value = "新增")
+	@ApiOperation(value = "新增曲谱")
     @PostMapping("/create")
     public Object create(@Valid @RequestBody MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -44,7 +44,7 @@ public class MusicSheetController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除曲谱")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -56,7 +56,7 @@ public class MusicSheetController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
+    @ApiOperation(value = "修改曲谱")
     @PostMapping("/update")
     public Object update(@Valid @RequestBody MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -73,7 +73,7 @@ public class MusicSheetController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
+    @ApiOperation(value = "曲谱分页查询")
     @PostMapping("/list")
     public Object list(@RequestBody MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();

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

@@ -35,21 +35,21 @@ public class MusicSheet extends BaseEntity {
 
     @NotNull(message = "曲谱来源不能为空")
     @TableField("user_id_")
-    @ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)")
-    private Long userId;  //曲谱来源(0:平台;非0:老师ID)
+    @ApiModelProperty(value = "曲谱来源(老师ID或后台管理用户ID)")
+    private Long userId;  //曲谱来源(老师ID或后台管理用户ID)
 
     @NotBlank(message = "作曲人不能为空!")
-    @Size(max = 32, message = "作曲人长度不能超过64位!")
+    @Size(max = 32, message = "作曲人长度不能超过32位!")
     @TableField("composer_")
     @ApiModelProperty(value = "作曲人")
     private String composer;  //作曲人
 
-    @NotBlank(message = "作曲人不能为空!")
+    @NotBlank(message = "曲谱声部不能为空!")
     @TableField("music_subject_")
     @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
     private String musicSubject;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
 
-    @NotBlank(message = "作曲人不能为空!")
+    @NotBlank(message = "曲谱音频文件类型不能为空!")
     @TableField("audio_type_")
     @ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)")
     private String audioType;  //曲谱音频文件类型(midi;mp3)
@@ -108,12 +108,10 @@ 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;  //创建人(老师或者是后台平台用户)

+ 1 - 1
toolset/audit-log/src/main/java/com/yonge/toolset/log/interceptor/AuditLogInterceptor.java

@@ -145,7 +145,7 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
         auditLog.setUsername(username);
         auditLog.setUserId(userId);
         auditLog.setOperateTime(sdf.format(new Date()));
-        auditLogService.insert(auditLog);
+        //auditLogService.insert(auditLog);
     }
 
     public void setUsername(String username, Long userId) {