Merge remote-tracking branch 'origin/test' into dev_zxm

# Conflicts:
#	yd-user-api/src/main/java/com/yd/user/api/controller/ApiClientUserController.java
#	yd-user-feign/src/main/java/com/yd/user/feign/client/clientuser/ApiClientUserFeignClient.java
#	yd-user-feign/src/main/java/com/yd/user/feign/fallback/clientuser/ApiClientUserFeignFallbackFactory.java

yd-user-api/src/main/java/com/yd/user/api/controller/ApiClientUserController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 
 /**
 /**
  * 客户端用户信息
  * 客户端用户信息
@@ -53,6 +54,17 @@ public class ApiClientUserController implements ApiClientUserFeignClient {
     }
     }
 
 
     /**
     /**
+     * 根据条件查询客户端用户业务ID列表
+     * @param tenantBizId
+     * @param tenantBizId
+     * @return
+     */
+    @Override
+    public Result<List<String>> clientUserBizIdList(String tenantBizId, String projectBizId) {
+        return apiClientUserService.clientUserBizIdList(tenantBizId,projectBizId);
+    }
+
+    /**
      * 获取客户端用户详情 body入参
      * 获取客户端用户详情 body入参
      * @return
      * @return
      */
      */

yd-user-api/src/main/java/com/yd/user/api/service/ApiClientUserService.java

@@ -29,4 +29,6 @@ public interface ApiClientUserService {
     Result saveClientUserList(List<String> userBizIdList,
     Result saveClientUserList(List<String> userBizIdList,
                               String tenantBizId,
                               String tenantBizId,
                               String projectBizId);
                               String projectBizId);
+
+    Result<List<String>> clientUserBizIdList(String tenantBizId, String projectBizId);
 }
 }

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiClientUserServiceImpl.java

@@ -277,6 +277,25 @@ public class ApiClientUserServiceImpl implements ApiClientUserService {
     }
     }
 
 
     /**
     /**
+     * 根据条件查询客户端用户业务ID列表
+     * @param tenantBizId
+     * @param tenantBizId
+     * @return
+     */
+    @Override
+    public Result<List<String>> clientUserBizIdList(String tenantBizId, String projectBizId) {
+        List<String> clientUserBizIdList = new ArrayList<>();
+        List<ClientUser> clientUserList = iClientUserService.queryList(ClientUserDto.builder()
+                .tenantBizId(tenantBizId)
+                .projectBizId(projectBizId)
+                .build());
+        if (!CollectionUtils.isEmpty(clientUserList)) {
+            clientUserBizIdList = clientUserList.stream().map(ClientUser::getClientUserBizId).collect(Collectors.toList());
+        }
+        return Result.success(clientUserBizIdList);
+    }
+
+    /**
      * 校验客户端用户是否存在
      * 校验客户端用户是否存在
      * @param clientUserBizId
      * @param clientUserBizId
      * @return
      * @return

yd-user-feign/src/main/java/com/yd/user/feign/client/clientuser/ApiClientUserFeignClient.java

@@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 
 /**
 /**
  * 客户端用户信息Feign客户端
  * 客户端用户信息Feign客户端
@@ -39,6 +40,17 @@ public interface ApiClientUserFeignClient {
     @Operation(summary = "详情-客户端用户信息")
     @Operation(summary = "详情-客户端用户信息")
     Result<ApiClientUserDetailResponse> detail(@NotBlank(message = "客户端用户表唯一业务ID不能为空") @RequestParam(value = "clientUserBizId") String clientUserBizId);
     Result<ApiClientUserDetailResponse> detail(@NotBlank(message = "客户端用户表唯一业务ID不能为空") @RequestParam(value = "clientUserBizId") String clientUserBizId);
 
 
+
+    /**
+     * 根据条件查询客户端用户业务ID列表
+     * @param tenantBizId
+     * @param tenantBizId
+     * @return
+     */
+    @GetMapping("/clientUserBizIdList")
+    Result<List<String>> clientUserBizIdList(@RequestParam(value = "tenantBizId") String tenantBizId,
+                                             @RequestParam(value = "projectBizId") String projectBizId);
+
     /**
     /**
      * 查询-客户端用户详情 body入参
      * 查询-客户端用户详情 body入参
      * @return
      * @return

yd-user-feign/src/main/java/com/yd/user/feign/fallback/clientuser/ApiClientUserFeignFallbackFactory.java

@@ -11,8 +11,7 @@ import com.yd.user.feign.response.clientuser.ApiClientUserSaveResponse;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
-
-import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 
 /**
 /**
  * 客户端用户信息Feign降级处理
  * 客户端用户信息Feign降级处理
@@ -34,6 +33,11 @@ public class ApiClientUserFeignFallbackFactory implements FallbackFactory<ApiCli
             }
             }
 
 
             @Override
             @Override
+            public Result<List<String>> clientUserBizIdList(String tenantBizId, String projectBizId) {
+                return null;
+            }
+
+            @Override
             public Result<ApiClientUserDetailResponse> detail(ApiClientUserDetailBodyRequest request) {
             public Result<ApiClientUserDetailResponse> detail(ApiClientUserDetailBodyRequest request) {
                 return null;
                 return null;
             }
             }