From 1e0ffb4026328506fa3fe77fc6d9554dc667b681 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 08 十一月 2024 16:59:02 +0800
Subject: [PATCH] 普宁配置文件
---
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 163 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 97 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 482be71..110d78c 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_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);
}
@@ -193,11 +193,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);
}
GD2022ResponseDto responseDto;
@@ -271,7 +271,7 @@
GD2022AuthToken token1 = dto.getData();
token.setAccess_token(token1.getAccess_token());
token.setAppid(token1.getAppid());
- redisUtil.set(key, token, 60 * 119);
+ redisUtil.set(key, token, 60 * 29);
}
}
@@ -345,7 +345,7 @@
if (Constant.API_CODE_1107.equals(inteId)) {
Api1107 api1107 = (Api1107) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1107.getTykqbm())){
+ if (StringUtils.isEmpty(api1107.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
api1107.setTykqbm(tykqbm);
}
@@ -355,7 +355,7 @@
if (Constant.API_CODE_1108.equals(inteId)) {
Api1108 api1108 = (Api1108) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1108.getTykqbm())){
+ if (StringUtils.isEmpty(api1108.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
api1108.setTykqbm(tykqbm);
}
@@ -376,7 +376,7 @@
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1109.getTykqbm())){
+ if (StringUtils.isEmpty(api1109.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
api1109.setTykqbm(tykqbm);
}
@@ -386,7 +386,7 @@
if (Constant.API_CODE_1110.equals(inteId)) {
Api1110 api1110 = (Api1110) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1110.getTyhwbm())){
+ if (StringUtils.isEmpty(api1110.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
api1110.setTyhwbm(tyhwbm);
}
@@ -397,14 +397,14 @@
Gd2022Api1111 api1111 = new Gd2022Api1111();
BeanUtils.copyProperties(data, api1111);
Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
- if(null != api1102List){
+ if (null != api1102List) {
api1111.setKqmc(api1102List.getKqmc());
- if(StringUtils.isEmpty(api1111.getTykqbm())){
+ if (StringUtils.isEmpty(api1111.getTykqbm())) {
api1111.setTykqbm(api1102List.getTykqbm());
}
}
Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
- if(null != api1101List){
+ if (null != api1101List) {
api1111.setDwmc(api1101List.getDwmc());
}
api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -413,12 +413,12 @@
if (Constant.API_CODE_1112.equals(inteId)) {
Api1112 api1112 = (Api1112) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1112.getTydwbm())){
+ if (StringUtils.isEmpty(api1112.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
api1112.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1112.getTykqbm())){
+ if (StringUtils.isEmpty(api1112.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
api1112.setTykqbm(tykqbm);
}
@@ -428,7 +428,7 @@
if (Constant.API_CODE_1113.equals(inteId)) {
Api1113 api1113 = (Api1113) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1113.getTydwbm())){
+ if (StringUtils.isEmpty(api1113.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
api1113.setTydwbm(tydwbm);
}
@@ -438,7 +438,7 @@
if (Constant.API_CODE_1201.equals(inteId)) {
Api1201 apiData = (Api1201) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTydwbm())){
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
@@ -448,7 +448,7 @@
if (Constant.API_CODE_1202.equals(inteId)) {
Api1202 apiData = (Api1202) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -458,7 +458,7 @@
if (Constant.API_CODE_1203.equals(inteId)) {
Api1203 apiData = (Api1203) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -468,7 +468,7 @@
if (Constant.API_CODE_1204.equals(inteId)) {
Api1204 apiData = (Api1204) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -478,7 +478,7 @@
if (Constant.API_CODE_1205.equals(inteId)) {
Api1205 apiData = (Api1205) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -488,7 +488,7 @@
if (Constant.API_CODE_1206.equals(inteId)) {
Api1206 apiData = (Api1206) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTydwbm())){
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
apiData.setTydwbm(tydwbm);
}
@@ -498,20 +498,20 @@
if (Constant.API_CODE_1207.equals(inteId)) {
Api1207 apiData = (Api1207) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getDckqtybm())){
+ if (StringUtils.isEmpty(apiData.getDckqtybm())) {
String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
- if(StringUtils.isEmpty(apiData.getDrkqtybm())){
+ if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getDchwtybm())){
+ if (StringUtils.isEmpty(apiData.getDchwtybm())) {
String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
apiData.setDchwtybm(dchwtybm);
}
- if(StringUtils.isEmpty(apiData.getDrhwtybm())){
+ if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
apiData.setDrhwtybm(drhwtybm);
}
@@ -520,30 +520,30 @@
}
if (Constant.API_CODE_1208.equals(inteId)) {
Gd2022Api1208 api1208 = new Gd2022Api1208();
+ BeanUtils.copyProperties(data, api1208);
//鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
- if(null == api1208.getBclbs()){
+ if (null == api1208.getBclbs()) {
api1208.setBclbs(0);
}
- if("2".equals(api1208.getClfs()) && api1208.getBclbs() == 0){
- api1208.setBclbs((int)(api1208.getSjsl()/25));
+ if ("2".equals(api1208.getClfs()) && api1208.getBclbs() == 0) {
+ api1208.setBclbs((int) (api1208.getSjsl() / 25));
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1208.getLqgstydwbm())){
+ if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
api1208.setLqgstydwbm(lqgstydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1208.getTyhwbm())){
+ if (StringUtils.isEmpty(api1208.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
api1208.setTyhwbm(tyhwbm);
}
- BeanUtils.copyProperties(data, api1208);
return JSON.toJSONString(api1208);
}
if (Constant.API_CODE_1209.equals(inteId)) {
Api1209 apiData = (Api1209) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -554,7 +554,7 @@
Gd2022Api1210 api1210 = new Gd2022Api1210();
BeanUtils.copyProperties(data, api1210);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1210.getTyhwbm())){
+ if (StringUtils.isEmpty(api1210.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
api1210.setTyhwbm(tyhwbm);
}
@@ -564,7 +564,7 @@
if (Constant.API_CODE_1211.equals(inteId)) {
Api1211 apiData = (Api1211) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTykqbm())){
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -574,12 +574,12 @@
if (Constant.API_CODE_1212.equals(inteId)) {
Api1212 apiData = (Api1212) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTydwbm())){
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTykqbm())){
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -589,12 +589,12 @@
if (Constant.API_CODE_1301.equals(inteId)) {
Api1301 apiData = (Api1301) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTydwbm())){
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTykqbm())){
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -604,7 +604,7 @@
if (Constant.API_CODE_1302.equals(inteId)) {
Api1302 apiData = (Api1302) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -614,7 +614,7 @@
if (Constant.API_CODE_1303.equals(inteId)) {
Api1303 apiData = (Api1303) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -624,7 +624,7 @@
if (Constant.API_CODE_1304.equals(inteId)) {
Api1304 apiData = (Api1304) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -634,7 +634,7 @@
if (Constant.API_CODE_1305.equals(inteId)) {
Api1305 apiData = (Api1305) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTycfbm())){
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
@@ -644,7 +644,7 @@
if (Constant.API_CODE_1306.equals(inteId)) {
Api1306 apiData = (Api1306) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTycfbm())){
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
@@ -664,17 +664,17 @@
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1307.getTykqbm())){
+ if (StringUtils.isEmpty(api1307.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
api1307.setTykqbm(tykqbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1307.getTycfbm())){
+ if (StringUtils.isEmpty(api1307.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
api1307.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1307.getTyhwbm())){
+ if (StringUtils.isEmpty(api1307.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
api1307.setTyhwbm(tyhwbm);
}
@@ -694,7 +694,7 @@
//璁剧疆涓婁紶鏂囦欢id
api1308.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1308.getTykqbm())){
+ if (StringUtils.isEmpty(api1308.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
api1308.setTykqbm(tykqbm);
}
@@ -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);
@@ -715,7 +715,7 @@
Gd2022Api1310 api1310 = new Gd2022Api1310();
BeanUtils.copyProperties(data, api1310);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1310.getTyhwbm())){
+ if (StringUtils.isEmpty(api1310.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
api1310.setTyhwbm(tyhwbm);
}
@@ -740,25 +740,26 @@
Gd2022Api1404 gd2022Api1404;
List<Gd2022Api1404> dtls = new ArrayList<>();
Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
- if(null != list && list.size() > 0){
+ if (null != list && list.size() > 0) {
for (Api1404 api1404 : list) {
gd2022Api1404 = new Gd2022Api1404();
BeanUtils.copyProperties(api1404, gd2022Api1404);
- if(null!= gd2022Api1404.getLhlx() && "2".equals(gd2022Api1404.getLhlx())){
+ if (null != gd2022Api1404.getLhlx() && "2".equals(gd2022Api1404.getLhlx())) {
lrsl += gd2022Api1404.getLhsl();
}
- if(null!= gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())){
+ if (null != gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())) {
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);
@@ -781,9 +782,39 @@
if (Constant.API_CODE_1405.equals(inteId)) {
Api1405 apiData = (Api1405) data;
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(apiData.getTydwbm())){
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getXmdm());
apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (ApiCodeConstant.API_2001.equals(inteId)) {
+ Gd2022Api2001 apiData = (Gd2022Api2001) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+ apiData.setTyajbm(tyajbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (ApiCodeConstant.API_2002.equals(inteId)) {
+ Gd2022Api2002 apiData = (Gd2022Api2002) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+ apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
@@ -799,12 +830,12 @@
gdFinanceDto.setDwdm(api1503.getDwdm());
gdFinanceDto.setKqdm(api1503.getKqdm());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
+ if (StringUtils.isEmpty(gdFinanceDto.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
gdFinanceDto.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
+ if (StringUtils.isEmpty(gdFinanceDto.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
gdFinanceDto.setTykqbm(tykqbm);
}
@@ -861,12 +892,12 @@
gdFinanceDto.setDwdm(api1502.getDwdm());
gdFinanceDto.setKqdm(api1502.getKqdm());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
+ if (StringUtils.isEmpty(gdFinanceDto.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
gdFinanceDto.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
+ if (StringUtils.isEmpty(gdFinanceDto.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
gdFinanceDto.setTykqbm(tykqbm);
}
@@ -924,12 +955,12 @@
gdFinanceDto.setDwdm(api1501.getDwdm());
gdFinanceDto.setKqdm(api1501.getKqdm());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
+ if (StringUtils.isEmpty(gdFinanceDto.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
gdFinanceDto.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
+ if (StringUtils.isEmpty(gdFinanceDto.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
gdFinanceDto.setTykqbm(tykqbm);
}
--
Gitblit v1.9.3