wangli/riven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3136): 第三方项目信息api调整

Browse Source
This commit is contained in:
songyuanlun 2024-10-28 12:55:11 +08:00
parent ee8f4461b7
commit 84c278533a
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
riven-api/src/main/java/cn/axzo/riven/client/feign/TaiZhouApi.java → riven-api/src/main/java/cn/axzo/riven/client/feign/ThirdProjectApi.java
View File

@ -1,26 +1,22 @@
package cn.axzo.riven.client.feign;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.riven.client.common.enums.ThirdCodeEnum;
import cn.axzo.riven.client.req.ThirdProjectReq;
import cn.axzo.riven.client.res.TaiZhouProjectResp;
import cn.axzo.riven.client.res.ThirdPartPersonRes;
import cn.axzo.riven.client.res.ThirdProjectResp;
import java.util.List;
import javax.validation.Valid;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @author syl
* @date 2024/10/24
*/
@FeignClient(name = "riven", url = "${axzo.service.riven:http://riven:8080}")
public interface TaiZhouApi {
public interface ThirdProjectApi {
@PostMapping("/api/third/queryProject")
ApiResult<List<TaiZhouProjectResp>> queryThirdProject(@RequestBody @Valid ThirdProjectReq req);
ApiResult<List<ThirdProjectResp>> queryThirdProject(@RequestBody @Valid ThirdProjectReq req);
}

2
riven-api/src/main/java/cn/axzo/riven/client/res/TaiZhouProjectResp.java → riven-api/src/main/java/cn/axzo/riven/client/res/ThirdProjectResp.java
View File

@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TaiZhouProjectResp {
public class ThirdProjectResp {
/**
* 三方名称code

14
riven-third/src/main/java/cn/axzo/riven/third/api/TaiZhouApiImpl.java → riven-third/src/main/java/cn/axzo/riven/third/api/ThirdProjectApiImpl.java
View File

@ -2,15 +2,13 @@ package cn.axzo.riven.third.api;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.riven.client.common.enums.ThirdCodeEnum;
import cn.axzo.riven.client.feign.TaiZhouApi;
import cn.axzo.riven.client.feign.ThirdProjectApi;
import cn.axzo.riven.client.req.ThirdProjectReq;
import cn.axzo.riven.client.res.TaiZhouProjectResp;
import cn.axzo.riven.client.res.ThirdPartPersonRes;
import cn.axzo.riven.third.mapstruct.TaiZhouConverter;
import cn.axzo.riven.client.res.ThirdProjectResp;
import cn.axzo.riven.third.mapstruct.ThirdProjectConverter;
import cn.axzo.riven.third.taizhou.entity.TaiZhouProject;
import cn.axzo.riven.third.taizhou.service.TaiZhouService;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
@ -23,19 +21,19 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Slf4j
@RestController
public class TaiZhouApiImpl implements TaiZhouApi {
public class ThirdProjectApiImpl implements ThirdProjectApi {
@Autowired
private TaiZhouService taiZhouService;
@Override
public ApiResult<List<TaiZhouProjectResp>> queryThirdProject(ThirdProjectReq req) {
public ApiResult<List<ThirdProjectResp>> queryThirdProject(ThirdProjectReq req) {
// 目前仅对接泰州，所以这里仅支持泰州项目查询
if (!Objects.equals(ThirdCodeEnum.TAI_ZHOU, req.getThirdCode())) {
return ApiResult.ok(new ArrayList<>());
}
List<TaiZhouProject> taiZhouProjectList = taiZhouService.queryThirdProjectForTaiZhou();
List<TaiZhouProjectResp> result = TaiZhouConverter.INSTANCE.convertFromProjects(taiZhouProjectList);
List<ThirdProjectResp> result = ThirdProjectConverter.INSTANCE.convertFromProjects(taiZhouProjectList);
return ApiResult.ok(result);
}
}

10
riven-third/src/main/java/cn/axzo/riven/third/mapstruct/TaiZhouConverter.java → riven-third/src/main/java/cn/axzo/riven/third/mapstruct/ThirdProjectConverter.java
View File

@ -1,6 +1,6 @@
package cn.axzo.riven.third.mapstruct;
import cn.axzo.riven.client.res.TaiZhouProjectResp;
import cn.axzo.riven.client.res.ThirdProjectResp;
import cn.axzo.riven.third.taizhou.entity.TaiZhouProject;
import java.util.List;
import org.mapstruct.Mapper;
@ -13,14 +13,14 @@ import org.mapstruct.factory.Mappers;
* @date 2024/10/24
*/
@Mapper(builder = @org.mapstruct.Builder(disableBuilder = true))
public interface TaiZhouConverter {
public interface ThirdProjectConverter {
TaiZhouConverter INSTANCE = Mappers.getMapper(TaiZhouConverter.class);
ThirdProjectConverter INSTANCE = Mappers.getMapper(ThirdProjectConverter.class);
@Mappings({
@Mapping(source = "taiZhouThirdProjectExt", target = "taiZhouThirdProjectExt"),
})
TaiZhouProjectResp map(TaiZhouProject project);
ThirdProjectResp map(TaiZhouProject project);
List<TaiZhouProjectResp> convertFromProjects(List<TaiZhouProject> req);
List<ThirdProjectResp> convertFromProjects(List<TaiZhouProject> req);
}