From bccb2a6b67d31fd9bb846b2bc605a8b90c228033 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 24 五月 2024 18:18:41 +0800
Subject: [PATCH] 优化船运数据同步
---
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index d0bed5e..4abbd74 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -70,9 +70,9 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- if (Constant.API_CODE_1501.equals(param.getInteId())
- || Constant.API_CODE_1502.equals(param.getInteId())
- || Constant.API_CODE_1503.equals(param.getInteId())) {
+ 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())) {
return pushFinanceData(param, conf, data);
}
@@ -193,11 +193,11 @@
}
List<GDFinanceDto> list = null;
- if (Constant.API_CODE_1501.equals(param.getInteId())) {
+ if (Constant.API_CODE_1114_1501.equals(param.getInteId())) {
list = copyApi1501((Api1501) data);
- } else if (Constant.API_CODE_1502.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1114_1502.equals(param.getInteId())) {
list = copyApi1502((Api1502) data);
- } else if (Constant.API_CODE_1503.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1114_1503.equals(param.getInteId())) {
list = copyApi1503((Api1503) data);
}
GD2022ResponseDto responseDto;
@@ -520,6 +520,7 @@
}
if (Constant.API_CODE_1208.equals(inteId)) {
Gd2022Api1208 api1208 = new Gd2022Api1208();
+ BeanUtils.copyProperties(data, api1208);
//鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
if(null == api1208.getBclbs()){
api1208.setBclbs(0);
@@ -537,7 +538,6 @@
String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
api1208.setTyhwbm(tyhwbm);
}
- BeanUtils.copyProperties(data, api1208);
return JSON.toJSONString(api1208);
}
if (Constant.API_CODE_1209.equals(inteId)) {
@@ -704,9 +704,9 @@
if (Constant.API_CODE_1309.equals(inteId)) {
Api1309 apiData = (Api1309) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTydwbm())){
+ if(StringUtils.isEmpty(apiData.getWgdwtybm())){
String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
- apiData.setTydwbm(tydwbm);
+ apiData.setWgdwtybm(tydwbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
@@ -751,14 +751,15 @@
lcsl += gd2022Api1404.getLhsl();
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gd2022Api1404.getTyhwbm())){
+ if(StringUtils.isEmpty(gd2022Api1404.getLhhwtybm())){
String tyhwbm = apiCommonService.getTyhwbm(gd2022Api1404.getLhhwdm());
- gd2022Api1404.setTyhwbm(tyhwbm);
+ gd2022Api1404.setLhhwtybm(tyhwbm);
}
gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
dtls.add(gd2022Api1404);
}
}
+
api1403.setRotationInQty(lrsl);
api1403.setRotationOutQty(lcsl);
api1403.setDtls(dtls);
@@ -767,9 +768,9 @@
//璁剧疆涓婁紶鏂囦欢id
api1403.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1403.getTydwbm())){
+ if(StringUtils.isEmpty(api1403.getJhxddwtybm())){
String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
- api1403.setTydwbm(tydwbm);
+ api1403.setJhxddwtybm(tydwbm);
}
api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1403);
--
Gitblit v1.9.3