居民端接口 init

1、社区资讯-栏目列表
1、社区资讯-资讯列表
1、社区资讯-资讯详情

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java

@@ -239,4 +239,43 @@ public class ApiNewsController {
         return newsService.listCategoryBySection(sectionCode);
     }
 
+    /**
+     * 社区资讯-栏目列表
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeModuleListResultDTO>>
+     * @author lc
+     * @since 2021/8/28 21:15
+     */
+    @GetMapping("contentModuleList")
+    public Result<List<EpdcNoticeModuleListResultDTO>> listContentModules() {
+        return newsService.listContentModules();
+    }
+
+    /**
+     * 社区资讯-资讯列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcContentListResultDTO>>
+     * @author lc
+     * @since 2021/8/28 21:22
+     */
+    @GetMapping("contentList")
+    public Result<List<EpdcContentListResultDTO>> listContents(EpdcContentListFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return newsService.listContents(formDto);
+    }
+
+    /**
+     * 社区资讯-资讯详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcContentDetailResultDTO>
+     * @author lc
+     * @since 2021/8/28 21:24
+     */
+    @GetMapping("contentDetail/{id}")
+    public Result<EpdcContentDetailResultDTO> getContentDetailById(@PathVariable("id") String id) {
+        return newsService.getContentDetailById(id);
+    }
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java

@@ -2,6 +2,7 @@ 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.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.modules.news.feign.callback.NewsFeignClientFallback;
@@ -166,4 +167,36 @@ public interface NewsFeignClient {
     @GetMapping("news/epdc-app/newscategory/listCategoryBySection/{sectionCode}")
     Result<List<NewsCategoryResultDTO>> listCategoryCodeBySection(@PathVariable("sectionCode") String sectionCode);
 
+    /**
+     * 社区资讯-栏目列表
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeModuleListResultDTO>>
+     * @author lc
+     * @since 2021/8/28 21:15
+     */
+    @GetMapping("contentModuleList")
+    Result<List<EpdcNoticeModuleListResultDTO>> listContentModules();
+
+    /**
+     * 社区资讯-资讯列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcContentListResultDTO>>
+     * @author lc
+     * @since 2021/8/28 21:22
+     */
+    @GetMapping("contentList")
+    Result<List<EpdcContentListResultDTO>> listContents(EpdcContentListFormDTO formDto);
+
+    /**
+     * 社区资讯-资讯详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcContentDetailResultDTO>
+     * @author lc
+     * @since 2021/8/28 21:24
+     */
+    @GetMapping("contentDetail/{id}")
+    Result<EpdcContentDetailResultDTO> getContentDetailById(@PathVariable("id") String id);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.modules.news.feign.NewsFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -82,4 +83,19 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     public Result<List<NewsCategoryResultDTO>> listCategoryCodeBySection(String sectionCode) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listCategoryCodeBySection", sectionCode);
     }
+
+    @Override
+    public Result<List<EpdcNoticeModuleListResultDTO>> listContentModules() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listContentModules");
+    }
+
+    @Override
+    public Result<List<EpdcContentListResultDTO>> listContents(EpdcContentListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listContents", formDto);
+    }
+
+    @Override
+    public Result<EpdcContentDetailResultDTO> getContentDetailById(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getContentDetailById", id);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java

@@ -152,4 +152,33 @@ public interface NewsService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO);
+
+    /**
+     * 社区资讯-栏目列表
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeModuleListResultDTO>>
+     * @author lc
+     * @since 2021/8/28 21:18
+     */
+    Result<List<EpdcNoticeModuleListResultDTO>> listContentModules();
+
+    /**
+     * 社区资讯-资讯列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcContentListResultDTO>>
+     * @author lc
+     * @since 2021/8/28 21:25
+     */
+    Result<List<EpdcContentListResultDTO>> listContents(EpdcContentListFormDTO formDto);
+
+    /**
+     * 社区资讯-资讯详情
+     *
+     * @param id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcContentDetailResultDTO>
+     * @author lc
+     * @since 2021/8/28 21:25
+     */
+    Result<EpdcContentDetailResultDTO> getContentDetailById(String id);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java

@@ -110,4 +110,19 @@ public class NewsServiceImpl implements NewsService {
         }
         return new Result();
     }
+
+    @Override
+    public Result<List<EpdcNoticeModuleListResultDTO>> listContentModules() {
+        return newsFeignClient.listContentModules();
+    }
+
+    @Override
+    public Result<List<EpdcContentListResultDTO>> listContents(EpdcContentListFormDTO formDto) {
+        return newsFeignClient.listContents(formDto);
+    }
+
+    @Override
+    public Result<EpdcContentDetailResultDTO> getContentDetailById(String id) {
+        return newsFeignClient.getContentDetailById(id);
+    }
 }

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 1b9f0fa7529fc1601f10d50dde8d5e5cbcf004f7
+Subproject commit 7c93eb1622946c99e4476b6d586628a04c344f7d