From 46c506af7a55a616ee8f14e7346ca21391b54f26 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Aug 2020 15:32:48 +0800
Subject: [PATCH] 20200819  代码提交

---
 src/main/java/com/xcong/excoin/modules/helpCenter/controller/HelpCenterController.java    |   20 ++++++++++
 src/main/java/com/xcong/excoin/modules/helpCenter/service/HelpCenterService.java          |    4 ++
 src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java |   44 ++++++++++++++++++++++
 3 files changed, 68 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 a758ddc..20078ed 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
@@ -58,6 +58,26 @@
 	}
 	
 	/**
+	 *  关于我们
+	 */
+	@ApiOperation(value="关于我们", notes="关于我们")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = NoticeInfoVo.class)})
+	@GetMapping(value = "/getAboutUs")
+	public Result  getAboutUs() {
+		return helpCenterService.getAboutUs();
+	}
+	
+	/**
+	 *  用户协议
+	 */
+	@ApiOperation(value="用户协议", notes="用户协议")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = NoticeInfoVo.class)})
+	@GetMapping(value = "/getUserAgreement")
+	public Result  getUserAgreement() {
+		return helpCenterService.getUserAgreement();
+	}
+	
+	/**
 	 *  最新公告
 	 */
 	@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 b4e5a47..68bb5c6 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
@@ -23,5 +23,9 @@
 
 	Result getNoticeList(@Valid NoticePageDto noticePageDto);
 
+	Result getAboutUs();
+
+	Result getUserAgreement();
+
 
 }
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 dcf0c23..9f25ea0 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
@@ -216,6 +216,50 @@
 		return Result.ok(arrayList);
 	}
 
+	@Override
+	public Result getAboutUs() {
+		NoticeInfoVo noticeInfoVo = new NoticeInfoVo();
+		HelpCenterArticleEntity selectById = helpCenterArticleDao.selectById(27);
+		if(ObjectUtil.isNotEmpty(selectById)) {
+			String createBy = selectById.getCreateBy();
+			noticeInfoVo.setCreateBy(createBy);
+			
+			String content = selectById.getContent();
+			noticeInfoVo.setContent(content);
+			Date createTime = selectById.getCreateTime();
+			noticeInfoVo.setCreateTime(createTime);
+			String title = selectById.getTitle();
+			noticeInfoVo.setTitle(title);
+			int typeLanguage = selectById.getTypeLanguage();
+			noticeInfoVo.setTypeLanguage(typeLanguage);
+			Long id = selectById.getId();
+			noticeInfoVo.setId(id);
+		}
+		return Result.ok(noticeInfoVo);
+	}
+
+	@Override
+	public Result getUserAgreement() {
+		NoticeInfoVo noticeInfoVo = new NoticeInfoVo();
+		HelpCenterArticleEntity selectById = helpCenterArticleDao.selectById(29);
+		if(ObjectUtil.isNotEmpty(selectById)) {
+			String createBy = selectById.getCreateBy();
+			noticeInfoVo.setCreateBy(createBy);
+			
+			String content = selectById.getContent();
+			noticeInfoVo.setContent(content);
+			Date createTime = selectById.getCreateTime();
+			noticeInfoVo.setCreateTime(createTime);
+			String title = selectById.getTitle();
+			noticeInfoVo.setTitle(title);
+			int typeLanguage = selectById.getTypeLanguage();
+			noticeInfoVo.setTypeLanguage(typeLanguage);
+			Long id = selectById.getId();
+			noticeInfoVo.setId(id);
+		}
+		return Result.ok(noticeInfoVo);
+	}
+
 
 	
 	

--
Gitblit v1.9.1