Browse Source

入群接口(跳过申请流程)

feature/yujt_analysisHomeChange
zhangyuan 5 years ago
parent
commit
360f0d9da9
  1. 13
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
  2. 11
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
  3. 5
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
  4. 9
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
  5. 16
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java

13
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);
}
/**
* 发布话题

11
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);
/**
* 更新社群用户党员标识并加入关联的所有网格党员群
*

5
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);

9
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);
/**
* 发布话题

16
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) {

Loading…
Cancel
Save