From b4ecf2f8f09e151ba25b84f6c7f935fc530a6885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 9 May 2025 17:08:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdvertisementController.java | 4 ++-- .../common/pojo/vo/AdvertisementListVO.java | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AdvertisementController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AdvertisementController.java index 08c1750a..423cbedf 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AdvertisementController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/AdvertisementController.java @@ -4,7 +4,7 @@ import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.request.AdvertisementRequst; import com.nflg.mobilebroken.common.pojo.vo.AdvertisementVO; import com.nflg.mobilebroken.repository.service.IAdvertisementService; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -29,7 +29,7 @@ public class AdvertisementController { * @param request 请求参数 * @return 广告列表 */ - @GetMapping("getByType") + @PostMapping("getByType") public ApiResult getAdvertisement(@Valid @RequestBody @NotNull AdvertisementRequst request){ return ApiResult.success(advertisementService.getByType(request.getType(),request.getPosition())); } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdvertisementListVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdvertisementListVO.java index a50b0f86..0c07186f 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdvertisementListVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdvertisementListVO.java @@ -1,8 +1,12 @@ package com.nflg.mobilebroken.common.pojo.vo; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; @Data public class AdvertisementListVO { @@ -37,6 +41,24 @@ public class AdvertisementListVO { */ private Integer interval; + /** + * 广告内容 + */ + @JsonIgnore + private String content; + + /** + * 广告内容列表 + */ + private List items; + + public List getItems(){ + if (StrUtil.isBlank(content)){ + return null; + } + return JSONUtil.toList(content, AdvertisementItemVO.class); + } + /** * 创建人 */