From bef2222506d481b418a93625ec0030b177f0eab2 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 25 二月 2025 11:59:56 +0800
Subject: [PATCH] 油罐上传修改
---
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 66 +++++++++++++--------------------
1 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index a4c413e..ca72499 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -315,8 +315,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 +356,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 +375,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 +389,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 +428,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 +443,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 +456,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 +511,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);
}
@@ -547,6 +546,9 @@
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);
@@ -903,36 +905,18 @@
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
- if (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));
- return JSON.toJSONString(apiData);
- }
- if (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);
- }
- apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ apiData.setFcsl(api1213.getFcsl());
+ apiData.setFcsrq(api1213.getFcsqr());
return JSON.toJSONString(apiData);
}
return JSON.toJSONString(data);
@@ -1227,6 +1211,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":
@@ -1263,7 +1249,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