From 46ee5aac0c31c352f19344eb3cfd762817f2559e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 10 十月 2025 19:25:30 +0800
Subject: [PATCH] 优化上海接口日志打印
---
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 100 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 005b0fd..8f1ec15 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -16,6 +16,7 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023;
import com.fzzy.push.gd2023.dto.*;
import com.fzzy.push.gd2023.dto.Gd2023Api1101;
import lombok.Data;
@@ -28,6 +29,9 @@
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -69,9 +73,9 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- 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())) {
+ if (Constant.API_CODE_1501.equals(param.getInteId())
+ || Constant.API_CODE_1502.equals(param.getInteId())
+ || Constant.API_CODE_1503.equals(param.getInteId())) {
return pushFinanceData(param, conf, data);
}
@@ -192,11 +196,11 @@
}
List<GDFinanceDto> list = null;
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())) {
+ if (Constant.API_CODE_1501.equals(param.getInteId())) {
list = copyApi1501((Api1501) data);
- } else if (Constant.API_CODE_1114_1502.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1502.equals(param.getInteId())) {
list = copyApi1502((Api1502) data);
- } else if (Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1503.equals(param.getInteId())) {
list = copyApi1503((Api1503) data);
}
GD2023ResponseDto responseDto;
@@ -315,8 +319,7 @@
BeanUtils.copyProperties(data, api1102);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1102.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1102.getDwdm());
- api1102.setTydwbm(tydwbm);
+ api1102.setTydwbm(api1102.getTykqbm().substring(0, 20));
}
api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1102);
@@ -357,7 +360,8 @@
return JSON.toJSONString(api1105);
}
if (Constant.API_CODE_1106.equals(inteId)) {
- Gd2023Api1106 api1106 = (Gd2023Api1106) data;
+ Gd2023Api1106 api1106 = new Gd2023Api1106();
+ BeanUtils.copyProperties(data, api1106);
api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1106.getTykqbm())) {
@@ -375,8 +379,7 @@
api1107.setTykqbm(tykqbm);
}
if (StringUtils.isEmpty(api1107.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1107.getDwdm());
- api1107.setTydwbm(tydwbm);
+ api1107.setTydwbm(api1107.getTykqbm().substring(0, 20));
}
api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1107);
@@ -390,8 +393,7 @@
api1108.setTykqbm(tykqbm);
}
if (StringUtils.isEmpty(api1108.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1108.getDwdm());
- api1108.setTydwbm(tydwbm);
+ api1108.setTydwbm(api1108.getTykqbm().substring(0, 20));
}
api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1108);
@@ -430,8 +432,7 @@
api1110.setTykqbm(tyhwbm.substring(0, 22));
}
if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
- api1110.setTydwbm(tydwbm);
+ api1110.setTydwbm(api1110.getTykqbm().substring(0, 20));
}
api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1110);
@@ -446,7 +447,7 @@
api1111.setTykqbm(api1102List.getTykqbm());
}
if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
- api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getDwdm()));
+ api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
}
}
Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -459,8 +460,7 @@
api1111.setTykqbm(tykqbm);
}
if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
- api1111.setTydwbm(tydwbm);
+ api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
}
api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1111);
@@ -515,6 +515,9 @@
String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgsdwtybm(tydwbm);
}
+ if (StringUtils.isEmpty(apiData.getBzw())) {
+ apiData.setBzw("3");
+ }
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -548,6 +551,9 @@
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
+ if (StringUtils.isEmpty(apiData.getBzw())) {
+ apiData.setBzw("3");
+ }
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -558,6 +564,10 @@
if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
apiData.setTydwbm(tydwbm);
+ }
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
@@ -617,6 +627,8 @@
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
+ BigDecimal bigDecimal = BigDecimal.valueOf(apiData.getQzzrshde());
+ apiData.setQzzrshde(bigDecimal.setScale(3, RoundingMode.UP).doubleValue());
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -695,7 +707,7 @@
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 26));
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -807,6 +819,10 @@
String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
apiData.setWgdwtybm(tydwbm);
}
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -866,8 +882,8 @@
}
}
- api1403.setRotationInQty(lrsl);
- api1403.setRotationOutQty(lcsl);
+ api1403.setRotationInQty(Double.valueOf(String.format("%.3f",lrsl)));
+ api1403.setRotationOutQty(Double.valueOf(String.format("%.3f",lcsl)));
api1403.setDtls(dtls);
//鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
GD2023ResponseDto responseDto = GD2023HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
@@ -895,35 +911,25 @@
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
- if (com.fzzy.push.gd2023.ApiCodeConstant.API_2001.equals(inteId)) {
- Gd2023Api2001 apiData = new Gd2023Api2001();
- BeanUtils.copyProperties(data, apiData);
+ if (Constant.API_CODE_1213.equals(inteId)) {
+ Api1213 api1213 = (Api1213) data;
+ Gd2023Api1213 apiData = new Gd2023Api1213();
+ BeanUtils.copyProperties(api1213, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ apiData.setFcsl(api1213.getFcsl());
+ apiData.setFcsrq(api1213.getFcsqr());
return JSON.toJSONString(apiData);
}
- if (com.fzzy.push.gd2023.ApiCodeConstant.API_2002.equals(inteId)) {
- Gd2023Api2002 apiData = new Gd2023Api2002();
- BeanUtils.copyProperties(data, apiData);
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
- apiData.setTyajbm(tyajbm);
- }
+ //鐔忚捀澶囨
+ if (Constant.API_CODE_9201.equals(inteId)) {
+ Api9201 api9201 = (Api9201) data;
+ Gd2023Api1023 apiData = new Gd2023Api1023();
+ BeanUtils.copyProperties(api9201, apiData);
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -1219,6 +1225,8 @@
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_ZMKCXX;
case "1212":
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_KHXX;
+ case "1213":
+ return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_FCQRD;
case "1301":
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_AQGL;
case "1302":
@@ -1255,7 +1263,7 @@
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_CWBBXX;
case "1503":
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_CWBBXX;
- case "1023":
+ case "9201":
return ApiCodeConstant.API_CODE_XZBA;
default:
return inteId;
--
Gitblit v1.9.3