Commit 261b046e by zhangxingmin

push

parent e47ae3e6
...@@ -6,6 +6,7 @@ import com.yd.user.api.service.ApiSysProjectService; ...@@ -6,6 +6,7 @@ import com.yd.user.api.service.ApiSysProjectService;
import com.yd.user.feign.client.sysproject.ApiSysProjectFeignClient; import com.yd.user.feign.client.sysproject.ApiSysProjectFeignClient;
import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectListRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse;
...@@ -14,6 +15,8 @@ import org.springframework.validation.annotation.Validated; ...@@ -14,6 +15,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* 项目信息 * 项目信息
* *
...@@ -39,6 +42,16 @@ public class ApiSysProjectController implements ApiSysProjectFeignClient { ...@@ -39,6 +42,16 @@ public class ApiSysProjectController implements ApiSysProjectFeignClient {
} }
/** /**
* 项目列表查询
* @param request
* @return
*/
@Override
public Result<List<ApiSysProjectDetailResponse>> list(ApiSysProjectListRequest request) {
return apiSysProjectService.list(request);
}
/**
* 获取项目详情 * 获取项目详情
* @param projectBizId 项目唯一标识(业务ID) * @param projectBizId 项目唯一标识(业务ID)
* @return * @return
......
...@@ -4,14 +4,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,14 +4,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectListRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse;
import java.util.List;
public interface ApiSysProjectService { public interface ApiSysProjectService {
Result<IPage<ApiSysProjectPageResponse>> page(ApiSysProjectPageRequest request); Result<IPage<ApiSysProjectPageResponse>> page(ApiSysProjectPageRequest request);
Result<List<ApiSysProjectDetailResponse>> list(ApiSysProjectListRequest request);
Result<ApiSysProjectDetailResponse> detail(String projectBizId); Result<ApiSysProjectDetailResponse> detail(String projectBizId);
Result add(ApiSysProjectAddRequest request); Result add(ApiSysProjectAddRequest request);
......
...@@ -14,6 +14,7 @@ import com.yd.user.api.service.ApiRelTenantProjectService; ...@@ -14,6 +14,7 @@ import com.yd.user.api.service.ApiRelTenantProjectService;
import com.yd.user.api.service.ApiSysProjectService; import com.yd.user.api.service.ApiSysProjectService;
import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectListRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectPageResponse;
...@@ -30,8 +31,11 @@ import org.springframework.beans.BeanUtils; ...@@ -30,8 +31,11 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
@Service @Service
public class ApiSysProjectServiceImpl implements ApiSysProjectService { public class ApiSysProjectServiceImpl implements ApiSysProjectService {
...@@ -72,6 +76,28 @@ public class ApiSysProjectServiceImpl implements ApiSysProjectService { ...@@ -72,6 +76,28 @@ public class ApiSysProjectServiceImpl implements ApiSysProjectService {
} }
/** /**
* 项目列表查询
* @param request
* @return
*/
@Override
public Result<List<ApiSysProjectDetailResponse>> list(ApiSysProjectListRequest request) {
if (CollectionUtils.isEmpty(request.getProjectBizIdList())) {
return Result.success();
}
List<ApiSysProjectDetailResponse> responses = new ArrayList<>();
List<SysProject> sysProjectList = iSysProjectService.queryList(SysProjectDto.builder().projectBizIdList(request.getProjectBizIdList()).build());
if (!CollectionUtils.isEmpty(sysProjectList)) {
responses = sysProjectList.stream().map(dto -> {
ApiSysProjectDetailResponse response = new ApiSysProjectDetailResponse();
BeanUtils.copyProperties(dto,response);
return response;
}).collect(Collectors.toList());
}
return Result.success(responses);
}
/**
* 获取项目详情 * 获取项目详情
* @param projectBizId 项目唯一标识(业务ID) * @param projectBizId 项目唯一标识(业务ID)
* @return * @return
......
...@@ -4,6 +4,7 @@ import com.yd.common.result.Result; ...@@ -4,6 +4,7 @@ import com.yd.common.result.Result;
import com.yd.user.feign.fallback.sysproject.ApiSysProjectFeignFallbackFactory; import com.yd.user.feign.fallback.sysproject.ApiSysProjectFeignFallbackFactory;
import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectListRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
...@@ -12,11 +13,12 @@ import org.springframework.web.bind.annotation.*; ...@@ -12,11 +13,12 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/** /**
* 用户服务-系统项目信息Feign客户端 * 用户服务-系统项目信息Feign客户端
*/ */
@FeignClient(name = "yd-user-api", fallbackFactory = ApiSysProjectFeignFallbackFactory.class) @FeignClient(name = "yd-user-api",path = "/user/api/sysProject",fallbackFactory = ApiSysProjectFeignFallbackFactory.class)
public interface ApiSysProjectFeignClient { public interface ApiSysProjectFeignClient {
/** /**
...@@ -28,6 +30,14 @@ public interface ApiSysProjectFeignClient { ...@@ -28,6 +30,14 @@ public interface ApiSysProjectFeignClient {
Result page(@RequestBody ApiSysProjectPageRequest request); Result page(@RequestBody ApiSysProjectPageRequest request);
/** /**
* 项目列表查询
* @param request
* @return
*/
@PostMapping("/list")
Result<List<ApiSysProjectDetailResponse>> list(@RequestBody ApiSysProjectListRequest request);
/**
* 获取项目详情 * 获取项目详情
* @param projectBizId 项目唯一标识(业务ID) * @param projectBizId 项目唯一标识(业务ID)
* @return * @return
......
...@@ -4,12 +4,15 @@ import com.yd.common.result.Result; ...@@ -4,12 +4,15 @@ import com.yd.common.result.Result;
import com.yd.user.feign.client.sysproject.ApiSysProjectFeignClient; import com.yd.user.feign.client.sysproject.ApiSysProjectFeignClient;
import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectAddRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectEditRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectListRequest;
import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest; import com.yd.user.feign.request.sysproject.ApiSysProjectPageRequest;
import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse; import com.yd.user.feign.response.sysproject.ApiSysProjectDetailResponse;
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 java.util.List;
/** /**
* 用户服务-系统项目信息Feign降级处理 * 用户服务-系统项目信息Feign降级处理
*/ */
...@@ -25,6 +28,11 @@ public class ApiSysProjectFeignFallbackFactory implements FallbackFactory<ApiSys ...@@ -25,6 +28,11 @@ public class ApiSysProjectFeignFallbackFactory implements FallbackFactory<ApiSys
} }
@Override @Override
public Result<List<ApiSysProjectDetailResponse>> list(ApiSysProjectListRequest request) {
return null;
}
@Override
public Result<ApiSysProjectDetailResponse> detail(String projectBizId) { public Result<ApiSysProjectDetailResponse> detail(String projectBizId) {
return null; return null;
} }
......
package com.yd.user.feign.request.sysproject;
import lombok.Data;
import java.util.List;
@Data
public class ApiSysProjectListRequest {
private List<String> projectBizIdList;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment