From eaea16de40cb6f2dceb7143fea4886ebdf687e83 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Wed, 11 Sep 2019 20:17:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiNewsController.java | 11 +++++-- .../esua/epdc/feign/NewsFeignClient.java | 30 ++++++++++++++----- .../fallback/NewsFeignClientFallback.java | 10 +++++-- .../elink/esua/epdc/service/NewsService.java | 12 +++++++- .../epdc/service/impl/NewsServiceImpl.java | 11 +++++-- .../com/elink/esua/epdc/dto/BannerDTO.java | 5 ++++ .../dto/epdc/form/EpdcBannerListFromDTO.java | 26 ++++++++++++++++ .../epdc/result/EpdcIFristInfoResultDTO.java | 28 +++++++++++++++++ .../EpdcAppInformationController.java | 6 ++++ .../controller/EpdcAppNewsController.java | 7 +++-- .../com/elink/esua/epdc/dao/BannerDao.java | 5 ++-- .../elink/esua/epdc/dao/InformationDao.java | 10 +++++++ .../elink/esua/epdc/entity/BannerEntity.java | 5 ++++ .../esua/epdc/service/BannerService.java | 5 ++-- .../esua/epdc/service/InformationService.java | 10 +++++++ .../epdc/service/impl/BannerServiceImpl.java | 5 ++-- .../service/impl/InformationServiceImpl.java | 6 ++++ .../src/main/resources/mapper/BannerDao.xml | 2 ++ .../main/resources/mapper/InformationDao.xml | 16 ++++++++++ 19 files changed, 185 insertions(+), 25 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java 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 f62e301a9..840a5e27c 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 @@ -149,7 +149,7 @@ public class ApiNewsController { * @date 2019/9/10 17:05 */ @GetMapping("information/listByUserId") - public Result> listInformationByUserId(@LoginUser TokenDto userDetail, @RequestBody EpdcInformationListFormDTO formDto) { + public Result> listInformationByUserId(@LoginUser TokenDto userDetail,EpdcInformationListFormDTO formDto) { return newsService.listInformationByUserId(userDetail, formDto); } /*** @@ -161,7 +161,12 @@ public class ApiNewsController { * @date 2019/9/11 9:21 */ @GetMapping("banner/list") - public Result> listBanner(@LoginUser TokenDto userDetail) { - return newsService.listBanner(userDetail); + public Result> listBanner(EpdcBannerListFromDTO fromDTO,@LoginUser TokenDto userDetail) { + return newsService.listBanner(fromDTO,userDetail); + } + + @PostMapping("information/first") + public Result selectOneFristByUserId(@LoginUser TokenDto userDetail){ + return newsService.selectOneFristByUserId(userDetail); } } 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 7d0ce0951..a617f5008 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 @@ -1,5 +1,6 @@ package com.elink.esua.epdc.feign; +import com.elink.esua.epdc.common.token.dto.TokenDto; 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.*; @@ -18,14 +19,14 @@ import java.util.List; * @email yujintao@elink-cn.com * @date 2019/9/5 19:20 */ -@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class, url = "http://localhost:9064") public interface NewsFeignClient { /** * 获取通知列表 * * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/5 20:07 */ @@ -60,7 +61,7 @@ public interface NewsFeignClient { * @Author qushutong * @Date 2019/9/9 9:17 * @Param [formDto] - * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Return com.elink.esua.epdc.commons.tools.utils.Result> * @Exception * */ @@ -129,7 +130,7 @@ public interface NewsFeignClient { * 移动端用户消息列表 * * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/10 17:09 */ @@ -138,11 +139,24 @@ public interface NewsFeignClient { /*** * 移动端banner列表 - * @param deptId - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/9/11 9:25 */ - @GetMapping(value = "news/epdc-app/news/list/{deptId}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listBanner(@PathVariable("deptId") Long deptId); + @GetMapping(value = "news/epdc-app/news/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listBanner(@RequestBody EpdcBannerListFromDTO fromDTO); + + + /*** + * 获取第一条通知消息 + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2019/9/11 19:20 + */ + @PostMapping(value = "news/epdc-app/information/first/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result selectOneFristByUserId(@PathVariable String userId); + + } 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 e3ef4ca42..bd17836ac 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 @@ -1,5 +1,6 @@ package com.elink.esua.epdc.feign.fallback; +import com.elink.esua.epdc.common.token.dto.TokenDto; 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; @@ -69,8 +70,13 @@ public class NewsFeignClientFallback implements NewsFeignClient { } @Override - public Result> listBanner(Long deptId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listBanner", deptId); + public Result> listBanner(EpdcBannerListFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listBanner", fromDTO); + } + + @Override + public Result selectOneFristByUserId(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "selectOneFristByUserId", userId); } } 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 a13f7cac0..a1e424ddf 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 @@ -121,5 +121,15 @@ public interface NewsService { * @author qushutong * @date 2019/9/11 9:22 */ - Result> listBanner(TokenDto userDetail); + Result> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail); + + + /*** + * 获取最新一条消息通知 + * @param userDetail + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2019/9/11 19:17 + */ + Result selectOneFristByUserId(TokenDto userDetail); } 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 6cc120a4e..0c776f6e0 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 @@ -76,7 +76,14 @@ public class NewsServiceImpl implements NewsService { } @Override - public Result> listBanner(TokenDto userDetail) { - return newsFeignClient.listBanner(userDetail.getGridId()); + public Result> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail) { + fromDTO.setDeptId(userDetail.getGridId()); + return newsFeignClient.listBanner(fromDTO); + } + + @Override + public Result selectOneFristByUserId(TokenDto userDetail) { + String userId=userDetail.getUserId(); + return newsFeignClient.selectOneFristByUserId(userId); } } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java index 24d25e609..36be10da1 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java @@ -143,4 +143,9 @@ public class BannerDTO implements Serializable { */ private String creatorName; + /*** + * banner位置 + */ + private String position; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java new file mode 100644 index 000000000..9576ecc6b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @author: qushutong + * @Date: 2019/9/11 17:10 + * @Description: banner列表 + */ +@Data +public class EpdcBannerListFromDTO implements Serializable { + private static final long serialVersionUID = -178835849989066589L; + + @NotBlank(message = "新闻位置不能为空") + private String position; + /** + * 网格ID + */ + @NotNull(message = "网格ID不能为空") + private Long deptId; + +} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java new file mode 100644 index 000000000..199460cf6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author: qushutong 首页第一条消息数据 + * @Date: 2019/9/11 18:59 + * @Description: + */ +@Data +public class EpdcIFristInfoResultDTO implements Serializable { + + private static final long serialVersionUID = -8249847977818930805L; + /** + * id : 55864 + * title : FSqWVB8jbB + * time : 1568199504633 + * amount : 90109 + */ + + private String id; + private String title; + private String time; + private int amount; + +} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java index 88fbb35df..141075f71 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.service.InformationService; import org.springframework.beans.factory.annotation.Autowired; @@ -85,4 +86,9 @@ public class EpdcAppInformationController { ValidatorUtils.validateEntity(formDto); return this.informationService.listByUserId(formDto); } + + @PostMapping("first/{userId}") + public Result selectOneFristByUserId(@PathVariable("userId") String userId){ + return informationService.selectOneFristByUserId(userId); + } } \ 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/EpdcAppNewsController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java index fcfebdd14..a97f9b0cb 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java @@ -21,6 +21,7 @@ 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.BannerDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO; @@ -121,8 +122,8 @@ public class EpdcAppNewsController { * @author qushutong * @date 2019/9/10 20:58 */ - @GetMapping("list/{deptId}") - public Result> listBanner(@PathVariable("deptId") Long deptId ){ - return new Result>().ok(bannerService.listBanner(deptId)); + @GetMapping("list") + public Result> listBanner(@RequestBody EpdcBannerListFromDTO fromDTO ){ + return new Result>().ok(bannerService.listBanner(fromDTO)); } } \ 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/BannerDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java index 22d0e732e..4a4057439 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.BannerDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO; import com.elink.esua.epdc.entity.BannerEntity; import org.apache.ibatis.annotations.Mapper; @@ -35,10 +36,10 @@ import java.util.List; public interface BannerDao extends BaseDao { /*** * banner 列表 - * @param deptId + * @param fromDTO * @return java.util.List * @author qushutong * @date 2019/9/11 9:00 */ - List selectListBanner(Long deptId); + List selectListBanner(EpdcBannerListFromDTO fromDTO); } \ 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/InformationDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/InformationDao.java index 7a707411a..012f75004 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/InformationDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/InformationDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.entity.InformationEntity; import org.apache.ibatis.annotations.Mapper; @@ -43,4 +44,13 @@ public interface InformationDao extends BaseDao { * @date 2019/9/10 16:47 */ List selectListInfromation(EpdcInformationListFormDTO formDto); + + /*** + * s首页第一条包括未读数 + * @param userId + * @return java.lang.Integer + * @author qushutong + * @date 2019/9/11 18:44 + */ + EpdcIFristInfoResultDTO selectOneFristByUserId(String userId); } \ 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/entity/BannerEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java index cbe0b7e72..aaaeb0dff 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java @@ -113,4 +113,9 @@ public class BannerEntity extends BaseEpdcEntity { */ private String creatorName; + /*** + * banner位置 + */ + private String position; + } \ 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/BannerService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java index 1f202a304..a707b5d8b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.BannerDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO; import com.elink.esua.epdc.entity.BannerEntity; @@ -95,10 +96,10 @@ public interface BannerService extends BaseService { /*** * banner列表 - * @param deptId + * @param fromDTO * @return java.util.List * @author qushutong * @date 2019/9/11 8:59 */ - List listBanner(Long deptId); + List listBanner(EpdcBannerListFromDTO fromDTO); } \ 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/InformationService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java index 859907c33..c74530c19 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.InformationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.entity.InformationEntity; @@ -127,4 +128,13 @@ public interface InformationService extends BaseService { * @date 2019/9/10 16:43 */ Result> listByUserId(EpdcInformationListFormDTO formDto); + + /*** + * S首页未读数和最新一条 + * @param userId + * @return com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO + * @author qushutong + * @date 2019/9/11 19:05 + */ + Result selectOneFristByUserId(String userId); } \ 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/BannerServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java index 80c3e65dd..ada1d8195 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.BannerDao; import com.elink.esua.epdc.dto.BannerDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO; import com.elink.esua.epdc.entity.BannerEntity; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -156,8 +157,8 @@ public class BannerServiceImpl extends BaseServiceImpl } @Override - public List listBanner(Long deptId) { - return baseDao.selectListBanner(deptId); + public List listBanner(EpdcBannerListFromDTO fromDTO) { + return baseDao.selectListBanner(fromDTO); } } \ 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/InformationServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java index 9081a4571..48861d184 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.InformationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.entity.InformationEntity; import com.elink.esua.epdc.service.InformationService; @@ -127,4 +128,9 @@ public class InformationServiceImpl extends BaseServiceImpl list = this.baseDao.selectListInfromation(formDto); return new Result().ok(list); } + + @Override + public Result selectOneFristByUserId(String userId) { + return new Result().ok(baseDao.selectOneFristByUserId(userId)); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml index d6bd9b674..88a3182c6 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml @@ -26,6 +26,7 @@ + diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml index 614b4722a..f361b0f2e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml @@ -25,4 +25,20 @@ im.READ_FLAG DESC, im.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} + + \ No newline at end of file