diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/async/NewsTask.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/async/NewsTask.java index e7ad9b0..8f0dd5f 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/async/NewsTask.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/async/NewsTask.java @@ -1,7 +1,7 @@ package com.elink.esua.epdc.async; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.feign.NewsFeignClient; +import com.elink.esua.epdc.modules.news.feign.NewsFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 12af83d..3c70f06 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -9,7 +9,7 @@ import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListByCategoryFromDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO; @@ -344,8 +344,9 @@ public class ApiPropertyController { * @author work@yujt.net.cn * @date 2020/5/22 15:50 */ + @Deprecated @GetMapping("safety/newsList/{categoryCode}") - public Result> listNewsByCategory(@PathVariable("categoryCode") String categoryCode, @LoginUser TokenDto userDetail, EpdcNewsListByCategoryFromDTO formDto) { + public Result> listNewsByCategory(@PathVariable("categoryCode") String categoryCode, @LoginUser TokenDto userDetail, EpdcNewsListFromDTO formDto) { formDto.setCategoryCode(categoryCode); return propertyService.listNewsByCategory(userDetail, formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java similarity index 85% rename from epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java rename to epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java index c84f925..fa62cba 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java @@ -1,4 +1,4 @@ -package com.elink.esua.epdc.controller; +package com.elink.esua.epdc.modules.news.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; @@ -6,7 +6,7 @@ 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.*; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.service.NewsService; +import com.elink.esua.epdc.modules.news.service.NewsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -66,14 +66,14 @@ public class ApiNewsController { return newsService.updateReadingAmount(formDto); } - /*** - * @Description 新闻列表 - * @Author qushutong - * @Date 2019/9/9 9:12 - * @Param [epdcNewsFromDTO] - * @Return com.elink.esua.epdc.commons.tools.utils.Result> - * @Exception + /** + * 居民端 - 获取文章/新闻列表，可根据类别编码查询 * + * @param userDetail + * @param epdcNewsFromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2020/6/24 09:46 */ @GetMapping("news/list") public Result> listNews(@LoginUser TokenDto userDetail, EpdcNewsListFromDTO epdcNewsFromDTO) { @@ -160,6 +160,7 @@ public class ApiNewsController { * @author qushutong * @date 2019/9/11 9:21 */ + @Deprecated @GetMapping("banner/list") public Result> listBanner(EpdcBannerListFromDTO fromDTO, @LoginUser TokenDto userDetail) { return newsService.listBanner(fromDTO, userDetail); @@ -177,4 +178,18 @@ public class ApiNewsController { public Result selectOneFristByUserId(@LoginUser TokenDto userDetail) { return newsService.selectOneFristByUserId(userDetail); } + + /** + * 居民端 - 根据版块编码，获取版块下属子类别 + * + * @param sectionCode 版块编码 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2020/6/23 17:39 + */ + @GetMapping("category/listBySection/{sectionCode}") + public Result> listCategoryBySection(@PathVariable("sectionCode") String sectionCode) { + return newsService.listCategoryBySection(sectionCode); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java similarity index 90% rename from epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java rename to epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java index cc09102..f36b302 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java @@ -1,12 +1,10 @@ -package com.elink.esua.epdc.feign; +package com.elink.esua.epdc.modules.news.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.*; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; -import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback; +import com.elink.esua.epdc.modules.news.feign.callback.NewsFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; @@ -69,17 +67,6 @@ public interface NewsFeignClient { @GetMapping(value = "news/epdc-app/news/listNews", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listNews(@RequestBody EpdcNewsListFromDTO formDto); - /** - * 小程序端 根据新闻类别获取新闻列表 - * - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author work@yujt.net.cn - * @date 2020/5/22 15:54 - */ - @GetMapping(value = "news/epdc-app/news/listNewsByCategory", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listNewsByCategory(@RequestBody EpdcNewsListByCategoryFromDTO formDto); - /** * 移动端获取新闻详情 * @@ -168,4 +155,15 @@ public interface NewsFeignClient { @PostMapping(value = "news/epdc-app/information/first/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result selectOneFristByUserId(@PathVariable String userId); + /** + * 居民端 - 根据版块编码，查询下属子类别 + * + * @param sectionCode + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2020/6/23 17:56 + */ + @GetMapping("news/epdc-app/newscategory/listCategoryBySection/{sectionCode}") + Result> listCategoryCodeBySection(@PathVariable("sectionCode") String sectionCode); + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java similarity index 92% rename from epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java rename to epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java index 1b70624..9df8b1a 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java @@ -1,11 +1,11 @@ -package com.elink.esua.epdc.feign.fallback; +package com.elink.esua.epdc.modules.news.feign.callback; 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.*; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.feign.NewsFeignClient; +import com.elink.esua.epdc.modules.news.feign.NewsFeignClient; import org.springframework.stereotype.Component; import java.util.List; @@ -38,11 +38,6 @@ public class NewsFeignClientFallback implements NewsFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNews", formDto); } - @Override - public Result> listNewsByCategory(EpdcNewsListByCategoryFromDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNewsByCategory", formDto); - } - @Override public Result getNewsDetail(EpdcNewsDetailFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", formDto); @@ -83,4 +78,8 @@ public class NewsFeignClientFallback implements NewsFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "selectOneFristByUserId", userId); } + @Override + public Result> listCategoryCodeBySection(String sectionCode) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listCategoryCodeBySection", sectionCode); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/NewsService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java similarity index 90% rename from epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/NewsService.java rename to epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java index 77cf79f..8093a3d 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java @@ -1,4 +1,4 @@ -package com.elink.esua.epdc.service; +package com.elink.esua.epdc.modules.news.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -132,4 +132,14 @@ public interface NewsService { * @date 2019/9/11 19:17 */ Result selectOneFristByUserId(TokenDto userDetail); + + /** + * 居民端 - 根据版块编码，获取版块下属子类别 + * + * @param sectionCode + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2020/6/23 18:03 + */ + Result> listCategoryBySection(String sectionCode); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java similarity index 75% rename from epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java rename to epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java index e12f0c3..ebd5a64 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java @@ -1,11 +1,13 @@ -package com.elink.esua.epdc.service.impl; +package com.elink.esua.epdc.modules.news.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.*; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.feign.NewsFeignClient; -import com.elink.esua.epdc.service.NewsService; +import com.elink.esua.epdc.enums.ArticleSectionEnum; +import com.elink.esua.epdc.modules.news.feign.NewsFeignClient; +import com.elink.esua.epdc.modules.news.service.NewsService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +45,9 @@ public class NewsServiceImpl implements NewsService { @Override public Result> listNews(TokenDto userDetail, EpdcNewsListFromDTO formDto) { formDto.setDeptId(userDetail.getGridId()); + if (StringUtils.isBlank(formDto.getCategoryCode())) { + formDto.setSectionCode(ArticleSectionEnum.HOME_PAGE_NEWS.getCode()); + } return newsFeignClient.listNews(formDto); } @@ -78,9 +83,12 @@ public class NewsServiceImpl implements NewsService { } @Override - public Result> listBanner(EpdcBannerListFromDTO fromDTO, TokenDto userDetail) { - fromDTO.setDeptId(userDetail.getGridId()); - return newsFeignClient.listBanner(fromDTO); + public Result> listBanner(EpdcBannerListFromDTO formDto, TokenDto userDetail) { + formDto.setDeptId(userDetail.getGridId()); + if (StringUtils.isBlank(formDto.getSectionCode())) { + formDto.setSectionCode(ArticleSectionEnum.HOME_PAGE_NEWS.getCode()); + } + return newsFeignClient.listBanner(formDto); } @Override @@ -88,4 +96,9 @@ public class NewsServiceImpl implements NewsService { String userId = userDetail.getUserId(); return newsFeignClient.selectOneFristByUserId(userId); } + + @Override + public Result> listCategoryBySection(String sectionCode) { + return newsFeignClient.listCategoryCodeBySection(sectionCode); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java index 81b0084..c2d9d1b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -8,7 +8,7 @@ import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListByCategoryFromDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO; @@ -34,7 +34,6 @@ import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -271,7 +270,7 @@ public interface PropertyService { * @author work@yujt.net.cn * @date 2020/5/22 15:51 */ - Result> listNewsByCategory(TokenDto userDetail, EpdcNewsListByCategoryFromDTO formDto); + Result> listNewsByCategory(TokenDto userDetail, EpdcNewsListFromDTO formDto); /** * 根据新闻类别获取banner列表 diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index 4336f18..c2f306a 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -2,7 +2,6 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.async.WxMaSecCheckTask; import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -13,7 +12,7 @@ import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.enums.TopicStateEnum; import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListByCategoryFromDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO; @@ -41,14 +40,14 @@ import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; +import com.elink.esua.epdc.enums.ArticleSectionEnum; import com.elink.esua.epdc.feign.AdminFeignClient; -import com.elink.esua.epdc.feign.NewsFeignClient; +import com.elink.esua.epdc.modules.news.feign.NewsFeignClient; import com.elink.esua.epdc.feign.PropertyFeignClient; import com.elink.esua.epdc.service.PropertyService; import com.elink.esua.epdc.utils.UserTagUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -326,14 +325,15 @@ public class PropertyServiceImpl implements PropertyService { } @Override - public Result> listNewsByCategory(TokenDto userDetail, EpdcNewsListByCategoryFromDTO formDto) { + public Result> listNewsByCategory(TokenDto userDetail, EpdcNewsListFromDTO formDto) { formDto.setDeptId(userDetail.getGridId()); - return newsFeignClient.listNewsByCategory(formDto); + return newsFeignClient.listNews(formDto); } @Override public Result> listBnnerByCategory(TokenDto userDetail, EpdcBannerListFromDTO formDto) { formDto.setDeptId(userDetail.getGridId()); + formDto.setSectionCode(ArticleSectionEnum.SAFETY_LIVING.getCode()); return newsFeignClient.listBanner(formDto); }