From d54ead597d145015616c88c35f6cb0b1d29570fc Mon Sep 17 00:00:00 2001 From: 13009 Date: Mon, 20 May 2024 16:48:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=AC=E5=85=B1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunalDataService.java} | 16 +++++++++++----- .../model/FiveCascadeQueryRequest.java | 5 ++++- .../model/FiveCascadeQueryResponse.java | 5 ++++- .../boot/starter/ScfsAutoConfiguration.java | 11 +++++++++++ 4 files changed, 30 insertions(+), 7 deletions(-) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{division/DivisionService.java => communal/CommunalDataService.java} (71%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{division => communal}/model/FiveCascadeQueryRequest.java (91%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{division => communal}/model/FiveCascadeQueryResponse.java (96%) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/DivisionService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/CommunalDataService.java similarity index 71% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/DivisionService.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/CommunalDataService.java index c5a7359..c70afb6 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/DivisionService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/CommunalDataService.java @@ -1,18 +1,24 @@ -package com.czcb.scfs.api.service.v2.division; +package com.czcb.scfs.api.service.v2.communal; import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.http.HttpHeaders; import com.czcb.scfs.api.core.http.HttpResponse; -import com.czcb.scfs.api.service.v2.division.model.FiveCascadeQueryRequest; -import com.czcb.scfs.api.service.v2.division.model.FiveCascadeQueryResponse; +import com.czcb.scfs.api.service.v2.communal.model.FiveCascadeQueryRequest; +import com.czcb.scfs.api.service.v2.communal.model.FiveCascadeQueryResponse; import static com.czcb.scfs.api.core.Constants.API_VERSION; import static com.czcb.scfs.api.core.Constants.V_2; -public class DivisionService { +/** + * 公共数据服务 + * + * @author wangwei + * @since 2.0.0 + */ +public class CommunalDataService { private final ApiClient apiClient; - public DivisionService(ApiClient apiClient) { + public CommunalDataService(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/model/FiveCascadeQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryRequest.java similarity index 91% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/model/FiveCascadeQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryRequest.java index 7b95083..5c55df1 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/model/FiveCascadeQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.division.model; +package com.czcb.scfs.api.service.v2.communal.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; @@ -6,6 +6,9 @@ import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.experimental.Accessors; +/** + * 五级行政区划 + */ @Data @Accessors(chain = true) @TransType("210306") diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/model/FiveCascadeQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryResponse.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/model/FiveCascadeQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryResponse.java index ac6a012..f50657c 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/division/model/FiveCascadeQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/communal/model/FiveCascadeQueryResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.division.model; +package com.czcb.scfs.api.service.v2.communal.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; @@ -8,6 +8,9 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.util.List; +/** + * 五级行政区划 + */ @Data @Accessors(chain = true) public class FiveCascadeQueryResponse implements ApiResponse { diff --git a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java index 0890539..92d67ea 100644 --- a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java +++ b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java @@ -7,6 +7,7 @@ import com.czcb.scfs.api.service.echo.EchoService; import com.czcb.scfs.api.service.v2.account.AccountService; import com.czcb.scfs.api.service.v2.bills.BillService; import com.czcb.scfs.api.service.v2.bmd.BmdService; +import com.czcb.scfs.api.service.v2.communal.CommunalDataService; import com.czcb.scfs.api.service.v2.face.FaceService; import com.czcb.scfs.api.service.v2.file.FileService; import com.czcb.scfs.api.service.v2.loan.LoanService; @@ -77,6 +78,16 @@ public class ScfsAutoConfiguration { return new BmdService(apiClient); } + /** + * 公共数据 + */ + @Bean + @ConditionalOnClass(CommunalDataService.class) + public CommunalDataService communalDataService(ApiClient apiClient) { + return new CommunalDataService(apiClient); + } + + /** * 人脸识别 */