Explorar o código

适配springdoc

xingyu %!s(int64=2) %!d(string=hai) anos
pai
achega
fa2977ae9e
Modificáronse 12 ficheiros con 81 adicións e 88 borrados
  1. 14 14
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
  2. 12 12
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
  3. 11 12
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
  4. 4 5
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java
  5. 7 9
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
  6. 4 4
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
  7. 8 8
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
  8. 2 2
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java
  9. 6 8
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java
  10. 5 5
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
  11. 5 6
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
  12. 3 3
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java

+ 14 - 14
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java

@@ -9,9 +9,9 @@ import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyM
 import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
-@Api(tags = "管理后台 - 我的站内信")
+@Tag(name = "管理后台 - 我的站内信")
 @RestController
 @RequestMapping("/system/notify-message")
 @Validated
@@ -35,8 +35,8 @@ public class NotifyMessageController {
     // ========== 管理所有的站内信 ==========
 
     @GetMapping("/get")
-    @ApiOperation("获得站内信")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @Operation(summary = "获得站内信")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
     public CommonResult<NotifyMessageRespVO> getNotifyMessage(@RequestParam("id") Long id) {
         NotifyMessageDO notifyMessage = notifyMessageService.getNotifyMessage(id);
@@ -44,7 +44,7 @@ public class NotifyMessageController {
     }
 
     @GetMapping("/page")
-    @ApiOperation("获得站内信分页")
+    @Operation(summary = "获得站内信分页")
     @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
@@ -54,7 +54,7 @@ public class NotifyMessageController {
     // ========== 查看自己的站内信 ==========
 
     @GetMapping("/my-page")
-    @ApiOperation("获得我的站内信分页")
+    @Operation(summary = "获得我的站内信分页")
     public CommonResult<PageResult<NotifyMessageRespVO>> getMyMyNotifyMessagePage(@Valid NotifyMessageMyPageReqVO pageVO) {
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO,
                 getLoginUserId(), UserTypeEnum.ADMIN.getValue());
@@ -62,23 +62,23 @@ public class NotifyMessageController {
     }
 
     @PutMapping("/update-read")
-    @ApiOperation("标记站内信为已读")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    @Operation(summary = "标记站内信为已读")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     public CommonResult<Boolean> updateNotifyMessageRead(@RequestParam("ids") List<Long> ids) {
         notifyMessageService.updateNotifyMessageRead(ids, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
         return success(Boolean.TRUE);
     }
 
     @PutMapping("/update-all-read")
-    @ApiOperation("标记所有站内信为已读")
+    @Operation(summary = "标记所有站内信为已读")
     public CommonResult<Boolean> updateAllNotifyMessageRead() {
         notifyMessageService.updateAllNotifyMessageRead(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
         return success(Boolean.TRUE);
     }
 
     @GetMapping("/get-unread-list")
-    @ApiOperation("获取当前用户的最新站内信列表,默认 10 条")
-    @ApiImplicitParam(name = "size", value = "10", defaultValue = "10", dataTypeClass = Integer.class)
+    @Operation(summary = "获取当前用户的最新站内信列表,默认 10 条")
+    @Parameter(name = "size", description = "10")
     public CommonResult<List<NotifyMessageRespVO>> getUnreadNotifyMessageList(
             @RequestParam(name = "size", defaultValue = "10") Integer size) {
         List<NotifyMessageDO> list = notifyMessageService.getUnreadNotifyMessageList(
@@ -87,7 +87,7 @@ public class NotifyMessageController {
     }
 
     @GetMapping("/get-unread-count")
-    @ApiOperation("获得当前用户的未读站内信数量")
+    @Operation(summary = "获得当前用户的未读站内信数量")
     public CommonResult<Long> getUnreadNotifyMessageCount() {
         return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
     }

+ 12 - 12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java

@@ -7,9 +7,9 @@ import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import cn.iocoder.yudao.module.system.service.notify.NotifySendService;
 import cn.iocoder.yudao.module.system.service.notify.NotifyTemplateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,7 @@ import javax.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-@Api(tags = "管理后台 - 站内信模版")
+@Tag(name = "管理后台 - 站内信模版")
 @RestController
 @RequestMapping("/system/notify-template")
 @Validated
@@ -32,14 +32,14 @@ public class NotifyTemplateController {
     private NotifySendService notifySendService;
 
     @PostMapping("/create")
-    @ApiOperation("创建站内信模版")
+    @Operation(summary = "创建站内信模版")
     @PreAuthorize("@ss.hasPermission('system:notify-template:create')")
     public CommonResult<Long> createNotifyTemplate(@Valid @RequestBody NotifyTemplateCreateReqVO createReqVO) {
         return success(notifyTemplateService.createNotifyTemplate(createReqVO));
     }
 
     @PutMapping("/update")
-    @ApiOperation("更新站内信模版")
+    @Operation(summary = "更新站内信模版")
     @PreAuthorize("@ss.hasPermission('system:notify-template:update')")
     public CommonResult<Boolean> updateNotifyTemplate(@Valid @RequestBody NotifyTemplateUpdateReqVO updateReqVO) {
         notifyTemplateService.updateNotifyTemplate(updateReqVO);
@@ -47,8 +47,8 @@ public class NotifyTemplateController {
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除站内信模版")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+    @Operation(summary = "删除站内信模版")
+    @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('system:notify-template:delete')")
     public CommonResult<Boolean> deleteNotifyTemplate(@RequestParam("id") Long id) {
         notifyTemplateService.deleteNotifyTemplate(id);
@@ -56,8 +56,8 @@ public class NotifyTemplateController {
     }
 
     @GetMapping("/get")
-    @ApiOperation("获得站内信模版")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @Operation(summary = "获得站内信模版")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:notify-template:query')")
     public CommonResult<NotifyTemplateRespVO> getNotifyTemplate(@RequestParam("id") Long id) {
         NotifyTemplateDO notifyTemplate = notifyTemplateService.getNotifyTemplate(id);
@@ -65,7 +65,7 @@ public class NotifyTemplateController {
     }
 
     @GetMapping("/page")
-    @ApiOperation("获得站内信模版分页")
+    @Operation(summary = "获得站内信模版分页")
     @PreAuthorize("@ss.hasPermission('system:notify-template:query')")
     public CommonResult<PageResult<NotifyTemplateRespVO>> getNotifyTemplatePage(@Valid NotifyTemplatePageReqVO pageVO) {
         PageResult<NotifyTemplateDO> pageResult = notifyTemplateService.getNotifyTemplatePage(pageVO);
@@ -73,7 +73,7 @@ public class NotifyTemplateController {
     }
 
     @PostMapping("/send-notify")
-    @ApiOperation("发送站内信")
+    @Operation(summary = "发送站内信")
     @PreAuthorize("@ss.hasPermission('system:notify-template:send-notify')")
     public CommonResult<Long> sendNotify(@Valid @RequestBody NotifyTemplateSendReqVO sendReqVO) {
         return success(notifySendService.sendSingleNotifyToAdmin(sendReqVO.getUserId(),

+ 11 - 12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java

@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -18,43 +17,43 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class NotifyMessageBaseVO {
 
-    @ApiModelProperty(value = "用户编号", required = true, example = "25025")
+    @Schema(description = "用户编号", required = true, example = "25025")
     @NotNull(message = "用户编号不能为空")
     private Long userId;
 
-    @ApiModelProperty(value = "用户类型", required = true, example = "1", notes = "参见 UserTypeEnum 枚举")
+    @Schema(description = "用户类型 - 参见 UserTypeEnum 枚举", required = true, example = "1")
     @NotNull(message = "用户类型不能为空")
     private Byte userType;
 
-    @ApiModelProperty(value = "模版编号", required = true, example = "13013")
+    @Schema(description = "模版编号", required = true, example = "13013")
     @NotNull(message = "模版编号不能为空")
     private Long templateId;
 
-    @ApiModelProperty(value = "模板编码", required = true, example = "test_01")
+    @Schema(description = "模板编码", required = true, example = "test_01")
     @NotNull(message = "模板编码不能为空")
     private String templateCode;
 
-    @ApiModelProperty(value = "模版发送人名称", required = true, example = "芋艿")
+    @Schema(description = "模版发送人名称", required = true, example = "芋艿")
     @NotNull(message = "模版发送人名称不能为空")
     private String templateNickname;
 
-    @ApiModelProperty(value = "模版内容", required = true, example = "测试内容")
+    @Schema(description = "模版内容", required = true, example = "测试内容")
     @NotNull(message = "模版内容不能为空")
     private String templateContent;
 
-    @ApiModelProperty(value = "模版类型", required = true, example = "2")
+    @Schema(description = "模版类型", required = true, example = "2")
     @NotNull(message = "模版类型不能为空")
     private Integer templateType;
 
-    @ApiModelProperty(value = "模版参数", required = true)
+    @Schema(description = "模版参数", required = true)
     @NotNull(message = "模版参数不能为空")
     private Map<String, Object> templateParams;
 
-    @ApiModelProperty(value = "是否已读", required = true, example = "true")
+    @Schema(description = "是否已读", required = true, example = "true")
     @NotNull(message = "是否已读不能为空")
     private Boolean readStatus;
 
-    @ApiModelProperty(value = "阅读时间")
+    @Schema(description = "阅读时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime readTime;
 

+ 4 - 5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java

@@ -1,8 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,16 +11,16 @@ import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 站内信分页 Request VO")
+@Schema(description = "管理后台 - 站内信分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class NotifyMessageMyPageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "是否已读", example = "true")
+    @Schema(description = "是否已读", example = "true")
     private Boolean readStatus;
 
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 

+ 7 - 9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java

@@ -1,37 +1,35 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 站内信分页 Request VO")
+@Schema(description = "管理后台 - 站内信分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class NotifyMessagePageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "用户编号", example = "25025")
+    @Schema(description = "用户编号", example = "25025")
     private Long userId;
 
-    @ApiModelProperty(value = "用户类型", example = "1")
+    @Schema(description = "用户类型", example = "1")
     private Integer userType;
 
-    @ApiModelProperty(value = "模板编码", example = "test_01")
+    @Schema(description = "模板编码", example = "test_01")
     private String templateCode;
 
-    @ApiModelProperty(value = "模版类型", example = "2")
+    @Schema(description = "模版类型", example = "2")
     private Integer templateType;
 
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 

+ 4 - 4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java

@@ -1,19 +1,19 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
-import io.swagger.annotations.*;
 
-@ApiModel("管理后台 - 站内信 Response VO")
+@Schema(description = "管理后台 - 站内信 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class NotifyMessageRespVO extends NotifyMessageBaseVO {
 
-    @ApiModelProperty(value = "ID", required = true, example = "1024")
+    @Schema(description = "ID", required = true, example = "1024")
     private Long id;
 
-    @ApiModelProperty(value = "创建时间", required = true)
+    @Schema(description = "创建时间", required = true)
     private Date createTime;
 
 }

+ 8 - 8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -15,32 +15,32 @@ import javax.validation.constraints.NotNull;
 @Data
 public class NotifyTemplateBaseVO {
 
-    @ApiModelProperty(value = "模版名称", required = true, example = "测试模版")
+    @Schema(description = "模版名称", required = true, example = "测试模版")
     @NotEmpty(message = "模版名称不能为空")
     private String name;
 
-    @ApiModelProperty(value = "模版编码", required = true, example = "SEND_TEST")
+    @Schema(description = "模版编码", required = true, example = "SEND_TEST")
     @NotNull(message = "模版编码不能为空")
     private String code;
 
-    @ApiModelProperty(value = "模版类型", required = true, example = "1", notes = "对应 system_notify_template_type 字典")
+    @Schema(description = "模版类型 - 对应 system_notify_template_type 字典", required = true, example = "1")
     @NotNull(message = "模版类型不能为空")
     private Integer type;
 
-    @ApiModelProperty(value = "发送人名称", required = true, example = "土豆")
+    @Schema(description = "发送人名称", required = true, example = "土豆")
     @NotEmpty(message = "发送人名称不能为空")
     private String nickname;
 
-    @ApiModelProperty(value = "模版内容", required = true, example = "我是模版内容")
+    @Schema(description = "模版内容", required = true, example = "我是模版内容")
     @NotEmpty(message = "模版内容不能为空")
     private String content;
 
-    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举")
+    @Schema(description = "状态 - 参见 CommonStatusEnum 枚举", required = true, example = "1")
     @NotNull(message = "状态不能为空")
     @InEnum(value = CommonStatusEnum.class, message = "状态必须是 {value}")
     private Integer status;
 
-    @ApiModelProperty(value = "备注", example = "我是备注")
+    @Schema(description = "备注", example = "我是备注")
     private String remark;
 
 }

+ 2 - 2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import io.swagger.annotations.*;
 
-@ApiModel("管理后台 - 站内信模版创建 Request VO")
+@Schema(description = "管理后台 - 站内信模版创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

+ 6 - 8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java

@@ -1,32 +1,30 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
-import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDateTime;
-import java.util.*;
-import io.swagger.annotations.*;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 站内信模版分页 Request VO")
+@Schema(description = "管理后台 - 站内信模版分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class NotifyTemplatePageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "模版编码", example = "test_01")
+    @Schema(description = "模版编码", example = "test_01")
     private String code;
 
-    @ApiModelProperty(value = "模版名称", example = "我是名称")
+    @Schema(description = "模版名称", example = "我是名称")
     private String name;
 
-    @ApiModelProperty(value = "状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
+    @Schema(description = "状态 - 参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
 
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 

+ 5 - 5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java

@@ -1,22 +1,22 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
-import io.swagger.annotations.*;
 
-@ApiModel("管理后台 - 站内信模版 Response VO")
+@Schema(description = "管理后台 - 站内信模版 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class NotifyTemplateRespVO extends NotifyTemplateBaseVO {
 
-    @ApiModelProperty(value = "ID", required = true, example = "1024")
+    @Schema(description = "ID", required = true, example = "1024")
     private Long id;
 
-    @ApiModelProperty(value = "参数数组", example = "name,code")
+    @Schema(description = "参数数组", example = "name,code")
     private List<String> params;
 
-    @ApiModelProperty(value = "创建时间", required = true)
+    @Schema(description = "创建时间", required = true)
     private Date createTime;
 
 }

+ 5 - 6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java

@@ -1,25 +1,24 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Map;
 
-@ApiModel("管理后台 - 站内信模板的发送 Request VO")
+@Schema(description = "管理后台 - 站内信模板的发送 Request VO")
 @Data
 public class NotifyTemplateSendReqVO {
 
-    @ApiModelProperty(value = "用户id", required = true, example = "01")
+    @Schema(description = "用户id", required = true, example = "01")
     @NotNull(message = "用户id不能为空")
     private Long userId;
 
-    @ApiModelProperty(value = "模板编码", required = true, example = "01")
+    @Schema(description = "模板编码", required = true, example = "01")
     @NotEmpty(message = "模板编码不能为空")
     private String templateCode;
 
-    @ApiModelProperty(value = "模板参数")
+    @Schema(description = "模板参数")
     private Map<String, Object> templateParams;
 }

+ 3 - 3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java

@@ -1,16 +1,16 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import io.swagger.annotations.*;
 import javax.validation.constraints.*;
 
-@ApiModel("管理后台 - 站内信模版更新 Request VO")
+@Schema(description = "管理后台 - 站内信模版更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class NotifyTemplateUpdateReqVO extends NotifyTemplateBaseVO {
 
-    @ApiModelProperty(value = "ID", required = true, example = "1024")
+    @Schema(description = "ID", required = true, example = "1024")
     @NotNull(message = "ID 不能为空")
     private Long id;