From 65d297b263d224e2d84d4d2ab941da36544e8d23 Mon Sep 17 00:00:00 2001 From: wanghc <2466022993@qq.com> Date: Wed, 08 Mar 2023 17:45:09 +0800 Subject: [PATCH] 浦发分行账单服务对外接口调整 --- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/BillServiceImpl.java | 4 ++-- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspTranQryType.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/PublicController.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/IBillService.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspPymtTrnRsltQryType.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/bill/BillApiRespVo.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspWHPymtTrnRsltQryType.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/ITradeService.java | 4 ++-- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/wsdl/ESBServerPortType.java | 8 ++++---- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/TradeServiceImpl.java | 4 ++-- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/TradeController.java | 6 +++--- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/SubSvcRetInfoType.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/BillController.java | 3 +-- cmci-pfcs-gateway/src/test/java/com/jttech/pfcs/services/WsdlTest.java | 4 ++-- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspEPCSnglTranType.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/util/ObjectFactory.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/ResponseVo.java | 2 +- cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspSvcHeaderType.java | 2 +- 18 files changed, 27 insertions(+), 28 deletions(-) diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/BillController.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/BillController.java index 9bfe38b..18d4beb 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/BillController.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/BillController.java @@ -10,8 +10,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.jttech.pfcs.services.IPublicService; -import com.jttech.pfcs.vo.ResponseVo; +import com.jttech.pfcs.vo.resp.ResponseVo; /** * 账单 diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/PublicController.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/PublicController.java index f196723..56c268c 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/PublicController.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/PublicController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; import com.jttech.pfcs.services.IPublicService; -import com.jttech.pfcs.vo.ResponseVo; +import com.jttech.pfcs.vo.resp.ResponseVo; /** * @author wanghc diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/TradeController.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/TradeController.java index da0fc6f..871d168 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/TradeController.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/controller/TradeController.java @@ -1,11 +1,11 @@ package com.jttech.pfcs.controller; import com.jttech.pfcs.services.ITradeService; -import com.jttech.pfcs.vo.ResponseVo; +import com.jttech.pfcs.vo.resp.ResponseVo; import com.jttech.pfcs.vo.req.trade.ReqEPCSnglTranType; import com.jttech.pfcs.vo.req.trade.ReqTranQryType; -import com.jttech.pfcs.vo.resp.RspEPCSnglTranType; -import com.jttech.pfcs.vo.resp.RspTranQryType; +import com.jttech.pfcs.vo.resp.trade.RspEPCSnglTranType; +import com.jttech.pfcs.vo.resp.trade.RspTranQryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/IBillService.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/IBillService.java index d9b71a9..cbbfb48 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/IBillService.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/IBillService.java @@ -1,6 +1,6 @@ package com.jttech.pfcs.services; -import com.jttech.pfcs.vo.ResponseVo; +import com.jttech.pfcs.vo.resp.ResponseVo; import com.jttech.pfcs.vo.req.bill.BillApiReqVo; /** diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/ITradeService.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/ITradeService.java index 3c71245..31c2b36 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/ITradeService.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/ITradeService.java @@ -2,8 +2,8 @@ import com.jttech.pfcs.vo.req.trade.ReqEPCSnglTranType; import com.jttech.pfcs.vo.req.trade.ReqTranQryType; -import com.jttech.pfcs.vo.resp.RspEPCSnglTranType; -import com.jttech.pfcs.vo.resp.RspTranQryType; +import com.jttech.pfcs.vo.resp.trade.RspEPCSnglTranType; +import com.jttech.pfcs.vo.resp.trade.RspTranQryType; /** * @author wanghc diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/BillServiceImpl.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/BillServiceImpl.java index fdacb7a..79d9963 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/BillServiceImpl.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/BillServiceImpl.java @@ -8,9 +8,9 @@ import com.alibaba.fastjson.JSONObject; import com.jttech.pfcs.services.IBillService; -import com.jttech.pfcs.vo.ResponseVo; +import com.jttech.pfcs.vo.resp.ResponseVo; import com.jttech.pfcs.vo.req.bill.BillApiReqVo; -import com.jttech.pfcs.vo.req.bill.BillApiRespVo; +import com.jttech.pfcs.vo.resp.bill.BillApiRespVo; import okhttp3.*; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/TradeServiceImpl.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/TradeServiceImpl.java index 45f31c8..dc161af 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/TradeServiceImpl.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/impl/TradeServiceImpl.java @@ -5,8 +5,8 @@ import com.jttech.pfcs.services.wsdl.S080030795; import com.jttech.pfcs.vo.req.trade.ReqEPCSnglTranType; import com.jttech.pfcs.vo.req.trade.ReqTranQryType; -import com.jttech.pfcs.vo.resp.RspEPCSnglTranType; -import com.jttech.pfcs.vo.resp.RspTranQryType; +import com.jttech.pfcs.vo.resp.trade.RspEPCSnglTranType; +import com.jttech.pfcs.vo.resp.trade.RspTranQryType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/wsdl/ESBServerPortType.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/wsdl/ESBServerPortType.java index 2c50c42..1c02a88 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/wsdl/ESBServerPortType.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/services/wsdl/ESBServerPortType.java @@ -5,10 +5,10 @@ import com.jttech.pfcs.vo.req.trade.ReqPymtTrnRsltQryType; import com.jttech.pfcs.vo.req.trade.ReqTranQryType; import com.jttech.pfcs.vo.req.trade.ReqWHPymtTrnRsltQryType; -import com.jttech.pfcs.vo.resp.RspEPCSnglTranType; -import com.jttech.pfcs.vo.resp.RspPymtTrnRsltQryType; -import com.jttech.pfcs.vo.resp.RspTranQryType; -import com.jttech.pfcs.vo.resp.RspWHPymtTrnRsltQryType; +import com.jttech.pfcs.vo.resp.trade.RspEPCSnglTranType; +import com.jttech.pfcs.vo.resp.trade.RspPymtTrnRsltQryType; +import com.jttech.pfcs.vo.resp.trade.RspTranQryType; +import com.jttech.pfcs.vo.resp.trade.RspWHPymtTrnRsltQryType; import javax.jws.WebMethod; import javax.jws.WebParam; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/util/ObjectFactory.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/util/ObjectFactory.java index af6eea5..58f0129 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/util/ObjectFactory.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/util/ObjectFactory.java @@ -9,7 +9,7 @@ import com.jttech.pfcs.metadata.ReqHeaderType; import com.jttech.pfcs.metadata.RspHeaderType; import com.jttech.pfcs.vo.req.trade.*; -import com.jttech.pfcs.vo.resp.*; +import com.jttech.pfcs.vo.resp.trade.*; /** diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/ResponseVo.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/ResponseVo.java similarity index 97% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/ResponseVo.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/ResponseVo.java index 62e2000..2ddf3d4 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/ResponseVo.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/ResponseVo.java @@ -1,4 +1,4 @@ -package com.jttech.pfcs.vo; +package com.jttech.pfcs.vo.resp; import java.io.Serializable; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/req/bill/BillApiRespVo.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/bill/BillApiRespVo.java similarity index 98% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/req/bill/BillApiRespVo.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/bill/BillApiRespVo.java index 3b2d852..bd10fa0 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/req/bill/BillApiRespVo.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/bill/BillApiRespVo.java @@ -1,4 +1,4 @@ -package com.jttech.pfcs.vo.req.bill; +package com.jttech.pfcs.vo.resp.bill; import com.alibaba.fastjson.annotation.JSONField; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspEPCSnglTranType.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspEPCSnglTranType.java similarity index 99% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspEPCSnglTranType.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspEPCSnglTranType.java index ff26d8c..0872e12 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspEPCSnglTranType.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspEPCSnglTranType.java @@ -1,5 +1,5 @@ -package com.jttech.pfcs.vo.resp; +package com.jttech.pfcs.vo.resp.trade; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspPymtTrnRsltQryType.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspPymtTrnRsltQryType.java similarity index 98% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspPymtTrnRsltQryType.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspPymtTrnRsltQryType.java index bc63be1..e43a00d 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspPymtTrnRsltQryType.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspPymtTrnRsltQryType.java @@ -1,5 +1,5 @@ -package com.jttech.pfcs.vo.resp; +package com.jttech.pfcs.vo.resp.trade; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspSvcHeaderType.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspSvcHeaderType.java similarity index 99% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspSvcHeaderType.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspSvcHeaderType.java index b07bf4b..be7f6bf 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspSvcHeaderType.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspSvcHeaderType.java @@ -1,5 +1,5 @@ -package com.jttech.pfcs.vo.resp; +package com.jttech.pfcs.vo.resp.trade; import java.util.ArrayList; import java.util.List; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspTranQryType.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspTranQryType.java similarity index 99% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspTranQryType.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspTranQryType.java index d1fcad9..fe9b11c 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspTranQryType.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspTranQryType.java @@ -1,5 +1,5 @@ -package com.jttech.pfcs.vo.resp; +package com.jttech.pfcs.vo.resp.trade; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspWHPymtTrnRsltQryType.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspWHPymtTrnRsltQryType.java similarity index 98% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspWHPymtTrnRsltQryType.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspWHPymtTrnRsltQryType.java index 3d1165f..23c7cb7 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/RspWHPymtTrnRsltQryType.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/RspWHPymtTrnRsltQryType.java @@ -1,5 +1,5 @@ -package com.jttech.pfcs.vo.resp; +package com.jttech.pfcs.vo.resp.trade; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/SubSvcRetInfoType.java b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/SubSvcRetInfoType.java similarity index 98% rename from cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/SubSvcRetInfoType.java rename to cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/SubSvcRetInfoType.java index 3c192f9..2fc2b12 100644 --- a/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/SubSvcRetInfoType.java +++ b/cmci-pfcs-gateway/src/main/java/com/jttech/pfcs/vo/resp/trade/SubSvcRetInfoType.java @@ -1,5 +1,5 @@ -package com.jttech.pfcs.vo.resp; +package com.jttech.pfcs.vo.resp.trade; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/cmci-pfcs-gateway/src/test/java/com/jttech/pfcs/services/WsdlTest.java b/cmci-pfcs-gateway/src/test/java/com/jttech/pfcs/services/WsdlTest.java index 1cff65e..e37bab6 100644 --- a/cmci-pfcs-gateway/src/test/java/com/jttech/pfcs/services/WsdlTest.java +++ b/cmci-pfcs-gateway/src/test/java/com/jttech/pfcs/services/WsdlTest.java @@ -5,8 +5,8 @@ import com.jttech.pfcs.vo.req.trade.ReqEPCSnglTranType; import com.jttech.pfcs.vo.req.trade.ReqSvcHeaderType; import com.jttech.pfcs.vo.req.trade.ReqTranQryType; -import com.jttech.pfcs.vo.resp.RspEPCSnglTranType; -import com.jttech.pfcs.vo.resp.RspTranQryType; +import com.jttech.pfcs.vo.resp.trade.RspEPCSnglTranType; +import com.jttech.pfcs.vo.resp.trade.RspTranQryType; /** * @author wanghc -- Gitblit v1.8.0