Merge branch 'master' into biz-lims-dev

# Conflicts:
#	tr-test/src/main/java/cn/tr/test/WebApplication.java

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/notice/controller/SysNoticeController.java

@@ -29,7 +29,7 @@ import cn.tr.core.pojo.TableDataInfo;
  */
 @Api(tags = "系统公告")
 @RestController
-@RequestMapping("/sys/notice/notice")
+@RequestMapping("/sys/notice")
 @AllArgsConstructor
 public class SysNoticeController extends BaseController{
 
@@ -44,37 +44,37 @@ public class SysNoticeController extends BaseController{
     }
 
     @ApiOperationSupport(author = "lf",order = 2)
-    @ApiOperation(value = "根据id查询系统公告",notes = "权限： notice:notice:query")
+    @ApiOperation(value = "根据id查询系统公告",notes = "权限： sys:notice:query")
     @GetMapping("/detail/{id}")
-    @SaCheckPermission("notice:notice:query")
+    @SaCheckPermission("sys:notice:query")
     public CommonResult<SysNoticeDTO> findById(@PathVariable("id") String id){
         startPage();
         return CommonResult.success(sysNoticeService.selectSysNoticeById(id));
     }
 
     @ApiOperationSupport(author = "lf",order = 3)
-    @ApiOperation(value="添加系统公告",notes = "权限： notice:notice:add")
+    @ApiOperation(value="添加系统公告",notes = "权限： sys:notice:add")
     @PostMapping("/add")
     @OperateLog
-    @SaCheckPermission("notice:notice:add")
+    @SaCheckPermission("sys:notice:add")
     public CommonResult<Boolean> add(@RequestBody@Validated(Insert.class) SysNoticeDTO source) {
         return CommonResult.success(sysNoticeService.insertSysNotice(source));
     }
 
     @ApiOperationSupport(author = "lf",order = 4)
-    @ApiOperation(value="通过主键id编辑系统公告",notes = "权限： notice:notice:edit")
+    @ApiOperation(value="通过主键id编辑系统公告",notes = "权限： sys:notice:edit")
     @PostMapping("/edit")
     @OperateLog
-    @SaCheckPermission("notice:notice:edit")
+    @SaCheckPermission("sys:notice:edit")
     public CommonResult<Boolean> edit(@RequestBody@Validated(Update.class) SysNoticeDTO source) {
         return CommonResult.success(sysNoticeService.updateSysNoticeById(source));
     }
 
     @ApiOperationSupport(author = "lf",order = 5)
-    @ApiOperation(value="删除系统公告",notes = "权限： notice:notice:remove")
+    @ApiOperation(value="删除系统公告",notes = "权限： sys:notice:remove")
     @PostMapping("/removeByIds")
     @OperateLog
-    @SaCheckPermission("notice:notice:remove")
+    @SaCheckPermission("sys:notice:remove")
     public CommonResult<Integer> delete(@RequestBody Collection<String> ids) {
         return CommonResult.success(sysNoticeService.removeSysNoticeByIds(ids));
     }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/notice/dto/SysNoticeDTO.java

@@ -6,6 +6,8 @@ import lombok.ToString;
 import cn.tr.core.validation.Update;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
 import javax.validation.constraints.*;
 
 /**
@@ -22,17 +24,21 @@ public class SysNoticeDTO extends BaseDTO {
      @NotBlank  (message = "主键不能为空",groups = {Update.class})
     private String id;
 
-    @ApiModelProperty(value = "公告名称", position = 2)
+    @ApiModelProperty(value = "公告名称",required = true,position = 2)
+    @NotBlank(message = "公告名称不能为空",groups = {Integer.class,Update.class})
     private String title;
 
-    @ApiModelProperty(value = "公告类型", position = 3)
+    @ApiModelProperty(value = "公告类型",required = true,position = 3)
+    @NotBlank(message = "公告类型不能为空",groups = {Integer.class,Update.class})
     private String type;
 
-    @ApiModelProperty(value = "公告内容", position = 4)
+    @ApiModelProperty(value = "公告内容", required = true,position = 4)
+    @NotBlank(message = "公告内容不能为空",groups = {Integer.class,Update.class})
+    @Length(max = 2048,message = "公告内容不得超过2048个字",groups = {Integer.class,Update.class})
     private String content;
 
 
-    @ApiModelProperty(value = "发布人昵称", position = 4)
+    @ApiModelProperty(value = "发布人昵称", readOnly = true,position = 4)
     public String getUpdateNickName() {
         return UserUtil.getNickName(getUpdateBy());
     }