fix: 修改小程序广告和长江行游轮相关内容

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/admin/advert/vo/AdvertRespVO.java

@@ -42,13 +42,13 @@ public class AdvertRespVO {
     @ExcelProperty("上传图片地址")
     private String advertUrl;
 
-    @Schema(description = "链接类型 0.外部链接 1.产品 2.子产品", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty(value = "链接类型 0.外部链接 1.产品 2.子产品 Advert_Link_Type", converter = DictConvert.class)
+    @Schema(description = "链接类型 0.不跳转 1.航线 2.文章列表 3.单文章", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "链接类型 0.不跳转 1.航线 2.文章列表 3.单文章 Advert_Link_Type", converter = DictConvert.class)
     @DictFormat("advert_link_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
     private Integer linkType;
 
-    @Schema(description = "跳转地址", example = "https://www.iocoder.cn")
-    @ExcelProperty("跳转地址")
+    @Schema(description = "跳转对象，航线ID|文章栏目ID|文章ID", example = "https://www.iocoder.cn")
+    @ExcelProperty("跳转对象")
     private String linkUrl;
 
     @Schema(description = "是否投放 Ticket_Yes_No")

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/app/advert/AppAdvertController.java

@@ -53,6 +53,10 @@ public class AppAdvertController {
         Long adsenseId = adsenseDO.getId();
         List<AdvertDO> advertList = advertService.getCanUseAdvertList(adsenseId);
         List<AppAdvertRespVO> respVOS = BeanUtils.toBean(advertList, AppAdvertRespVO.class);
+        respVOS.stream().forEach(item -> {
+            item.setAdsenseName(adsenseDO.getAdsenseName());
+            item.setAdsenseType(adsenseDO.getAdsenseType());
+        });
         return success(respVOS);
     }
 

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/app/advert/vo/AppAdvertRespVO.java

@@ -1,15 +1,58 @@
 package com.yc.ship.module.miniapplet.controller.app.advert.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yc.ship.framework.excel.core.annotations.DictFormat;
+import com.yc.ship.framework.excel.core.convert.DictConvert;
 import com.yc.ship.module.miniapplet.controller.admin.advert.vo.AdvertRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-@EqualsAndHashCode(callSuper = true)
+import java.time.LocalDateTime;
+
 @Schema(description = "小程序接口 - 广告 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class AppAdvertRespVO extends AdvertRespVO {
+public class AppAdvertRespVO {
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16726")
+    private Long id;
+
+    @Schema(description = "广告位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25367")
+    private Long adsenseId;
+
+    @Schema(description = "广告位", requiredMode = Schema.RequiredMode.REQUIRED, example = "25367")
+    @ExcelProperty("广告位名称")
+    private String adsenseName;
+
+    @Schema(description = "媒体类型：0单图片、1单视频", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private Integer adsenseType;
+
+    @Schema(description = "排序号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("排序号")
+    private Integer sort;
+
+    @Schema(description = "标题")
+    @ExcelProperty("标题")
+    private String title;
+
+    @Schema(description = "副标题")
+    @ExcelProperty("副标题")
+    private String subTitle;
+
+    @Schema(description = "上传图片地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
+    @ExcelProperty("上传图片地址")
+    private String advertUrl;
+
+    @Schema(description = "链接类型 0.不跳转 1.航线 2.文章列表 3.单文章", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "链接类型 0.不跳转 1.航线 2.文章列表 3.单文章 Advert_Link_Type", converter = DictConvert.class)
+    @DictFormat("advert_link_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer linkType;
+
+    @Schema(description = "跳转对象，航线ID|文章栏目ID|文章ID", example = "https://www.iocoder.cn")
+    @ExcelProperty("跳转对象")
+    private String linkUrl;
+
+
 
 }

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/app/content/AppContentController.java

@@ -36,11 +36,18 @@ public class AppContentController {
 
     @PostMapping("/page")
     @Operation(summary = "获取内容分页列表")
-    public CommonResult<PageResult<AppContentRespVO>> content(@RequestBody @Valid AppContentPageReqVO reqVO) {
+    public CommonResult<PageResult<AppContentRespVO>> page(@RequestBody @Valid AppContentPageReqVO reqVO) {
         PageResult<ContentDO> page = contentService.getAppContentPage(reqVO);
         return success(BeanUtils.toBean(page, AppContentRespVO.class));
     }
 
+    @PostMapping("/pageByCatalogueId")
+    @Operation(summary = "获取内容分页列表")
+    public CommonResult<PageResult<AppContentRespVO>> pageByCatalogueId(@RequestBody @Valid AppContentPageReqVO reqVO) {
+        PageResult<ContentDO> page = contentService.getAppContentPageByCatalogueId(reqVO);
+        return success(BeanUtils.toBean(page, AppContentRespVO.class));
+    }
+
     // 内容详情
     @GetMapping("/detail")
     @Operation(summary = "获取内容详情")

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/app/content/vo/AppContentPageReqVO.java

@@ -16,10 +16,12 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class AppContentPageReqVO extends PageParam {
 
-    @Schema(description = "内容关键词", example = "1024")
+    @Schema(description = "内容关键词", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1024")
     private String keyword;
 
-    @Schema(description = "目录编码")
-    @NotNull(message = "目录编码不能为空")
+    @Schema(description = "目录编码", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String code;
+
+    @Schema(description = "目录ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private Long catalogueId;
 }

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/service/content/ContentService.java

@@ -70,4 +70,6 @@ public interface ContentService {
      * @return
      */
     PageResult<ContentDO> getAppContentPage(AppContentPageReqVO reqVO);
+
+    PageResult<ContentDO> getAppContentPageByCatalogueId(AppContentPageReqVO reqVO);
 }

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/service/content/ContentServiceImpl.java

@@ -101,4 +101,9 @@ public class ContentServiceImpl implements ContentService {
         return contentMapper.selectAppContentPage(reqVO, catalogue.getId());
     }
 
+    @Override
+    public PageResult<ContentDO> getAppContentPageByCatalogueId(AppContentPageReqVO reqVO) {
+        return contentMapper.selectAppContentPage(reqVO, reqVO.getCatalogueId());
+    }
+
 }