新闻banner接口修改

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;

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<List<EpdcNewsListResultDTO>> listNewsByCategory(@PathVariable("categoryCode") String categoryCode, @LoginUser TokenDto userDetail, EpdcNewsListByCategoryFromDTO formDto) {
+    public Result<List<EpdcNewsListResultDTO>> listNewsByCategory(@PathVariable("categoryCode") String categoryCode, @LoginUser TokenDto userDetail, EpdcNewsListFromDTO formDto) {
         formDto.setCategoryCode(categoryCode);
         return propertyService.listNewsByCategory(userDetail, formDto);
     }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java → 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<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
-     * @Exception
+    /**
+     * 居民端 - 获取文章/新闻列表，可根据类别编码查询
      *
+     * @param userDetail
+     * @param epdcNewsFromDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/6/24 09:46
      */
     @GetMapping("news/list")
     public Result<List<EpdcNewsListResultDTO>> 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<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO, @LoginUser TokenDto userDetail) {
         return newsService.listBanner(fromDTO, userDetail);
@@ -177,4 +178,18 @@ public class ApiNewsController {
     public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(@LoginUser TokenDto userDetail) {
         return newsService.selectOneFristByUserId(userDetail);
     }
+
+    /**
+     * 居民端 - 根据版块编码，获取版块下属子类别
+     *
+     * @param sectionCode 版块编码
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/6/23 17:39
+     */
+    @GetMapping("category/listBySection/{sectionCode}")
+    public Result<List<NewsCategoryResultDTO>> listCategoryBySection(@PathVariable("sectionCode") String sectionCode) {
+        return newsService.listCategoryBySection(sectionCode);
+    }
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java → 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<List<EpdcNewsListResultDTO>> listNews(@RequestBody EpdcNewsListFromDTO formDto);
 
-    /**
-     * 小程序端 根据新闻类别获取新闻列表
-     *
-     * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
-     * @author work@yujt.net.cn
-     * @date 2020/5/22 15:54
-     */
-    @GetMapping(value = "news/epdc-app/news/listNewsByCategory", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EpdcNewsListResultDTO>> 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<EpdcInformationFristResultDTO> selectOneFristByUserId(@PathVariable String userId);
 
+    /**
+     * 居民端 - 根据版块编码，查询下属子类别
+     *
+     * @param sectionCode
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.NewsCategoryResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/6/23 17:56
+     */
+    @GetMapping("news/epdc-app/newscategory/listCategoryBySection/{sectionCode}")
+    Result<List<NewsCategoryResultDTO>> listCategoryCodeBySection(@PathVariable("sectionCode") String sectionCode);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java → 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<List<EpdcNewsListResultDTO>> listNewsByCategory(EpdcNewsListByCategoryFromDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNewsByCategory", formDto);
-    }
-
     @Override
     public Result<EpdcNewsDetailResultDTO> 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<List<NewsCategoryResultDTO>> listCategoryCodeBySection(String sectionCode) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listCategoryCodeBySection", sectionCode);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/NewsService.java → 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<EpdcInformationFristResultDTO> selectOneFristByUserId(TokenDto userDetail);
+
+    /**
+     * 居民端 - 根据版块编码，获取版块下属子类别
+     *
+     * @param sectionCode
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.NewsCategoryResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/6/23 18:03
+     */
+    Result<List<NewsCategoryResultDTO>> listCategoryBySection(String sectionCode);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java → 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<List<EpdcNewsListResultDTO>> 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<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO, TokenDto userDetail) {
-        fromDTO.setDeptId(userDetail.getGridId());
-        return newsFeignClient.listBanner(fromDTO);
+    public Result<List<EpdcBannerListResultDTO>> 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<List<NewsCategoryResultDTO>> listCategoryBySection(String sectionCode) {
+        return newsFeignClient.listCategoryCodeBySection(sectionCode);
+    }
 }

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<List<EpdcNewsListResultDTO>> listNewsByCategory(TokenDto userDetail, EpdcNewsListByCategoryFromDTO formDto);
+    Result<List<EpdcNewsListResultDTO>> listNewsByCategory(TokenDto userDetail, EpdcNewsListFromDTO formDto);
 
     /**
      * 根据新闻类别获取banner列表

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<List<EpdcNewsListResultDTO>> listNewsByCategory(TokenDto userDetail, EpdcNewsListByCategoryFromDTO formDto) {
+    public Result<List<EpdcNewsListResultDTO>> listNewsByCategory(TokenDto userDetail, EpdcNewsListFromDTO formDto) {
         formDto.setDeptId(userDetail.getGridId());
-        return newsFeignClient.listNewsByCategory(formDto);
+        return newsFeignClient.listNews(formDto);
     }
 
     @Override
     public Result<List<EpdcBannerListResultDTO>> listBnnerByCategory(TokenDto userDetail, EpdcBannerListFromDTO formDto) {
         formDto.setDeptId(userDetail.getGridId());
+        formDto.setSectionCode(ArticleSectionEnum.SAFETY_LIVING.getCode());
         return newsFeignClient.listBanner(formDto);
     }