From 11d8692e517431030ba0ce36b437601cf83cdec3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 15:54:00 +0800
Subject: [PATCH] Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole
---
src/main/java/com/xcong/excoin/modules/helpCenter/controller/HelpCenterController.java | 10 ++++++++++
src/main/java/com/xcong/excoin/modules/helpCenter/service/HelpCenterService.java | 2 ++
src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/helpCenter/controller/HelpCenterController.java b/src/main/java/com/xcong/excoin/modules/helpCenter/controller/HelpCenterController.java
index 20078ed..25141ab 100644
--- a/src/main/java/com/xcong/excoin/modules/helpCenter/controller/HelpCenterController.java
+++ b/src/main/java/com/xcong/excoin/modules/helpCenter/controller/HelpCenterController.java
@@ -78,6 +78,16 @@
}
/**
+ * 首页轮播公告
+ */
+ @ApiOperation(value="首页轮播公告", notes="首页轮播公告")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = NewNoticeInfoVo.class)})
+ @PostMapping(value = "/getFristNewNoticeList")
+ public Result getFristNewNoticeList(@RequestBody @Valid NewNoticePageDto newNoticePageDto) {
+ return helpCenterService.getFristNewNoticeList(newNoticePageDto);
+ }
+
+ /**
* 最新公告
*/
@ApiOperation(value="最新公告", notes="最新公告")
diff --git a/src/main/java/com/xcong/excoin/modules/helpCenter/service/HelpCenterService.java b/src/main/java/com/xcong/excoin/modules/helpCenter/service/HelpCenterService.java
index 68bb5c6..0a615bd 100644
--- a/src/main/java/com/xcong/excoin/modules/helpCenter/service/HelpCenterService.java
+++ b/src/main/java/com/xcong/excoin/modules/helpCenter/service/HelpCenterService.java
@@ -27,5 +27,7 @@
Result getUserAgreement();
+ Result getFristNewNoticeList(@Valid NewNoticePageDto newNoticePageDto);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java b/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java
index 9f25ea0..fa64979 100644
--- a/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java
@@ -260,6 +260,44 @@
return Result.ok(noticeInfoVo);
}
+ @Override
+ public Result getFristNewNoticeList(@Valid NewNoticePageDto newNoticePageDto) {
+ List<NewNoticeInfoVo> arrayList = new ArrayList<>();
+ Page<HelpCenterNoticeEntity> page = new Page<>(1, 5);
+ //获取【帮助中心公告】
+ HelpCenterNoticeEntity helpCenterNoticeEntity = new HelpCenterNoticeEntity();
+ IPage<HelpCenterNoticeEntity> HelpCenterNoticeEntitys = helpCenterNoticeDao.getNewNoticeList(page, helpCenterNoticeEntity);
+ List<HelpCenterNoticeEntity> records = HelpCenterNoticeEntitys.getRecords();
+ if(CollUtil.isNotEmpty(records)) {
+ for(HelpCenterNoticeEntity helpCenterNotice : records) {
+ NewNoticeInfoVo newNoticeInfoVo = new NewNoticeInfoVo();
+ Long id = helpCenterNotice.getId();
+ newNoticeInfoVo.setId(id);
+ String createBy = helpCenterNotice.getCreateBy();
+ newNoticeInfoVo.setCreateBy(createBy);
+ Date createTime = helpCenterNotice.getCreateTime();
+ newNoticeInfoVo.setCreateTime(createTime);
+ int articleNotice = helpCenterNotice.getArticleNotice();
+ newNoticeInfoVo.setArticleNotice(articleNotice);
+
+ int type = newNoticePageDto.getType();
+ if(type == 2) {
+ Long articleIdUs = helpCenterNotice.getArticleIdUs();
+ newNoticeInfoVo.setArticleId(articleIdUs);
+ String articleTitleUs = helpCenterNotice.getArticleTitleUs();
+ newNoticeInfoVo.setArticleTitle(articleTitleUs);
+ }else {
+ Long articleId = helpCenterNotice.getArticleId();
+ newNoticeInfoVo.setArticleId(articleId);
+ String articleTitle = helpCenterNotice.getArticleTitle();
+ newNoticeInfoVo.setArticleTitle(articleTitle);
+ }
+ arrayList.add(newNoticeInfoVo);
+ }
+ }
+ return Result.ok(arrayList);
+ }
+
--
Gitblit v1.9.1