From 360f0d9da90a8ee029448001b771376c5ae27cf6 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Sun, 28 Jun 2020 10:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E7=BE=A4=E6=8E=A5=E5=8F=A3=EF=BC=88?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/ApiPropertyController.java   | 13 +++++++++++++
 .../esua/epdc/feign/PropertyFeignClient.java     | 11 +++++++++++
 .../fallback/PropertyFeignClientFallback.java    |  5 +++++
 .../elink/esua/epdc/service/PropertyService.java |  9 +++++++++
 .../epdc/service/impl/PropertyServiceImpl.java   | 16 ++++++++++++++++
 5 files changed, 54 insertions(+)

diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
index a957593..d03999b 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
@@ -188,6 +188,19 @@ public class ApiPropertyController {
         return propertyService.applyForGroup(userDetail, formDto);
     }
 
+    /**
+     * 入群接口（跳过申请流程）
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/6/28 14:00
+     */
+    @PostMapping("group/join")
+    public Result joinGroup(@LoginUser TokenDto userDetail, @RequestBody GroupApplyFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return propertyService.joinGroup(userDetail, formDto);
+    }
 
     /**
      * 发布话题
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
index 1094422..506149b 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
@@ -167,6 +167,17 @@ public interface PropertyFeignClient {
     @PostMapping(value = "property/epdc-app/group/applyForGroup", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result applyForGroup(GroupApplyFormDTO formDto);
 
+    /**
+     * 申请入群
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [formDto]
+     * @author liuchuang
+     * @since 2019/11/11 14:04
+     */
+    @PostMapping(value = "property/epdc-app/group/joinGroup", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result joinGroup(GroupApplyFormDTO formDto);
+
     /**
      * 更新社群用户党员标识并加入关联的所有网格党员群
      *
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
index c8b994b..ec2da4d 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
@@ -102,6 +102,11 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "applyForGroup", formDto);
     }
 
+    @Override
+    public Result joinGroup(GroupApplyFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "joinGroup", formDto);
+    }
+
     @Override
     public Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "updateUserPartyMember", formDto);
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
index b8e1ba6..b34d98d 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
@@ -151,6 +151,15 @@ public interface PropertyService {
      */
     Result applyForGroup(TokenDto userDetail, GroupApplyFormDTO formDto);
 
+    /**
+     * 入群接口（跳过申请流程）
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [userDetail, formDto]
+     * @author zhangyuan
+     * @since 2020/6/28 14:02
+     */
+    Result joinGroup(TokenDto userDetail, GroupApplyFormDTO formDto);
 
     /**
      * 发布话题
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
index 24af24e..91d424d 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
@@ -168,6 +168,22 @@ public class PropertyServiceImpl implements PropertyService {
         return propertyFeignClient.applyForGroup(formDto);
     }
 
+    @Override
+    public Result joinGroup(TokenDto userDetail, GroupApplyFormDTO formDto) {
+        if (null == userDetail) {
+            return new Result().error("获取用户信息失败");
+        }
+        formDto.setUserId(userDetail.getUserId());
+        formDto.setNickname(userDetail.getNickname());
+        formDto.setUserAvatar(userDetail.getFaceImg());
+        formDto.setMobile(userDetail.getMobile());
+        if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
+            formDto.setPartyMember(YesOrNoEnum.YES.value());
+        } else {
+            formDto.setPartyMember(YesOrNoEnum.NO.value());
+        }
+        return propertyFeignClient.joinGroup(formDto);
+    }
 
     @Override
     public Result saveTopic(TokenDto userDetail, TopicSubmitFormDTO formDto) {