From 0b7f2f4c6903be2a8220b87c95f26c5c6e9118ce Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 6 Sep 2019 15:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=9A=E7=9F=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/commons/tools/constant/Constant.java | 4 ++ .../epdc/controller/ApiNewsController.java | 18 ++++- .../esua/epdc/feign/NewsFeignClient.java | 16 ++++- .../fallback/NewsFeignClientFallback.java | 10 ++- .../elink/esua/epdc/service/NewsService.java | 13 +++- .../epdc/service/impl/NewsServiceImpl.java | 10 ++- .../epdc/dto/epdc/form/EpdcNoticeFormDTO.java | 5 +- .../result/EpdcNoticeDetailResultDTO.java | 46 ++++++++++++ .../dto/epdc/result/EpdcNoticeResultDTO.java | 5 +- .../controller/EpdcAppNoticeController.java | 72 +++++++++++++++++++ .../epdc/controller/NoticeController.java | 15 ---- .../com/elink/esua/epdc/dao/NoticeDao.java | 12 ++++ .../esua/epdc/service/NoticeService.java | 13 +++- .../epdc/service/impl/NoticeServiceImpl.java | 9 ++- .../src/main/resources/mapper/NoticeDao.xml | 14 ++++ 15 files changed, 234 insertions(+), 28 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java index ca47aae1a..98b0a7465 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java @@ -105,4 +105,8 @@ public interface Constant { * 版本控制用 */ String VERSION_CONTROL = "/{version}"; + /** + * 移动端接口标识 + */ + String EPDC_APP = "epdc-app/"; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index 8dbec33d2..270ad6d5b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.service.NewsService; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +36,20 @@ public class ApiNewsController { * @date 2019/9/5 20:17 */ @GetMapping("notice/list") - public Result> noticeList(@LoginUser TokenDto userDetail, EpdcNoticeFormDTO formDto) { - return newsService.noticeList(userDetail, formDto); + public Result> listNotice(@LoginUser TokenDto userDetail, EpdcNoticeFormDTO formDto) { + return newsService.listNotice(userDetail, formDto); + } + + /** + * 查询通知详情 + * + * @param noticeId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/6 14:58 + */ + @GetMapping("notice/detail/{noticeId}") + public Result getNoticeDetail(@PathVariable("noticeId") String noticeId) { + return newsService.getNoticeDetail(noticeId); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java index dcb9416be..c4d5037e4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; @@ -29,6 +30,17 @@ public interface NewsFeignClient { * @author yujintao * @date 2019/9/5 20:07 */ - @GetMapping(value = "news/notice/listNoticeForApp", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listNoticeForApp(EpdcNoticeFormDTO formDto); + @GetMapping(value = "news/epdc-app/notice/listNotice", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listNotice(EpdcNoticeFormDTO formDto); + + /** + * 获取通知详情 + * + * @param noticeId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/6 14:55 + */ + @GetMapping("getDetail/{noticeId}") + Result getNoticeDetail(@PathVariable String noticeId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java index 9d78b66bc..52802d85c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.feign.NewsFeignClient; import org.springframework.stereotype.Component; @@ -19,7 +20,12 @@ import java.util.List; public class NewsFeignClientFallback implements NewsFeignClient { @Override - public Result> listNoticeForApp(EpdcNoticeFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNoticeForApp", formDto); + public Result> listNotice(EpdcNoticeFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNotice", formDto); + } + + @Override + public Result getNoticeDetail(String noticeId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNoticeDetail", noticeId); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index 97429dfea..bdec41813 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import java.util.List; @@ -25,5 +26,15 @@ public interface NewsService { * @author yujintao * @date 2019/9/5 20:17 */ - Result> noticeList(TokenDto userDetail, EpdcNoticeFormDTO formDto); + Result> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto); + + /** + * 查询通知详情 + * + * @param noticeId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/6 14:58 + */ + Result getNoticeDetail(String noticeId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 9ac67a6d2..0547da98f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.feign.NewsFeignClient; import com.elink.esua.epdc.service.NewsService; @@ -25,8 +26,13 @@ public class NewsServiceImpl implements NewsService { private NewsFeignClient newsFeignClient; @Override - public Result> noticeList(TokenDto userDetail, EpdcNoticeFormDTO formDto) { + public Result> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto) { formDto.setDeptId(userDetail.getGridId()); - return newsFeignClient.listNoticeForApp(formDto); + return newsFeignClient.listNotice(formDto); + } + + @Override + public Result getNoticeDetail(String noticeId) { + return newsFeignClient.getNoticeDetail(noticeId); } } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java index 7b75828d1..5e6ec1a71 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 移动端通知列表，查询条件 @@ -13,7 +14,9 @@ import javax.validation.constraints.NotNull; * @date 2019/9/5 19:40 */ @Data -public class EpdcNoticeFormDTO { +public class EpdcNoticeFormDTO implements Serializable { + + private static final long serialVersionUID = 4209188661412055700L; /** * 用户所属网格ID diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java new file mode 100644 index 000000000..8cd21d7de --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java @@ -0,0 +1,46 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 通知详情 + * + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/6 14:34 + */ +@Data +public class EpdcNoticeDetailResultDTO implements Serializable { + + private static final long serialVersionUID = -3010031928679964025L; + + /** + * id + */ + private String id; + /** + * 通知标题 + */ + private String noticeTitle; + /** + * 通知发布时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date noticeTime; + /** + * 通知所属部门 + */ + private String deptName; + /** + * 内容 + */ + private String noticeContent; + /** + * 阅读量 + */ + private Integer readingAmount; +} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java index 7d839b788..f18f6fe94 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.result; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.io.Serializable; import java.util.Date; /** @@ -13,7 +14,9 @@ import java.util.Date; * @date 2019/9/5 19:30 */ @Data -public class EpdcNoticeResultDTO { +public class EpdcNoticeResultDTO implements Serializable { + + private static final long serialVersionUID = 5512811033767022087L; /** * 通知ID diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java new file mode 100644 index 000000000..249f60e98 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java @@ -0,0 +1,72 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; +import com.elink.esua.epdc.service.NoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 通知表 + * + * @author yujintao yujintao@elink-cn.com + * @since v1.0.0 2019-09-04 + */ +@RestController +@RequestMapping(Constant.EPDC_APP + "notice") +public class EpdcAppNoticeController { + + @Autowired + private NoticeService noticeService; + + /** + * 移动端通知列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author yujintao + * @date 2019/9/5 19:43 + */ + @GetMapping("listNotice") + public Result> listNotice(@RequestBody EpdcNoticeFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return this.noticeService.listNotice(formDto); + } + + /** + * 获取通知详情 + * + * @param noticeId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author yujintao + * @date 2019/9/6 14:33 + */ + @GetMapping("getDetail/{noticeId}") + public Result getDetail(@PathVariable String noticeId) { + return this.noticeService.getNoticeDetailById(noticeId); + } +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java index 5beeb7065..c9d71275d 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java @@ -26,8 +26,6 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.NoticeDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.excel.NoticeExcel; import com.elink.esua.epdc.service.NoticeService; import org.springframework.beans.factory.annotation.Autowired; @@ -107,17 +105,4 @@ public class NoticeController { return new Result(); } - /** - * 移动端通知列表 - * - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author yujintao - * @date 2019/9/5 19:43 - */ - @GetMapping("listNoticeForApp") - public Result> listNoticeForApp(@RequestBody EpdcNoticeFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return this.noticeService.listNoticeForApp(formDto); - } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java index d8ce01118..236332ad7 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java @@ -19,9 +19,11 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.entity.NoticeEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -43,4 +45,14 @@ public interface NoticeDao extends BaseDao { * @date 2019/9/5 19:51 */ List selectListAppNotice(EpdcNoticeFormDTO formDto); + + /** + * 查询通知详情 + * + * @param noticeId + * @return com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO + * @author yujintao + * @date 2019/9/6 14:46 + */ + EpdcNoticeDetailResultDTO selectOneAppNotice(@Param("noticeId") String noticeId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java index fce0dfbb5..39783c3df 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.NoticeDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.entity.NoticeEntity; @@ -114,5 +115,15 @@ public interface NoticeService extends BaseService { * @author yujintao * @date 2019/9/5 19:37 */ - Result> listNoticeForApp(EpdcNoticeFormDTO formDto); + Result> listNotice(EpdcNoticeFormDTO formDto); + + /** + * 查询通知详情 + * + * @param noticeId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/6 14:45 + */ + Result getNoticeDetailById(String noticeId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index b70da044f..26c8f2f49 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.NoticeDao; import com.elink.esua.epdc.dto.NoticeDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.entity.NoticeEntity; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -187,11 +188,17 @@ public class NoticeServiceImpl extends BaseServiceImpl } @Override - public Result> listNoticeForApp(EpdcNoticeFormDTO formDto) { + public Result> listNotice(EpdcNoticeFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); List noticeList = this.baseDao.selectListAppNotice(formDto); return new Result().ok(noticeList); } + + @Override + public Result getNoticeDetailById(String noticeId) { + EpdcNoticeDetailResultDTO dto = this.baseDao.selectOneAppNotice(noticeId); + return new Result().ok(dto); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index 6fa7137f3..1d9b1be49 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -21,4 +21,18 @@ en.RELEASE_TIME DESC LIMIT #{pageIndex},#{pageSize} + + \ No newline at end of file