Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

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)
+	@PostMapping(value = "/resi/group/act/actdetail-internal",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActDetailResultDTO> queryActDetail(@RequestBody ActDetailFormDTO actDetailFormDTO);
+    Result<ActDetailResultDTO> queryActDetailInternal(@RequestBody ActDetailFormDTO actDetailFormDTO);
 }

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) {
+	public Result<ActDetailResultDTO> queryActDetailInternal(ActDetailFormDTO actDetailFormDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryActDetail", actDetailFormDTO);
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryActDetailInternal", actDetailFormDTO);
 	}
 }

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;

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