diff --git a/snowy-admin-web/src/api/biz/bizIndexApi.js b/snowy-admin-web/src/api/biz/bizIndexApi.js index f1ded643..67686b97 100644 --- a/snowy-admin-web/src/api/biz/bizIndexApi.js +++ b/snowy-admin-web/src/api/biz/bizIndexApi.js @@ -13,6 +13,10 @@ export default { bizIndexSlideshowList(data) { return request('slideshow/list', data, 'get') }, + // 获取通知公告分页 + bizIndexNoticePage(data) { + return request('notice/page', data, 'get') + }, // 获取通知公告列表 bizIndexNoticeList(data) { return request('notice/list', data, 'get') diff --git a/snowy-admin-web/src/assets/images/notice.png b/snowy-admin-web/src/assets/images/notice.png new file mode 100644 index 00000000..167342b4 Binary files /dev/null and b/snowy-admin-web/src/assets/images/notice.png differ diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/controller/BizIndexController.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/controller/BizIndexController.java index 4addc534..3afc9930 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/controller/BizIndexController.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/controller/BizIndexController.java @@ -12,6 +12,8 @@ */ package vip.xiaonuo.biz.modular.index.controller; +import cn.hutool.db.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.swagger.v3.oas.annotations.Operation; @@ -28,6 +30,7 @@ import vip.xiaonuo.biz.modular.index.result.BizIndexNoticeListResult; import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowDetailResult; import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowListResult; import vip.xiaonuo.biz.modular.index.service.BizIndexService; +import vip.xiaonuo.biz.modular.notice.entity.BizNotice; import vip.xiaonuo.common.pojo.CommonResult; import java.util.List; @@ -61,12 +64,25 @@ public class BizIndexController { } /** - * 获取通知公告列表 + * 获取通知公告分页 * * @author yubaoshan * @date 2024/7/13 21:02 */ @ApiOperationSupport(order = 2) + @Operation(summary = "获取通知公告分页") + @GetMapping("/biz/index/notice/page") + public CommonResult> noticePage(BizIndexNoticeListParam bizIndexNoticeListParam) { + return CommonResult.data(bizIndexService.noticePage(bizIndexNoticeListParam)); + } + + /** + * 获取通知公告列表 + * + * @author yubaoshan + * @date 2024/7/13 21:02 + */ + @ApiOperationSupport(order = 3) @Operation(summary = "获取通知公告列表") @GetMapping("/biz/index/notice/list") public CommonResult> noticeListByLimit(BizIndexNoticeListParam bizIndexNoticeListParam) { @@ -79,7 +95,7 @@ public class BizIndexController { * @author yubaoshan * @date 2024/7/13 21:02 */ - @ApiOperationSupport(order = 3) + @ApiOperationSupport(order = 4) @Operation(summary = "获取通知公告详情") @GetMapping("/biz/index/notice/detail") public CommonResult noticeDetailById(@Valid BizIndexNoticeIdParam bizIndexNoticeIdParam) { diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/param/BizIndexNoticeListParam.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/param/BizIndexNoticeListParam.java index 9a460b26..a306eeb8 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/param/BizIndexNoticeListParam.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/param/BizIndexNoticeListParam.java @@ -29,4 +29,8 @@ public class BizIndexNoticeListParam { /** 条数" */ @Schema(description = "条数") private Integer limit; + + /** 类型" */ + @Schema(description = "类型") + private String type; } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/BizIndexService.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/BizIndexService.java index 4645ef52..cb7f14fb 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/BizIndexService.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/BizIndexService.java @@ -12,6 +12,8 @@ */ package vip.xiaonuo.biz.modular.index.service; +import cn.hutool.db.PageResult; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.validation.Valid; import vip.xiaonuo.biz.modular.index.param.BizIndexNoticeIdParam; import vip.xiaonuo.biz.modular.index.param.BizIndexNoticeListParam; @@ -19,6 +21,7 @@ import vip.xiaonuo.biz.modular.index.param.BizIndexSlideshowListParam; import vip.xiaonuo.biz.modular.index.result.BizIndexNoticeListResult; import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowDetailResult; import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowListResult; +import vip.xiaonuo.biz.modular.notice.entity.BizNotice; import java.util.List; @@ -38,6 +41,14 @@ public interface BizIndexService { */ List slideshowListByPlace(BizIndexSlideshowListParam bizIndexSlideshowListParam); + /** + * 获取通知公告分页 + * + * @author yubaoshan + * @date 2024/07/13 00:31 + */ + Page noticePage(BizIndexNoticeListParam bizIndexNoticeListParam); + /** * 获取通知公告列表 * diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/impl/BizIndexServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/impl/BizIndexServiceImpl.java index c7cc371d..779914fc 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/impl/BizIndexServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/impl/BizIndexServiceImpl.java @@ -16,6 +16,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import vip.xiaonuo.biz.modular.index.param.BizIndexNoticeIdParam; @@ -27,6 +28,7 @@ import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowListResult; import vip.xiaonuo.biz.modular.index.service.BizIndexService; import vip.xiaonuo.biz.modular.notice.entity.BizNotice; import vip.xiaonuo.biz.modular.notice.enums.BizNoticeStatusEnum; +import vip.xiaonuo.biz.modular.notice.param.BizNoticePageParam; import vip.xiaonuo.biz.modular.notice.service.BizNoticeService; import vip.xiaonuo.dev.api.DevSlideshowApi; @@ -55,6 +57,13 @@ public class BizIndexServiceImpl implements BizIndexService { .map(jsonObject -> JSONUtil.toBean(jsonObject, BizIndexSlideshowListResult.class)).collect(Collectors.toList()); } + @Override + public Page noticePage(BizIndexNoticeListParam bizIndexNoticeListParam) { + BizNoticePageParam bizNoticePageParam = new BizNoticePageParam(); + bizNoticePageParam.setType(bizIndexNoticeListParam.getType()); + return bizNoticeService.page(bizNoticePageParam); + } + @Override public List noticeListByLimit(BizIndexNoticeListParam bizIndexNoticeListParam) { return bizNoticeService.list(new LambdaQueryWrapper()