From a754efe0eb357a035978dd8271ae12f6fca59e38 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 29 Dec 2020 11:04:37 +0800
Subject: [PATCH] =?UTF-8?q?feign=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserPointStatisticalDailyServiceImpl.java    | 2 +-
 .../src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java  | 2 +-
 .../epmet/feign/fallback/GovOrgOpenFeignClientFallback.java   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
index 0242064ae9..ac5849d385 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java
@@ -254,7 +254,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         // 按社区统计
         if ("community".equals(formDTO.getScope())){
             // 根据网格id，获取社区下的所有网格id
-            Result<List<String>> gridInCommunity = govOrgOpenFeignClient.getGridInCommunity(formDTO.getGridId());
+            Result<List<String>> gridInCommunity = govOrgOpenFeignClient.getGridIdsInCommunity(formDTO.getGridId());
             if (gridInCommunity.getData().size() <= NumConstant.ZERO){
                 log.error("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id");
                 return resultDTOS;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 50bb5e6205..2c2c8144b0 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -323,5 +323,5 @@ public interface GovOrgOpenFeignClient {
      * @Date 17:44 2020-12-28
      **/
     @GetMapping("/gov/org/customergrid/getGridInCommunity/{gridId}")
-    Result<List<String>> getGridInCommunity(@PathVariable("gridId") String gridId);
+    Result<List<String>> getGridIdsInCommunity(@PathVariable("gridId") String gridId);
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index ad3eeeb81c..d9d5be0a84 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -184,7 +184,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     }
 
     @Override
-    public Result<List<String>> getGridInCommunity(String gridId) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInCommunity", gridId);
+    public Result<List<String>> getGridIdsInCommunity(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIdsInCommunity", gridId);
     }
 }