diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java index d400da5..918ee35 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java @@ -10,18 +10,17 @@ package com.yami.shop.api.controller; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.fasterxml.jackson.annotation.JsonView; import com.yami.shop.bean.app.dto.NoticeDto; import com.yami.shop.bean.model.Notice; +import com.yami.shop.common.response.ServerResponseEntity; import com.yami.shop.common.util.PageParam; import com.yami.shop.service.NoticeService; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; -import cn.hutool.core.bean.BeanUtil; -import com.yami.shop.common.response.ServerResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -47,7 +46,6 @@ public class NoticeController { */ @GetMapping("/topNoticeList") @Operation(summary = "置顶公告列表信息" , description = "获取所有置顶公告列表信息") - @JsonView(NoticeDto.NoContent.class) public ServerResponseEntity> getTopNoticeList() { List noticeList = noticeService.listNotice(); List noticeDtoList = BeanUtil.copyToList(noticeList, NoticeDto.class); @@ -59,7 +57,6 @@ public class NoticeController { */ @GetMapping("/info/{id}") @Operation(summary = "公告详情" , description = "获取公告id公告详情") - @JsonView(NoticeDto.WithContent.class) public ServerResponseEntity getNoticeById(@PathVariable("id") Long id) { Notice notice = noticeService.getNoticeById(id); NoticeDto noticeDto = BeanUtil.copyProperties(notice, NoticeDto.class); diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java index bd7fdc3..12ab103 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java @@ -10,7 +10,6 @@ package com.yami.shop.bean.app.dto; -import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -23,28 +22,19 @@ import java.util.Date; @Data public class NoticeDto { - @JsonView(NoContent.class) @Schema(description = "公告id" ) private Long id; - @JsonView(NoContent.class) @Schema(description = "店铺id" ) private Long shopId; - @JsonView(NoContent.class) @Schema(description = "标题" ) private String title; @Schema(description = "公告内容" ) - @JsonView(WithContent.class) private String content; - @JsonView(NoContent.class) @Schema(description = "公告发布时间" ) private Date publishTime; - public static interface NoContent{} - - public static interface WithContent extends NoContent{} - }