From 11af6525c78f401f8e7ca1100417adf90415586e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 06 十一月 2024 17:27:45 +0800
Subject: [PATCH] 陕西2024版接口-测试调整
---
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 5aa686b..ef89135 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -1,7 +1,6 @@
package com.fzzy.push.nx2023;
import com.alibaba.fastjson.JSON;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -11,7 +10,6 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.nx2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -70,10 +68,8 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- String inteId = param.getInteId();
String kqdm = param.getKqdm();
- //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
@@ -83,12 +79,8 @@
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
- //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())
- || Constant.API_CODE_1114_1502.equals(param.getInteId())
- || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
- inteId = Constant.API_CODE_1114;
- }
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
apiLog.setInteId(inteId);
if (StringUtils.isEmpty(inteId)) {
@@ -135,7 +127,7 @@
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
- Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
+ Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData));
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
@@ -189,43 +181,69 @@
*/
private Object getJsonApiData(String inteId, Object data) {
if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {
-
+ Api1101 apiData = (Api1101)data;
Nx2023Api1101 api1101 = new Nx2023Api1101();
- BeanUtils.copyProperties(data, api1101);
+ BeanUtils.copyProperties(apiData, api1101);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1101.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1101.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1101.getSjdwtybm()) && StringUtils.isNotEmpty(apiData.getSjdwdm())) {
+ String sjdwtybm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1101.setSjdwtybm(sjdwtybm);
+ }
return api1101;
}
if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
+ Api1102 apiData = (Api1102)data;
Nx2023Api1102 api1102 = new Nx2023Api1102();
- BeanUtils.copyProperties(data, api1102);
- api1102.setLkxz("1");
+ BeanUtils.copyProperties(apiData, api1102);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1102.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1102.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1102.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1102.setTydwbm(tydwbm);
+ }
return api1102;
}
if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {
-
+ Api1103 apiData = (Api1103)data;
Nx2023Api1103 api1103 = new Nx2023Api1103();
- BeanUtils.copyProperties(data, api1103);
+ BeanUtils.copyProperties(apiData, api1103);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1103.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1103.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1103.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ api1103.setTycfbm(tycfbm);
+ }
return api1103;
}
if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {
-
Nx2023Api1104 api1104 = new Nx2023Api1104();
BeanUtils.copyProperties(data, api1104);
return api1104;
}
if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {
-
Nx2023Api1105 api1105 = new Nx2023Api1105();
BeanUtils.copyProperties(data, api1105);
return api1105;
}
if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {
-
Nx2023Api1106 api1106 = new Nx2023Api1106();
BeanUtils.copyProperties(data, api1106);
return api1106;
}
if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {
-
Nx2023Api1107 api1107 = new Nx2023Api1107();
BeanUtils.copyProperties(data, api1107);
return api1107;
@@ -255,8 +273,9 @@
return api1111;
}
if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) {
+ Api1112 apiData = (Api1112) data;
Nx2023Api1112 api1112 = new Nx2023Api1112();
- BeanUtils.copyProperties(data, api1112);
+ BeanUtils.copyProperties(apiData, api1112);
return api1112;
}
if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) {
@@ -265,8 +284,9 @@
return api1113;
}
if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) {
+ Api1201 apiData = (Api1201) data;
Nx2023Api1201 api1201 = new Nx2023Api1201();
- BeanUtils.copyProperties(data, api1201);
+ BeanUtils.copyProperties(apiData, api1201);
return api1201;
}
if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
@@ -291,8 +311,9 @@
return api1205;
}
if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
+ Api1206 apiData = (Api1206) data;
Nx2023Api1206 api1206 = new Nx2023Api1206();
- BeanUtils.copyProperties(data, api1206);
+ BeanUtils.copyProperties(apiData, api1206);
return api1206;
}
if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
@@ -409,6 +430,24 @@
}
/**
+ * 鑾峰彇涓婁紶鐨勬帴鍙ｇ紪鐮�
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ if (NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ return inteId;
+ }
+
+ /**
* 璧嬪�兼渶鍚庢洿鏂版椂闂�
* @param object
* @return
@@ -448,6 +487,7 @@
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1503.getDwdm());
nxFinanceDto.setKqdm(api1503.getKqdm());
+
nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("03");
nxFinanceDto.setCzbz(api1503.getCzbz());
--
Gitblit v1.9.3