From 4e6bae6717550c4dde0979c56639e1143e0aac02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Wed, 8 Apr 2026 10:14:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callback/FsspCallback.java | 2 +- .../dto/LngJkRpBillDto.java | 3 +- .../{fssp => externalApi}/dto/LngJkRpDto.java | 2 +- .../request/AccessTokenReq.java | 2 +- .../request/AppTokenReq.java | 2 +- .../request/FsspDzhdfjReq.java | 2 +- .../request/FsspDzhdxxReq.java | 2 +- .../request/FsspPzReq.java | 2 +- .../request/FsspYhjymxReq.java | 2 +- .../response/AccessTokenResponse.java} | 4 +- .../response/AppTokenResponse.java} | 4 +- .../response/AsstactentryResp.java | 2 +- .../response/BaseResponse.java | 2 +- .../response/FsspDataResponse.java} | 4 +- .../response/FsspResponse.java} | 6 +- .../response/ListgridviewapResp.java | 2 +- .../response/PzResp.java | 2 +- .../response/TokenResponse.java} | 4 +- .../module/fssp/response/DzhdxxResp.java | 126 ----------------- .../module/fssp/response/YhjymxResp.java | 132 ------------------ .../client/FsspHttpClient.java | 6 +- .../config/FsspConfig.java | 2 +- .../{fssp => externalApi}/entity/LngJkRp.java | 2 +- .../entity/LngJkRpBill.java | 2 +- .../handler/FsspJobHandler.java | 42 +++--- .../mapper/LngJkRpBillMapper.java | 4 +- .../mapper/LngJkRpMapper.java | 4 +- .../service/LngJkRpBillService.java | 4 +- .../service/LngJkRpService.java | 4 +- .../service/impl/LngJkRpBillServiceImpl.java | 8 +- .../service/impl/LngJkRpServiceImpl.java | 8 +- 31 files changed, 67 insertions(+), 326 deletions(-) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/callback/FsspCallback.java (88%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/dto/LngJkRpBillDto.java (97%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/dto/LngJkRpDto.java (98%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/request/AccessTokenReq.java (91%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/request/AppTokenReq.java (90%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/request/FsspDzhdfjReq.java (81%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/request/FsspDzhdxxReq.java (92%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/request/FsspPzReq.java (92%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/request/FsspYhjymxReq.java (93%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp/response/AccessTokenResp.java => externalApi/response/AccessTokenResponse.java} (86%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp/response/AppTokenResp.java => externalApi/response/AppTokenResponse.java} (83%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/response/AsstactentryResp.java (84%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/response/BaseResponse.java (87%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp/response/FsspDataResp.java => externalApi/response/FsspDataResponse.java} (87%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp/response/FsspResp.java => externalApi/response/FsspResponse.java} (78%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/response/ListgridviewapResp.java (97%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp => externalApi}/response/PzResp.java (97%) rename itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/{fssp/response/TokenResp.java => externalApi/response/TokenResponse.java} (85%) delete mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/DzhdxxResp.java delete mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/YhjymxResp.java rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/client/FsspHttpClient.java (93%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/config/FsspConfig.java (93%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/entity/LngJkRp.java (99%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/entity/LngJkRpBill.java (99%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/handler/FsspJobHandler.java (88%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/mapper/LngJkRpBillMapper.java (76%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/mapper/LngJkRpMapper.java (76%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/service/LngJkRpBillService.java (79%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/service/LngJkRpService.java (79%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/service/impl/LngJkRpBillServiceImpl.java (60%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/{fssp => externalApi}/service/impl/LngJkRpServiceImpl.java (61%) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/callback/FsspCallback.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/callback/FsspCallback.java similarity index 88% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/callback/FsspCallback.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/callback/FsspCallback.java index 65aafa2..729ef4c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/callback/FsspCallback.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/callback/FsspCallback.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.callback; +package com.xjrsoft.module.externalApi.callback; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/dto/LngJkRpBillDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/dto/LngJkRpBillDto.java similarity index 97% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/dto/LngJkRpBillDto.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/dto/LngJkRpBillDto.java index 432e4e3..7e330e8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/dto/LngJkRpBillDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/dto/LngJkRpBillDto.java @@ -1,7 +1,6 @@ -package com.xjrsoft.module.fssp.dto; +package com.xjrsoft.module.externalApi.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/dto/LngJkRpDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/dto/LngJkRpDto.java similarity index 98% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/dto/LngJkRpDto.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/dto/LngJkRpDto.java index 329fbfa..68c0a43 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/dto/LngJkRpDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/dto/LngJkRpDto.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.dto; +package com.xjrsoft.module.externalApi.dto; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/AccessTokenReq.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/AccessTokenReq.java similarity index 91% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/AccessTokenReq.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/AccessTokenReq.java index bcfbcc2..5dee193 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/AccessTokenReq.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/AccessTokenReq.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.request; +package com.xjrsoft.module.externalApi.request; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/AppTokenReq.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/AppTokenReq.java similarity index 90% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/AppTokenReq.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/AppTokenReq.java index dfeff0f..69bab56 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/AppTokenReq.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/AppTokenReq.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.request; +package com.xjrsoft.module.externalApi.request; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspDzhdfjReq.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspDzhdfjReq.java similarity index 81% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspDzhdfjReq.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspDzhdfjReq.java index 0573889..c983c94 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspDzhdfjReq.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspDzhdfjReq.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.request; +package com.xjrsoft.module.externalApi.request; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspDzhdxxReq.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspDzhdxxReq.java similarity index 92% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspDzhdxxReq.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspDzhdxxReq.java index 1a163f2..f1cbc35 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspDzhdxxReq.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspDzhdxxReq.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.request; +package com.xjrsoft.module.externalApi.request; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspPzReq.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspPzReq.java similarity index 92% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspPzReq.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspPzReq.java index 6c68472..1080af0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspPzReq.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspPzReq.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.request; +package com.xjrsoft.module.externalApi.request; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspYhjymxReq.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspYhjymxReq.java similarity index 93% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspYhjymxReq.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspYhjymxReq.java index 8dc1486..e94e034 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/request/FsspYhjymxReq.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/request/FsspYhjymxReq.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.request; +package com.xjrsoft.module.externalApi.request; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AccessTokenResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AccessTokenResponse.java similarity index 86% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AccessTokenResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AccessTokenResponse.java index e141c9a..e1562e4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AccessTokenResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AccessTokenResponse.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; * 应用令牌响应类，用于封装应用令牌接口返回的数据 */ @Data -public class AccessTokenResp { +public class AccessTokenResponse { // 请求是否成功的标识，true或false private String success; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AppTokenResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AppTokenResponse.java similarity index 83% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AppTokenResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AppTokenResponse.java index 7438efd..86d76fb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AppTokenResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AppTokenResponse.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; * 应用令牌响应类，用于封装应用令牌接口返回的数据 */ @Data -public class AppTokenResp { +public class AppTokenResponse { // 请求是否成功的标识，true或false private String success; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AsstactentryResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AsstactentryResp.java similarity index 84% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AsstactentryResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AsstactentryResp.java index 1a24155..bddf85c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/AsstactentryResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/AsstactentryResp.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/BaseResponse.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/BaseResponse.java similarity index 87% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/BaseResponse.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/BaseResponse.java index caf68ca..232672a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/BaseResponse.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/BaseResponse.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; /** * FsspResponse 接口，用于定义从联邦服务安全平台(FSSP)获取响应的基本结构 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/FsspDataResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/FsspDataResponse.java similarity index 87% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/FsspDataResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/FsspDataResponse.java index 8933a83..28ebc99 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/FsspDataResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/FsspDataResponse.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import lombok.Data; @@ -9,7 +9,7 @@ import java.util.List; * @param 泛型类型，表示分页数据中列表元素的类型 */ @Data -public class FsspDataResp { +public class FsspDataResponse { // 是否最后一页 private Boolean lastPage; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/FsspResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/FsspResponse.java similarity index 78% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/FsspResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/FsspResponse.java index 35555c1..f16374e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/FsspResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/FsspResponse.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import lombok.Data; @@ -7,7 +7,7 @@ import lombok.Data; * 该接口提供了一个方法来判断请求是否成功执行 */ @Data -public class FsspResp implements BaseResponse { +public class FsspResponse implements BaseResponse { // 响应状态,true、false private String success; @@ -19,7 +19,7 @@ public class FsspResp implements BaseResponse { private String message; // 响应数据，泛型类型 - private FsspDataResp data; + private FsspDataResponse data; @Override public boolean isSuccess() { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/ListgridviewapResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/ListgridviewapResp.java similarity index 97% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/ListgridviewapResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/ListgridviewapResp.java index 37b8b98..756d18a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/ListgridviewapResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/ListgridviewapResp.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/PzResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/PzResp.java similarity index 97% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/PzResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/PzResp.java index 46954fd..597bb62 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/PzResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/PzResp.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/TokenResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/TokenResponse.java similarity index 85% rename from itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/TokenResp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/TokenResponse.java index be405cd..735242c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/TokenResp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/externalApi/response/TokenResponse.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.response; +package com.xjrsoft.module.externalApi.response; import lombok.Data; @@ -7,7 +7,7 @@ import lombok.Data; * @param 泛型类型，表示响应数据的具体类型 */ @Data -public class TokenResp implements BaseResponse { +public class TokenResponse implements BaseResponse { // 响应状态 private String state; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/DzhdxxResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/DzhdxxResp.java deleted file mode 100644 index 530a36c..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/DzhdxxResp.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.xjrsoft.module.fssp.response; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 应用令牌响应类，用于封装应用令牌接口返回的数据 - */ -@Data -public class DzhdxxResp { - - /** - * 电子回单id - */ - private String id; - - /** - * 单据编号 - */ - private String billno; - - /** - * 资金组织编码, 公司三字码 - */ - private String orgNumber; - - /** - * 资金组织名称 - */ - private String orgName; - - /** - * 交易日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime bizdate; - - /** - * 币别代码 - */ - private String currencyNumber; - - /** - * 币别名称 - */ - private String currency; - - /** - * 银行账号 - */ - private String accountbankNumber; - - /** - * 银行账户名称 - */ - private String accountbank; - - /** - * 明细交易时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime detaildatetime; - - /** - * 摘要 - */ - private String description; - - /** - * 业务类型, 1：普通 2：上划 3：下拨 - */ - private String biztype; - - /** - * 业务参考号 - */ - private String bizrefno; - - /** - * 付款金额 - */ - private BigDecimal debitamount; - - /** - * 收款金额 - */ - private BigDecimal creditamount; - - /** - * 对方单位 - */ - private String oppunit; - - /** - * 对方账号 - */ - private String oppbanknumber; - - /** - * 对方开户行 - */ - private String oppbank; - - /** - * 明细流水号 - */ - private String detailid; - - /** - * 电子回单号 - */ - private String receiptno; - - /** - * 对账标识码 - */ - private String bankcheckflag; - - /** - * 回单路径文件名 - */ - private String filepath; -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/YhjymxResp.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/YhjymxResp.java deleted file mode 100644 index 3d8eebd..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/fssp/response/YhjymxResp.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.xjrsoft.module.fssp.response; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 应用令牌响应类，用于封装应用令牌接口返回的数据 - */ -@Data -public class YhjymxResp { - - /** - * 交易明细id - */ - private String id; - - /** - * 交易明细编号 - */ - private String billno; - - /** - * 资金组织编码, 公司三字码 - */ - private String orgNumber; - - /** - * 资金组织名称 - */ - private String orgName; - - /** - * 交易日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime bizdate; - - /** - * 记账日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime transdate; - - /** - * 币别代码 - */ - private String currencyNumber; - - /** - * 币别名称 - */ - private String currency; - - /** - * 银行账号 - */ - private String accountbankNumber; - - /** - * 银行账户名称 - */ - private String accountbank; - - /** - * 交易时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime biztime; - - /** - * 摘要 - */ - private String description; - - /** - * 业务类型, 1：普通 2：上划 3：下拨 - */ - private String biztype; - - /** - * 业务参考号 - */ - private String bizrefno; - - /** - * 付款金额 - */ - private BigDecimal debitamount; - - /** - * 收款金额 - */ - private BigDecimal creditamount; - - /** - * 余额 - */ - private BigDecimal transbalance; - - /** - * 对方户名 - */ - private String oppunit; - - /** - * 对方账号 - */ - private String oppbanknumber; - - /** - * 对方开户行 - */ - private String oppbank; - - /** - * 对账标识码 - */ - private String bankcheckflag; - - /** - * 电子回单号 - */ - private String receiptno; - - /** - * 明细流水号 - */ - private String detailid; -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/client/FsspHttpClient.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/client/FsspHttpClient.java similarity index 93% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/client/FsspHttpClient.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/client/FsspHttpClient.java index 905b8c5..8896518 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/client/FsspHttpClient.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/client/FsspHttpClient.java @@ -1,9 +1,9 @@ -package com.xjrsoft.module.fssp.client; +package com.xjrsoft.module.externalApi.client; import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; -import com.xjrsoft.module.fssp.callback.FsspCallback; -import com.xjrsoft.module.fssp.response.BaseResponse; +import com.xjrsoft.module.externalApi.callback.FsspCallback; +import com.xjrsoft.module.externalApi.response.BaseResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; import org.springframework.stereotype.Component; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/config/FsspConfig.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/config/FsspConfig.java similarity index 93% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/config/FsspConfig.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/config/FsspConfig.java index 3811252..edeb4df 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/config/FsspConfig.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/config/FsspConfig.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.config; +package com.xjrsoft.module.externalApi.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/entity/LngJkRp.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/entity/LngJkRp.java similarity index 99% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/entity/LngJkRp.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/entity/LngJkRp.java index 6b6699b..1b6acb5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/entity/LngJkRp.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/entity/LngJkRp.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.entity; +package com.xjrsoft.module.externalApi.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/entity/LngJkRpBill.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/entity/LngJkRpBill.java similarity index 99% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/entity/LngJkRpBill.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/entity/LngJkRpBill.java index 1ded37b..46888bf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/entity/LngJkRpBill.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/entity/LngJkRpBill.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.entity; +package com.xjrsoft.module.externalApi.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/handler/FsspJobHandler.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/handler/FsspJobHandler.java similarity index 88% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/handler/FsspJobHandler.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/handler/FsspJobHandler.java index 6bf2e60..994a537 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/handler/FsspJobHandler.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/handler/FsspJobHandler.java @@ -1,4 +1,4 @@ -package com.xjrsoft.module.fssp.handler; +package com.xjrsoft.module.externalApi.handler; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,16 +8,16 @@ import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.utils.CollectionUtils; import com.xjrsoft.common.utils.RedisUtil; -import com.xjrsoft.module.fssp.client.FsspHttpClient; -import com.xjrsoft.module.fssp.config.FsspConfig; -import com.xjrsoft.module.fssp.dto.LngJkRpBillDto; -import com.xjrsoft.module.fssp.dto.LngJkRpDto; -import com.xjrsoft.module.fssp.entity.LngJkRp; -import com.xjrsoft.module.fssp.entity.LngJkRpBill; -import com.xjrsoft.module.fssp.request.*; -import com.xjrsoft.module.fssp.response.*; -import com.xjrsoft.module.fssp.service.LngJkRpBillService; -import com.xjrsoft.module.fssp.service.LngJkRpService; +import com.xjrsoft.module.externalApi.client.FsspHttpClient; +import com.xjrsoft.module.externalApi.config.FsspConfig; +import com.xjrsoft.module.externalApi.dto.LngJkRpBillDto; +import com.xjrsoft.module.externalApi.dto.LngJkRpDto; +import com.xjrsoft.module.externalApi.entity.LngJkRp; +import com.xjrsoft.module.externalApi.entity.LngJkRpBill; +import com.xjrsoft.module.externalApi.request.*; +import com.xjrsoft.module.externalApi.response.*; +import com.xjrsoft.module.externalApi.service.LngJkRpBillService; +import com.xjrsoft.module.externalApi.service.LngJkRpService; import com.xjrsoft.module.system.client.IFileClient; import com.xjrsoft.module.system.dto.FileUploadDto; import com.xjrsoft.module.system.vo.LngFileUploadVo; @@ -71,8 +71,8 @@ public class FsspJobHandler { appTokenReq.setAccountId(config.getAccountId()); appTokenReq.setLanguage(config.getLanguage()); AtomicReference appToken = new AtomicReference<>(); - FsspHttpClient.post(appTokenReq, config.getAppTokenUrl(), TokenResp.class, resp -> { - AppTokenResp data = (AppTokenResp) resp.getData(); + FsspHttpClient.post(appTokenReq, config.getAppTokenUrl(), TokenResponse.class, resp -> { + AppTokenResponse data = (AppTokenResponse) resp.getData(); if ("0".equals(data.getErrorCode())) { appToken.set(data.getAppToken()); redisUtil.set(FSSP_APP_TOKEN, data.getAppToken(), data.getExpireTime()); @@ -93,8 +93,8 @@ public class FsspJobHandler { accessTokenReq.setUsertype(config.getUsertype()); accessTokenReq.setLanguage(config.getLanguage()); AtomicReference accessToken = new AtomicReference<>(); - FsspHttpClient.post(accessTokenReq, config.getLoginUrl(), TokenResp.class, resp -> { - AccessTokenResp data = (AccessTokenResp) resp.getData(); + FsspHttpClient.post(accessTokenReq, config.getLoginUrl(), TokenResponse.class, resp -> { + AccessTokenResponse data = (AccessTokenResponse) resp.getData(); if ("0".equals(data.getErrorCode())) { accessToken.set(data.getAccessToken()); redisUtil.set(FSSP_ACCESS_TOKEN, data.getAccessToken(), data.getExpireTime()); @@ -121,8 +121,8 @@ public class FsspJobHandler { Map headers = Maps.newHashMap(); String accesstoken = redisUtil.get(FSSP_ACCESS_TOKEN); headers.put(ACCESSTOKEN, StringUtils.isNotBlank(accesstoken) ? accesstoken : this.getAccessToken()); - FsspHttpClient.post(fsspYhjymxReq, config.getYhjymxUrl(), FsspResp.class, headers, resp -> { - FsspDataResp data = resp.getData(); + FsspHttpClient.post(fsspYhjymxReq, config.getYhjymxUrl(), FsspResponse.class, headers, resp -> { + FsspDataResponse data = resp.getData(); if (data != null) { data.getRows().forEach(row -> { LngJkRpDto lngJkRpDto = (LngJkRpDto) row; @@ -157,8 +157,8 @@ public class FsspJobHandler { Map headers = Maps.newHashMap(); String accesstoken = redisUtil.get(FSSP_ACCESS_TOKEN); headers.put(ACCESSTOKEN, StringUtils.isNotBlank(accesstoken) ? accesstoken : this.getAccessToken()); - FsspHttpClient.post(fsspDzhdxxReq, config.getDzhdxxUrl(), FsspResp.class, headers, resp -> { - FsspDataResp data = resp.getData(); + FsspHttpClient.post(fsspDzhdxxReq, config.getDzhdxxUrl(), FsspResponse.class, headers, resp -> { + FsspDataResponse data = resp.getData(); if (data != null) { data.getRows().forEach(row -> { LngJkRpBillDto lngJkRpBillDto = (LngJkRpBillDto) row; @@ -230,8 +230,8 @@ public class FsspJobHandler { Map headers = Maps.newHashMap(); String accesstoken = redisUtil.get(FSSP_ACCESS_TOKEN); headers.put(ACCESSTOKEN, StringUtils.isNotBlank(accesstoken) ? accesstoken : this.getAccessToken()); - FsspHttpClient.post(fsspPzReq, config.getPzUrl(), FsspResp.class, headers, resp -> { - FsspDataResp data = resp.getData(); + FsspHttpClient.post(fsspPzReq, config.getPzUrl(), FsspResponse.class, headers, resp -> { + FsspDataResponse data = resp.getData(); data.getRows().forEach(row -> { PzResp pzResp = (PzResp) row; list.add(pzResp); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/mapper/LngJkRpBillMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/mapper/LngJkRpBillMapper.java similarity index 76% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/mapper/LngJkRpBillMapper.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/mapper/LngJkRpBillMapper.java index 38cc67f..4d9372e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/mapper/LngJkRpBillMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/mapper/LngJkRpBillMapper.java @@ -1,8 +1,8 @@ -package com.xjrsoft.module.fssp.mapper; +package com.xjrsoft.module.externalApi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; -import com.xjrsoft.module.fssp.entity.LngJkRpBill; +import com.xjrsoft.module.externalApi.entity.LngJkRpBill; import org.apache.ibatis.annotations.Mapper; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/mapper/LngJkRpMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/mapper/LngJkRpMapper.java similarity index 76% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/mapper/LngJkRpMapper.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/mapper/LngJkRpMapper.java index 1122ec0..3916925 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/mapper/LngJkRpMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/mapper/LngJkRpMapper.java @@ -1,8 +1,8 @@ -package com.xjrsoft.module.fssp.mapper; +package com.xjrsoft.module.externalApi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; -import com.xjrsoft.module.fssp.entity.LngJkRp; +import com.xjrsoft.module.externalApi.entity.LngJkRp; import org.apache.ibatis.annotations.Mapper; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/LngJkRpBillService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/LngJkRpBillService.java similarity index 79% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/LngJkRpBillService.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/LngJkRpBillService.java index de601bb..6574c60 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/LngJkRpBillService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/LngJkRpBillService.java @@ -1,9 +1,9 @@ -package com.xjrsoft.module.fssp.service; +package com.xjrsoft.module.externalApi.service; import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; -import com.xjrsoft.module.fssp.entity.LngJkRpBill; +import com.xjrsoft.module.externalApi.entity.LngJkRpBill; /** * @title: service diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/LngJkRpService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/LngJkRpService.java similarity index 79% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/LngJkRpService.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/LngJkRpService.java index 2f32349..23bb9db 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/LngJkRpService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/LngJkRpService.java @@ -1,9 +1,9 @@ -package com.xjrsoft.module.fssp.service; +package com.xjrsoft.module.externalApi.service; import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; -import com.xjrsoft.module.fssp.entity.LngJkRp; +import com.xjrsoft.module.externalApi.entity.LngJkRp; /** * @title: service diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/impl/LngJkRpBillServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/impl/LngJkRpBillServiceImpl.java similarity index 60% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/impl/LngJkRpBillServiceImpl.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/impl/LngJkRpBillServiceImpl.java index e513f29..706c6b0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/impl/LngJkRpBillServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/impl/LngJkRpBillServiceImpl.java @@ -1,9 +1,9 @@ -package com.xjrsoft.module.fssp.service.impl; +package com.xjrsoft.module.externalApi.service.impl; import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.fssp.entity.LngJkRpBill; -import com.xjrsoft.module.fssp.mapper.LngJkRpBillMapper; -import com.xjrsoft.module.fssp.service.LngJkRpBillService; +import com.xjrsoft.module.externalApi.entity.LngJkRpBill; +import com.xjrsoft.module.externalApi.mapper.LngJkRpBillMapper; +import com.xjrsoft.module.externalApi.service.LngJkRpBillService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/impl/LngJkRpServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/impl/LngJkRpServiceImpl.java similarity index 61% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/impl/LngJkRpServiceImpl.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/impl/LngJkRpServiceImpl.java index 79d09f0..eef1395 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/fssp/service/impl/LngJkRpServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/externalApi/service/impl/LngJkRpServiceImpl.java @@ -1,9 +1,9 @@ -package com.xjrsoft.module.fssp.service.impl; +package com.xjrsoft.module.externalApi.service.impl; import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.fssp.entity.LngJkRp; -import com.xjrsoft.module.fssp.mapper.LngJkRpMapper; -import com.xjrsoft.module.fssp.service.LngJkRpService; +import com.xjrsoft.module.externalApi.entity.LngJkRp; +import com.xjrsoft.module.externalApi.mapper.LngJkRpMapper; +import com.xjrsoft.module.externalApi.service.LngJkRpService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service;