From 475432542bdeae341f0ac433970be96c5cdf60b6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 29 Apr 2021 14:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/feign/ResiGroupFeignClient.java   |  4 ++--
 .../feign/fallback/ResiGroupFeignClientFallBack.java |  4 ++--
 .../com/epmet/service/impl/ResiGroupServiceImpl.java |  2 +-
 .../act/controller/GroupActInfoController.java       | 12 ++++++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
index 18f125c969..ee668f7ba6 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -161,6 +161,6 @@ public interface ResiGroupFeignClient {
 	 * @description 查询活动详情
 	 * @Date 2021/4/29 9:57
 	 **/
-	@PostMapping(value = "/resi/group/act/actdetail",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActDetailResultDTO> queryActDetail(@RequestBody ActDetailFormDTO actDetailFormDTO);
+	@PostMapping(value = "/resi/group/act/actdetail-internal",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ActDetailResultDTO> queryActDetailInternal(@RequestBody ActDetailFormDTO actDetailFormDTO);
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
index 01d7ff57ec..413022ea78 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -131,7 +131,7 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
 	 * @Date 2021/4/29 9:57
 	 **/
 	@Override
-	public Result<ActDetailResultDTO> queryActDetail(ActDetailFormDTO actDetailFormDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryActDetail", actDetailFormDTO);
+	public Result<ActDetailResultDTO> queryActDetailInternal(ActDetailFormDTO actDetailFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryActDetailInternal", actDetailFormDTO);
 	}
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java
index 7bae657b2b..81231e26f2 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java
@@ -62,7 +62,7 @@ public class ResiGroupServiceImpl implements ResiGroupService{
 
 	@Override
 	public ActDetailGovResultDTO queryActDetailForWork(ActDetailFormDTO actDetailFormDTO) {
-		Result<ActDetailResultDTO> actDetailResult=resiGroupFeignClient.queryActDetail(actDetailFormDTO);
+		Result<ActDetailResultDTO> actDetailResult=resiGroupFeignClient.queryActDetailInternal(actDetailFormDTO);
 		if(actDetailResult.success()&&null!=actDetailResult.getData()){
 			ActDetailGovResultDTO resultDTO= ConvertUtils.sourceToTarget(actDetailResult.getData(),ActDetailGovResultDTO.class);
 			return resultDTO;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
index 3587ca35d0..4a1a973022 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
@@ -80,6 +80,18 @@ public class GroupActInfoController {
         return new Result<ActDetailResultDTO>().ok(groupActInfoService.queryActDetail(actDetailFormDTO));
     }
 
+    /**
+     * @param actDetailFormDTO
+     * @author yinzuomei
+     * @description 内部feign接口
+     * @Date 2021/4/29 14:55
+     **/
+    @PostMapping("actdetail-internal")
+    public Result<ActDetailResultDTO> queryActDetailInternal(@RequestBody ActDetailFormDTO actDetailFormDTO){
+        ValidatorUtils.validateEntity(actDetailFormDTO,ActDetailFormDTO.AddUserInternalGroup.class);
+        return new Result<ActDetailResultDTO>().ok(groupActInfoService.queryActDetail(actDetailFormDTO));
+    }
+
     /**
      * @return com.epmet.commons.tools.utils.Result
      * @param tokenDto