From c68157c506d39926a78afafa9549df820f552d40 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 29 Nov 2021 17:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E7=BD=91=E6=A0=BC=E6=B2=BB?=
 =?UTF-8?q?=E7=90=86-=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AE=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/ApiScreenController.java  | 14 ++++++++++++++
 .../elink/esua/epdc/feign/AnalysisFeignClient.java | 11 +++++++++++
 .../fallback/AnalysisFeignClientFallback.java      |  5 +++++
 .../elink/esua/epdc/service/EpdcScreenService.java | 10 ++++++++++
 .../epdc/service/impl/EpdcScreenServiceImpl.java   |  5 +++++
 5 files changed, 45 insertions(+)

diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java
index f335150..d76a698 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java
@@ -313,6 +313,20 @@ public class ApiScreenController {
         return epdcScreenService.itemList(formDto);
     }
 
+    /**
+     * 网格治理-议题列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    @GetMapping("gridGovernance/mapIssueList")
+    public Result<List<EpdcScreenIssueListResultDTO>> issueList(EpdcScreenItemListFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.issueList(formDto);
+    }
+
     /**
      * 多元服务-党员服务列表
      * @params [formDto]
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
index 04e3ca4..296c605 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -256,6 +256,17 @@ public interface AnalysisFeignClient {
     @GetMapping("analysis/screen/gridGovernance/mapItemList")
     Result<List<EpdcScreenItemListResultDTO>> itemList(EpdcScreenItemListFormDTO formDto);
 
+    /**
+     * 网格治理-议题列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    @GetMapping("analysis/screen/gridGovernance/mapIssueList")
+    Result<List<EpdcScreenIssueListResultDTO>> issueList(EpdcScreenItemListFormDTO formDto);
+
     /**
      * 多元服务-党员服务列表
      * @params [formDto]
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
index 7f64487..3a958bb 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@@ -136,6 +136,11 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"itemList",formDto);
     }
 
+    @Override
+    public Result<List<EpdcScreenIssueListResultDTO>> issueList(EpdcScreenItemListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"issueList",formDto);
+    }
+
     @Override
     public Result<List<EpdcScreenPartyMemberServicesResultDTO>> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"partyMemberServices",formDto);
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java
index 144e3d6..9cee32b 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java
@@ -224,6 +224,16 @@ public interface EpdcScreenService {
      */
     Result<List<EpdcScreenItemListResultDTO>> itemList(EpdcScreenItemListFormDTO formDto);
 
+    /**
+     * 网格治理-议题列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    Result<List<EpdcScreenIssueListResultDTO>> issueList(EpdcScreenItemListFormDTO formDto);
+
     /**
      * 多元服务-党员服务列表
      * @params [formDto]
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java
index 2b43bec..15c6452 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java
@@ -137,6 +137,11 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
         return analysisFeignClient.itemList(formDto);
     }
 
+    @Override
+    public Result<List<EpdcScreenIssueListResultDTO>> issueList(EpdcScreenItemListFormDTO formDto) {
+        return analysisFeignClient.issueList(formDto);
+    }
+
     @Override
     public Result<List<EpdcScreenPartyMemberServicesResultDTO>> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) {
         return analysisFeignClient.partyMemberServices(formDto);