From 2a1e25449eec1a3bb9cde0e3f25ede3134253bdc Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 05 六月 2024 18:25:06 +0800
Subject: [PATCH] 优化宁夏省平台-统一编码服务
---
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 55 +++++++++++++++++++++++----
src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java | 6 +++
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 643acbe..09d58ce 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -162,7 +162,7 @@
if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)
|| NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)
|| NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) {
- Object object = getJsonFinanceData(inteId, data);
+ Object object = getJsonFinanceData(inteId, data, conf);
return JSON.toJSONString(object);
} else {
List<Object> list = new ArrayList<>();
@@ -200,10 +200,11 @@
if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
Nx2023Api1102 api1102 = new Nx2023Api1102();
BeanUtils.copyProperties(data, api1102);
- api1102.setLkxz("1");
+ api1102.setLkxz(null);
//鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
api1102.setTykqbm(null);
+ api1102.setLkxz("1");
}
return api1102;
}
@@ -374,6 +375,7 @@
if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
api1205.setTyhwbm(tyhwbm);
+ api1205.setSzlx(null);
}
return api1205;
}
@@ -532,6 +534,7 @@
api1307.setCntxwjl(JSON.toJSONString(map));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ api1307.setTxwjhzm(null);
String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
api1307.setTykqbm(tykqbm);
String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
@@ -638,22 +641,34 @@
* @param data
* @return
*/
- private Object getJsonFinanceData(String inteId, Object data) {
+ private Object getJsonFinanceData(String inteId, Object data, ApiConfs conf) {
//璐㈠姟鎶ヨ〃鏁版嵁灏佽
if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) {
- return copyApi1501((Api1501) data);
+ return copyApi1501((Api1501) data, conf);
} else if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
- return copyApi1502((Api1502) data);
+ return copyApi1502((Api1502) data, conf);
} else {
- return copyApi1503((Api1503) data);
+ return copyApi1503((Api1503) data, conf);
}
}
- private List<NxFinanceDto> copyApi1503(Api1503 api1503) {
+ private List<NxFinanceDto> copyApi1503(Api1503 api1503, ApiConfs conf) {
List<NxFinanceDto> list = new ArrayList<>();
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1503.getDwdm());
nxFinanceDto.setKqdm(api1503.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm());
+ nxFinanceDto.setTydwbm(tydwbm);
+ }
+ if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm());
+ nxFinanceDto.setTykqbm(tykqbm);
+ }
+ }
+
nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("03");
nxFinanceDto.setCzbz(api1503.getCzbz());
@@ -700,11 +715,22 @@
return list;
}
- private List<NxFinanceDto> copyApi1502(Api1502 api1502) {
+ private List<NxFinanceDto> copyApi1502(Api1502 api1502, ApiConfs conf) {
List<NxFinanceDto> list = new ArrayList<>();
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1502.getDwdm());
nxFinanceDto.setKqdm(api1502.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm());
+ nxFinanceDto.setTydwbm(tydwbm);
+ }
+ if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm());
+ nxFinanceDto.setTykqbm(tykqbm);
+ }
+ }
nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("02");
nxFinanceDto.setCzbz(api1502.getCzbz());
@@ -753,11 +779,22 @@
return list;
}
- private List<NxFinanceDto> copyApi1501(Api1501 api1501) {
+ private List<NxFinanceDto> copyApi1501(Api1501 api1501, ApiConfs conf) {
List<NxFinanceDto> list = new ArrayList<>();
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1501.getDwdm());
nxFinanceDto.setKqdm(api1501.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm());
+ nxFinanceDto.setTydwbm(tydwbm);
+ }
+ if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm());
+ nxFinanceDto.setTykqbm(tykqbm);
+ }
+ }
nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("01");
nxFinanceDto.setCzbz(api1501.getCzbz());
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java b/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java
index 136c543..08b1e41 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java
@@ -11,9 +11,15 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鎶ヨ〃鏈熷彿")
private String bbsj;
--
Gitblit v1.9.3