社群添加好友接口 init

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java

@@ -182,4 +182,18 @@ public class ApiGroupController {
         return groupService.listOfInviteUsers(userDetail, formDto);
     }
 
+    /**
+     *
+     * 添加社群成员
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/6 9:17
+     */
+    @PostMapping("addMember")
+    public Result addMember(@RequestBody GroupAddUserFormDTO formDto) {
+        return groupService.saveGroupUsers(formDto);
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java

@@ -154,6 +154,18 @@ public interface GroupFeignClient {
      * @author liuchuang
      * @since 2019/10/23 16:38
      */
-    @GetMapping(value = "group/epdc-app/group/getInviteList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "group/epdc-app/usergroup/getInviteList", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EpdcUserGroupInviteResultDTO>> getInviteList(EpdcUserGroupInviteFormDTO formDto);
+
+    /**
+     *
+     * 添加成员
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/6 9:37
+     */
+    @PostMapping(value = "group/epdc-app/usergroup/addMember", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result addMember(GroupAddUserFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java

@@ -74,4 +74,9 @@ public class GroupFeignClientFallback implements GroupFeignClient {
     public Result<List<EpdcUserGroupInviteResultDTO>> getInviteList(EpdcUserGroupInviteFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "getInviteList", formDto);
     }
+
+    @Override
+    public Result addMember(GroupAddUserFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "addMember", formDto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java

@@ -140,4 +140,15 @@ public interface GroupService {
      */
     Result<List<EpdcUserGroupInviteResultDTO>> listOfInviteUsers(TokenDto userDetail, EpdcUserGroupInviteFormDTO formDto);
 
+    /**
+     *
+     * 添加社群成员
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/6 9:18
+     */
+    Result saveGroupUsers(GroupAddUserFormDTO formDto);
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java

@@ -159,4 +159,9 @@ public class GroupServiceImpl implements GroupService {
         formDto.setGridId(userDetail.getGridId());
         return groupFeignClient.getInviteList(formDto);
     }
+
+    @Override
+    public Result saveGroupUsers(GroupAddUserFormDTO formDto) {
+        return groupFeignClient.addMember(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupAddUserFormDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 添加成员Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/6 9:00
+ */
+@Data
+public class GroupAddUserFormDTO implements Serializable {
+    private static final long serialVersionUID = 7220929684754186126L;
+
+    /**
+     * 社群ID
+     */
+    private String groupId;
+
+    /**
+     * 添加成员信息
+     */
+    List<GroupUserFormDTO> groupUserFormDtoList;
+}

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserFormDTO.java

@@ -16,10 +16,6 @@ import java.io.Serializable;
 public class GroupUserFormDTO implements Serializable {
     private static final long serialVersionUID = -1532468675717622698L;
 
-    /**
-     * 社群ID
-     */
-    private String groupId;
     /**
      * 用户ID
      */

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java

@@ -4,8 +4,6 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
@@ -189,19 +187,4 @@ public class AppGroupController {
         return groupService.modifyMemberState(formDto);
     }
 
-    /**
-     *
-     * 添加成员列表
-     *
-     * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
-     * @author liuchuang
-     * @since 2019/10/23 16:37
-     */
-    @GetMapping("getInviteList")
-    public Result<List<EpdcUserGroupInviteResultDTO>> getInviteList(@RequestBody EpdcUserGroupInviteFormDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return groupService.listOfInviteUsers(formDto);
-    }
-
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java

@@ -0,0 +1,58 @@
+package com.elink.esua.epdc.modules.group.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
+import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO;
+import com.elink.esua.epdc.modules.group.service.UserGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 移动端社群成员模块
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/6 9:40
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "usergroup")
+public class AppUserGroupController {
+
+    @Autowired
+    private UserGroupService userGroupService;
+
+    /**
+     *
+     * 添加成员列表
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @author liuchuang
+     * @since 2019/10/23 16:37
+     */
+    @GetMapping("getInviteList")
+    public Result<List<EpdcUserGroupInviteResultDTO>> getInviteList(@RequestBody EpdcUserGroupInviteFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return userGroupService.listOfInviteUsers(formDto);
+    }
+
+    /**
+     *
+     * 添加社群成员
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/6 9:17
+     */
+    @PostMapping("addMember")
+    public Result addMember(@RequestBody GroupAddUserFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return userGroupService.saveGroupUsers(formDto);
+    }
+}

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java

@@ -20,8 +20,6 @@ package com.elink.esua.epdc.modules.group.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupDTO;
 import com.elink.esua.epdc.dto.group.GroupDetailDTO;
 import com.elink.esua.epdc.dto.group.GroupManagementDTO;
@@ -211,14 +209,4 @@ public interface GroupService extends BaseService<GroupEntity> {
      */
     Result modifyMemberState(GroupUserRemoveOrQuitFormDTO formDto);
 
-    /**
-     *
-     * 移动端-添加成员列表
-     *
-     * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
-     * @author liuchuang
-     * @since 2019/10/23 16:37
-     */
-    Result<List<EpdcUserGroupInviteResultDTO>> listOfInviteUsers(EpdcUserGroupInviteFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java

@@ -20,7 +20,10 @@ package com.elink.esua.epdc.modules.group.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.UserGroupDTO;
+import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserRemoveOrQuitFormDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.modules.group.entity.UserGroupEntity;
@@ -142,12 +145,23 @@ public interface UserGroupService extends BaseService<UserGroupEntity> {
 
     /**
      *
-     * 获取社群用户ID
+     * 移动端-添加成员列表
      *
-     * @params [groupId, states]
+     * @params [formDto]
-     * @return java.util.List<java.lang.String>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @author liuchuang
+     * @since 2019/10/23 16:37
+     */
+    Result<List<EpdcUserGroupInviteResultDTO>> listOfInviteUsers(EpdcUserGroupInviteFormDTO formDto);
+
+    /**
+     *
+     * 移动端-添加社群成员
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author liuchuang
-     * @since 2019/10/23 15:04
+     * @since 2019/11/6 9:18
      */
-    List<String> listOfGroupUserIdsByState(String groupId, int[] states);
+    Result saveGroupUsers(GroupAddUserFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -27,15 +27,12 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.*;
 import com.elink.esua.epdc.dto.enums.GroupStateEnum;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
 import com.elink.esua.epdc.modules.async.NewsTask;
-import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.group.dao.GroupDao;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
 import com.elink.esua.epdc.modules.group.service.GroupService;
@@ -64,9 +61,6 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     @Autowired
     private NewsTask newsTask;
 
-    @Autowired
-    private UserFeignClient userFeignClient;
-
     @Override
     public PageData<GroupManagementDTO> page(Map<String, Object> params) {
         IPage<GroupManagementDTO> page = getPage(params);
@@ -298,15 +292,4 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
         newsTask.insertUserInformation(informationFormDTO);
         return new Result();
     }
-
-    @Override
-    public Result<List<EpdcUserGroupInviteResultDTO>> listOfInviteUsers(EpdcUserGroupInviteFormDTO formDto) {
-        // 获取社群当前待审核和审核通过的成员ID
-        int[] states = new int[]{GroupUserStateEnum.GROUP_USER_STATE_PENDING_REVIEW.getValue(), GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()};
-        List<String> userIds = userGroupService.listOfGroupUserIdsByState(formDto.getGroupId(), states);
-        formDto.setUserIds(userIds);
-
-        return userFeignClient.getInviteUserList(formDto);
-    }
-
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java

@@ -20,20 +20,29 @@ package com.elink.esua.epdc.modules.group.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.UserGroupDTO;
+import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO;
+import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserRemoveOrQuitFormDTO;
 import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
+import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.group.dao.UserGroupDao;
 import com.elink.esua.epdc.modules.group.entity.UserGroupEntity;
 import com.elink.esua.epdc.modules.group.service.UserGroupService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +56,9 @@ import java.util.Map;
 @Service
 public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGroupEntity> implements UserGroupService {
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
     @Override
     public PageData<UserGroupDTO> page(Map<String, Object> params) {
         IPage<UserGroupDTO> page = getPage(params);
@@ -120,8 +132,39 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
     }
 
     @Override
-    public List<String> listOfGroupUserIdsByState(String groupId, int[] states) {
+    public Result<List<EpdcUserGroupInviteResultDTO>> listOfInviteUsers(EpdcUserGroupInviteFormDTO formDto) {
-        return baseDao.selectListOfGroupUserIdsByState(groupId, states);
+        // 获取社群当前待审核和审核通过的成员ID
+        int[] states = {GroupUserStateEnum.GROUP_USER_STATE_PENDING_REVIEW.getValue(), GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()};
+        List<String> userIds = baseDao.selectListOfGroupUserIdsByState(formDto.getGroupId(), states);
+        formDto.setUserIds(userIds);
+
+        return userFeignClient.getInviteUserList(formDto);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result saveGroupUsers(GroupAddUserFormDTO formDto) {
+        List<UserGroupEntity> userGroupEntities = new ArrayList<>(formDto.getGroupUserFormDtoList().size());
+        UserGroupEntity entity = null;
+        for (GroupUserFormDTO userDto:
+                formDto.getGroupUserFormDtoList()) {
+            entity = new UserGroupEntity();
+            entity.setGroupId(formDto.getGroupId());
+            entity.setUserId(userDto.getUserId());
+            entity.setNickname(userDto.getNickname());
+            entity.setUserAvatar(userDto.getUserAvatar());
+            entity.setMobile(userDto.getMobile());
+            entity.setPartyMember(userDto.getPartyMember());
+            entity.setLordFlag(NumConstant.ZERO_STR);
+            entity.setState(GroupUserStateEnum.GROUP_USER_STATE_PENDING_REVIEW.getValue());
+
+            userGroupEntities.add(entity);
+        }
+        if (insertBatch(userGroupEntities)) {
+            return new Result();
+        }
+
+        return new Result().error();
     }
 
 }