群成员列表（待审核/审核通过）接口 init

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

@@ -7,7 +7,9 @@ import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.GroupCreateFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupIntroductionFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupModifyAvatarFormDTO;
+import com.elink.esua.epdc.dto.group.form.GroupUsersFormDTO;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.service.GroupService;
@@ -128,4 +130,18 @@ public class ApiGroupController {
         return groupService.modifyAvatar(userDetail, formDto);
     }
 
+    /**
+     *
+     * 社群成员列表（待审核/审核通过）
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/10/23 9:13
+     */
+    @GetMapping("listOfMember")
+    public Result<List<GroupUserListResultDTO>> listOfMember(@RequestBody GroupUsersFormDTO formDto) {
+        return groupService.listOfMember(formDto);
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.feign.fallback.GroupFeignClientFallback;
@@ -108,4 +109,16 @@ public interface GroupFeignClient {
      */
     @PostMapping(value = "group/epdc-app/group/modifyAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result modifyAvatar(GroupModifyAvatarFormDTO formDto);
+
+    /**
+     *
+     * 社群成员列表（待审核/审核通过）
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/10/23 9:16
+     */
+    @GetMapping(value = "group/epdc-app/group/listOfMember", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<GroupUserListResultDTO>> listOfMember(GroupUsersFormDTO formDto);
 }

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.feign.GroupFeignClient;
@@ -54,4 +55,9 @@ public class GroupFeignClientFallback implements GroupFeignClient {
     public Result modifyAvatar(GroupModifyAvatarFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "modifyAvatar", formDto);
     }
+
+    @Override
+    public Result<List<GroupUserListResultDTO>> listOfMember(GroupUsersFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfMember", formDto);
+    }
 }

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

@@ -6,7 +6,9 @@ import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.GroupCreateFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupIntroductionFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupModifyAvatarFormDTO;
+import com.elink.esua.epdc.dto.group.form.GroupUsersFormDTO;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 
@@ -98,4 +100,15 @@ public interface GroupService {
      */
     Result modifyAvatar(TokenDto userDetail, GroupModifyAvatarFormDTO formDto);
 
+    /**
+     *
+     * 社群成员列表（待审核/审核通过）
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/10/23 9:14
+     */
+    Result<List<GroupUserListResultDTO>> listOfMember(GroupUsersFormDTO formDto);
+
 }

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

@@ -9,6 +9,7 @@ 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.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -126,4 +127,9 @@ public class GroupServiceImpl implements GroupService {
         formDto.setUserId(userDetail.getUserId());
         return groupFeignClient.modifyAvatar(formDto);
     }
+
+    @Override
+    public Result<List<GroupUserListResultDTO>> listOfMember(GroupUsersFormDTO formDto) {
+        return groupFeignClient.listOfMember(formDto);
+    }
 }

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

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ *
+ * 社群成员Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/23 9:10
+ */
+@Data
+public class GroupUsersFormDTO implements Serializable {
+    private static final long serialVersionUID = 7099778185347825038L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String groupId;
+
+    /**
+     * 状态 0：待审核，10：审核通过
+     */
+    @NotNull(message = "成员状态不能为空")
+    private Integer state;
+}

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.modules.group.service.GroupService;
@@ -141,4 +142,19 @@ public class AppGroupController {
         return groupService.modifyAvatar(formDto);
     }
 
+    /**
+     *
+     * 社群成员列表（待审核/审核通过）
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/10/23 9:18
+     */
+    @GetMapping("listOfMember")
+    public Result<List<GroupUserListResultDTO>> listOfMember(@RequestBody GroupUsersFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return groupService.listOfMember(formDto);
+    }
+
 }

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

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
@@ -188,4 +189,15 @@ public interface GroupService extends BaseService<GroupEntity> {
      * @since 2019/10/22 17:31
      */
     Result modifyAvatar(GroupModifyAvatarFormDTO formDto);
+
+    /**
+     *
+     * 社群成员列表（待审核/审核通过）
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/10/23 9:19
+     */
+    Result<List<GroupUserListResultDTO>> listOfMember(GroupUsersFormDTO formDto);
 }

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

@@ -250,4 +250,10 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
         return new Result();
     }
 
+    @Override
+    public Result<List<GroupUserListResultDTO>> listOfMember(GroupUsersFormDTO formDto) {
+        List<GroupUserListResultDTO> data = userGroupService.listOfUserGroup(formDto.getGroupId(), formDto.getState());
+        return new Result<List<GroupUserListResultDTO>>().ok(data);
+    }
+
 }