From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 十月 2025 13:35:42 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送
---
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 293 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 165 insertions(+), 128 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 8bbe665..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.getTydwbm());
- api1102.setTydwbm(tydwbm);
+ api1102.setTydwbm(api1102.getTykqbm().substring(0, 20));
}
api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1102);
@@ -326,8 +329,8 @@
BeanUtils.copyProperties(data, api1103);
changeObject(api1103);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1103.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1103.getTykqbm());
+ if ("0".equals(api1103.getTykqbm()) || StringUtils.isEmpty(api1103.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1103.getKqdm());
api1103.setTykqbm(tykqbm);
}
api1103.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -338,8 +341,8 @@
BeanUtils.copyProperties(data, api1104);
changeObject(api1104);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1104.getTycfbm())) {
- String tydfbm = apiCommonService.getTycfbm(api1104.getTycfbm());
+ if ("0".equals(api1104.getTycfbm()) || StringUtils.isEmpty(api1104.getTycfbm())) {
+ String tydfbm = apiCommonService.getTycfbm(api1104.getCfbh());
api1104.setTycfbm(tydfbm);
}
api1104.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -350,46 +353,47 @@
BeanUtils.copyProperties(data, api1105);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1105.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(api1105.getTyajbm());
+ String tyajbm = apiCommonService.getTyajbm(api1105.getAjdm());
api1105.setTyajbm(tyajbm);
}
api1105.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
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())) {
- String tykqbm = apiCommonService.getTykqbm(api1106.getTykqbm());
+ String tykqbm = apiCommonService.getTykqbm(api1106.getKqdm());
api1106.setTykqbm(tykqbm);
}
return JSON.toJSONString(api1106);
}
if (Constant.API_CODE_1107.equals(inteId)) {
- Gd2023Api1107 api1107 = (Gd2023Api1107) data;
+ Gd2023Api1107 api1107 = new Gd2023Api1107();
+ BeanUtils.copyProperties(data, api1107);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1107.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
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);
}
if (Constant.API_CODE_1108.equals(inteId)) {
- Gd2023Api1108 api1108 = (Gd2023Api1108) data;
+ Gd2023Api1108 api1108 = new Gd2023Api1108();
+ BeanUtils.copyProperties(data, api1108);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1108.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
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);
@@ -408,7 +412,7 @@
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1109.getTykqbm())) {
+ if ("0".equals(api1109.getTykqbm()) || StringUtils.isEmpty(api1109.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
api1109.setTykqbm(tykqbm);
}
@@ -416,15 +420,19 @@
return JSON.toJSONString(api1109);
}
if (Constant.API_CODE_1110.equals(inteId)) {
- Gd2023Api1110 api1110 = (Gd2023Api1110) data;
+ Gd2023Api1110 api1110 = new Gd2023Api1110();
+ BeanUtils.copyProperties(data, api1110);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1110.getTyhwbm())) {
+ if ("0".equals(api1110.getTyhwbm()) || StringUtils.isEmpty(api1110.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
api1110.setTyhwbm(tyhwbm);
}
- if (StringUtils.isEmpty(api1110.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
- api1110.setTydwbm(tydwbm);
+ if ("0".equals(api1110.getTykqbm()) || StringUtils.isEmpty(api1110.getTykqbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
+ api1110.setTykqbm(tyhwbm.substring(0, 22));
+ }
+ if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
+ api1110.setTydwbm(api1110.getTykqbm().substring(0, 20));
}
api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1110);
@@ -435,11 +443,11 @@
Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
if (null != api1102List) {
api1111.setKqmc(api1102List.getKqmc());
- if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ if ("0".equals(api1111.getTykqbm()) || StringUtils.isEmpty(api1111.getTykqbm())) {
api1111.setTykqbm(api1102List.getTykqbm());
}
- if (StringUtils.isEmpty(api1111.getTydwbm())) {
- api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getTydwbm()));
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
+ api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
}
}
Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -447,26 +455,26 @@
api1111.setDwmc(api1101List.getDwmc());
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1111.getKqdm());
api1111.setTykqbm(tykqbm);
}
- if (StringUtils.isEmpty(api1111.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
- api1111.setTydwbm(tydwbm);
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
+ api1111.setTydwbm(api1111.getTykqbm().substring(0, 20));
}
api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1111);
}
if (Constant.API_CODE_1112.equals(inteId)) {
- Gd2023Api1112 api1112 = (Gd2023Api1112) data;
+ Gd2023Api1112 api1112 = new Gd2023Api1112();
+ BeanUtils.copyProperties(data, api1112);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1112.getTydwbm())) {
+ if ("0".equals(api1112.getTydwbm()) || StringUtils.isEmpty(api1112.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
api1112.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1112.getTykqbm())) {
+ if ("0".equals(api1112.getTykqbm()) || StringUtils.isEmpty(api1112.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
api1112.setTykqbm(tykqbm);
}
@@ -474,9 +482,10 @@
return JSON.toJSONString(api1112);
}
if (Constant.API_CODE_1113.equals(inteId)) {
- Gd2023Api1113 api1113 = (Gd2023Api1113) data;
+ Gd2023Api1113 api1113 = new Gd2023Api1113();
+ BeanUtils.copyProperties(data, api1113);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1113.getTydwbm())) {
+ if ("0".equals(api1113.getTydwbm()) || StringUtils.isEmpty(api1113.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
api1113.setTydwbm(tydwbm);
}
@@ -484,9 +493,10 @@
return JSON.toJSONString(api1113);
}
if (Constant.API_CODE_1201.equals(inteId)) {
- Gd2023Api1201 apiData = (Gd2023Api1201) data;
+ Gd2023Api1201 apiData = new Gd2023Api1201();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
@@ -494,23 +504,28 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1202.equals(inteId)) {
- Gd2023Api1202 apiData = (Gd2023Api1202) data;
+ Gd2023Api1202 apiData = new Gd2023Api1202();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
- if (StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
+ if ("0".equals(apiData.getLqgsdwtybm()) || StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
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);
}
if (Constant.API_CODE_1203.equals(inteId)) {
- Gd2023Api1203 apiData = (Gd2023Api1203) data;
+ Gd2023Api1203 apiData = new Gd2023Api1203();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -518,9 +533,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1204.equals(inteId)) {
- Gd2023Api1204 apiData = (Gd2023Api1204) data;
+ Gd2023Api1204 apiData = new Gd2023Api1204();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -528,42 +544,52 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1205.equals(inteId)) {
- Gd2023Api1205 apiData = (Gd2023Api1205) data;
+ Gd2023Api1205 apiData = new Gd2023Api1205();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
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);
}
if (Constant.API_CODE_1206.equals(inteId)) {
- Gd2023Api1206 apiData = (Gd2023Api1206) data;
+ Gd2023Api1206 apiData = new Gd2023Api1206();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ 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);
}
if (Constant.API_CODE_1207.equals(inteId)) {
- Gd2023Api1207 apiData = (Gd2023Api1207) data;
+ Gd2023Api1207 apiData = new Gd2023Api1207();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getDckqtybm())) {
+ if ("0".equals(apiData.getDckqtybm()) || StringUtils.isEmpty(apiData.getDckqtybm())) {
String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
- if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
+ if ("0".equals(apiData.getDrkqtybm()) || StringUtils.isEmpty(apiData.getDrkqtybm())) {
String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getDchwtybm())) {
+ if ("0".equals(apiData.getDchwtybm()) || StringUtils.isEmpty(apiData.getDchwtybm())) {
String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
apiData.setDchwtybm(dchwtybm);
}
- if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
+ if ("0".equals(apiData.getDrhwtybm()) || StringUtils.isEmpty(apiData.getDrhwtybm())) {
String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
apiData.setDrhwtybm(drhwtybm);
}
@@ -581,24 +607,28 @@
api1208.setBclbs((int) (api1208.getSjsl() / 25));
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
+ if ("0".equals(api1208.getLqgstydwbm()) || StringUtils.isEmpty(api1208.getLqgstydwbm())) {
String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
api1208.setLqgstydwbm(lqgstydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1208.getTyhwbm())) {
+ if ("0".equals(api1208.getTyhwbm()) || StringUtils.isEmpty(api1208.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
api1208.setTyhwbm(tyhwbm);
}
return JSON.toJSONString(api1208);
}
if (Constant.API_CODE_1209.equals(inteId)) {
- Gd2023Api1209 apiData = (Gd2023Api1209) data;
+ Gd2023Api1209 apiData = new Gd2023Api1209();
+ BeanUtils.copyProperties(data, apiData);
+ apiData.setRksl(apiData.getRkjz());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
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);
}
@@ -606,7 +636,7 @@
Gd2023Api1210 api1210 = new Gd2023Api1210();
BeanUtils.copyProperties(data, api1210);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1210.getTyhwbm())) {
+ if ("0".equals(api1210.getTyhwbm()) || StringUtils.isEmpty(api1210.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
api1210.setTyhwbm(tyhwbm);
}
@@ -614,9 +644,10 @@
return JSON.toJSONString(api1210);
}
if (Constant.API_CODE_1211.equals(inteId)) {
- Gd2023Api1211 apiData = (Gd2023Api1211) data;
+ Gd2023Api1211 apiData = new Gd2023Api1211();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -624,14 +655,15 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1212.equals(inteId)) {
- Gd2023Api1212 apiData = (Gd2023Api1212) data;
+ Gd2023Api1212 apiData = new Gd2023Api1212();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -639,14 +671,15 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1301.equals(inteId)) {
- Gd2023Api1301 apiData = (Gd2023Api1301) data;
+ Gd2023Api1301 apiData = new Gd2023Api1301();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -654,9 +687,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1302.equals(inteId)) {
- Gd2023Api1302 apiData = (Gd2023Api1302) data;
+ Gd2023Api1302 apiData = new Gd2023Api1302();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -664,66 +698,68 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1303.equals(inteId)) {
- Gd2023Api1303 apiData = (Gd2023Api1303) data;
+ Gd2023Api1303 apiData = new Gd2023Api1303();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,26));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1304.equals(inteId)) {
- Gd2023Api1304 apiData = (Gd2023Api1304) data;
+ Gd2023Api1304 apiData = new Gd2023Api1304();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1305.equals(inteId)) {
- Gd2023Api1305 apiData = (Gd2023Api1305) data;
+ Gd2023Api1305 apiData = new Gd2023Api1305();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0,28));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1306.equals(inteId)) {
- Api1306 apiData = (Api1306) data;
Gd2023Api1306 api1306 = new Gd2023Api1306();
- BeanUtils.copyProperties(apiData, api1306);
+ BeanUtils.copyProperties(data, api1306);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
+ if ("0".equals(api1306.getTycfbm()) || StringUtils.isEmpty(api1306.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(api1306.getCfdm());
+ api1306.setTycfbm(tycfbm);
}
// 鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1306.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
+ if ("0".equals(api1306.getTyajbm()) || StringUtils.isEmpty(api1306.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(api1306.getHwdm().substring(0, 28));
api1306.setTyajbm(tyajbm);
}
- apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
- return JSON.toJSONString(apiData);
+ api1306.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1306);
}
if (Constant.API_CODE_1307.equals(inteId)) {
//灏佽鏁版嵁
@@ -738,17 +774,17 @@
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTykqbm())) {
+ if ("0".equals(api1307.getTykqbm()) || StringUtils.isEmpty(api1307.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
api1307.setTykqbm(tykqbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTycfbm())) {
+ if ("0".equals(api1307.getTycfbm()) || StringUtils.isEmpty(api1307.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
api1307.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTyhwbm())) {
+ if ("0".equals(api1307.getTyhwbm()) || StringUtils.isEmpty(api1307.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
api1307.setTyhwbm(tyhwbm);
}
@@ -776,11 +812,16 @@
return JSON.toJSONString(api1308);
}
if (Constant.API_CODE_1309.equals(inteId)) {
- Gd2023Api1309 apiData = (Gd2023Api1309) data;
+ Gd2023Api1309 apiData = new Gd2023Api1309();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
+ if ("0".equals(apiData.getWgdwtybm()) || StringUtils.isEmpty(apiData.getWgdwtybm())) {
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);
@@ -789,7 +830,7 @@
Gd2023Api1310 api1310 = new Gd2023Api1310();
BeanUtils.copyProperties(data, api1310);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1310.getTyhwbm())) {
+ if ("0".equals(api1310.getTyhwbm()) || StringUtils.isEmpty(api1310.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
api1310.setTyhwbm(tyhwbm);
}
@@ -797,9 +838,10 @@
return JSON.toJSONString(api1310);
}
if (Constant.API_CODE_1401.equals(inteId)) {
- Gd2023Api1401 apiData = (Gd2023Api1401) data;
+ Gd2023Api1401 apiData = new Gd2023Api1401();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
apiData.setTydwbm(tydwbm);
}
@@ -807,7 +849,8 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1402.equals(inteId)) {
- Gd2023Api1402 apiData = (Gd2023Api1402) data;
+ Gd2023Api1402 apiData = new Gd2023Api1402();
+ BeanUtils.copyProperties(data, apiData);
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -839,15 +882,15 @@
}
}
- 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());
//璁剧疆涓婁紶鏂囦欢id
api1403.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1403.getJhxddwtybm())) {
+ if ("0".equals(api1403.getJhxddwtybm()) || StringUtils.isEmpty(api1403.getJhxddwtybm())) {
String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
api1403.setJhxddwtybm(tydwbm);
}
@@ -868,33 +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 = (Gd2023Api2001) data;
+ if (Constant.API_CODE_1213.equals(inteId)) {
+ Api1213 api1213 = (Api1213) data;
+ Gd2023Api1213 apiData = new Gd2023Api1213();
+ BeanUtils.copyProperties(api1213, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (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 = (Gd2023Api2002) 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);
- }
+ //鐔忚捀澶囨
+ 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);
}
@@ -1190,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":
@@ -1226,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