From 56a56708269c7ea1dcb7414c973dd247223ba708 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 20 一月 2025 10:04:50 +0800
Subject: [PATCH] 优化陕西接口
---
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 143 +++++++++++++++++++++++++++++++----------------
1 files changed, 94 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index ed126b8..7cf9c19 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -100,14 +100,10 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
String orderId = (String) redisUtil.get(key);
-// if (StringUtils.isEmpty(orderId)) {
-// log.error("鎸囦护id澶辨晥");
-// ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
-// apiLog.setStatus(99);
-// apiLog.setResult("鎸囦护id澶辨晥");
-// apiLogRep.save(apiLog);
-// return responseDto;
-// }
+ if (StringUtils.isEmpty(orderId)) {
+ //闄曡タ2024鎺ュ彛锛屽彇娑堟寚浠ゆ牎楠�
+ orderId = ContextUtil.getUUID();
+ }
//灏佽鎺ㄩ�佹暟鎹�
SX2024ReqDto reqData = new SX2024ReqDto();
@@ -410,6 +406,8 @@
if (StringUtils.isEmpty(apiData.getFKFS())) {
apiData.setFKFS("4");
}
+ apiData.setHtzje(api1201.getHtzje().toPlainString());
+ apiData.setJszje(api1201.getJszje().toPlainString());
return apiData;
}
if (Constant.API_CODE_1202.equals(inteId)) {
@@ -435,12 +433,16 @@
}
}
//璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
- if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
- apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
+ if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
+ apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+ }
}
- //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
- if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
- apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ if (StringUtils.isNotEmpty(apiData.getRkjsdh())) {
+ //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
+ apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ }
}
return apiData;
}
@@ -464,13 +466,19 @@
apiData.setTyhwbm(tyhwbm);
}
//璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
- if (apiData.getRkjsdh().startsWith(api1204.getKqdm())) {
- apiData.setRkjsdh(apiData.getRkjsdh().replace(api1204.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ if (StringUtils.isNotEmpty(apiData.getRkjsdh())) {
+ if (apiData.getRkjsdh().startsWith(api1204.getKqdm())) {
+ apiData.setRkjsdh(apiData.getRkjsdh().replace(api1204.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ }
}
+
//璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
- if (apiData.getHth().startsWith(api1204.getKqdm().substring(0, 18))) {
- apiData.setHth(apiData.getHth().replace(api1204.getKqdm().substring(0, 18), apiData.getTyhwbm().substring(0, 20)));
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
+ if (apiData.getHth().startsWith(api1204.getKqdm().substring(0, 18))) {
+ apiData.setHth(apiData.getHth().replace(api1204.getKqdm().substring(0, 18), apiData.getTyhwbm().substring(0, 20)));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1205.equals(inteId)) {
@@ -490,13 +498,17 @@
}
}
//璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
- if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
- apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
+ if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
+ apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+ }
}
//璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
- if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
- String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
- apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
+ if (StringUtils.isNotEmpty(apiData.getCkjsdh())) {
+ if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
+ apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
+ }
}
return apiData;
}
@@ -541,9 +553,11 @@
apiData.setDrhwtybm(drhwtybm);
}
//璁剧疆鍊掍粨鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
- if (apiData.getDcdh().startsWith(api1207.getKqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1207.getKqdm());
- apiData.setDcdh(apiData.getDcdh().replace(api1207.getKqdm(), tykqbm));
+ if (StringUtils.isNotEmpty(apiData.getDcdh())) {
+ if (apiData.getDcdh().startsWith(api1207.getKqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1207.getKqdm());
+ apiData.setDcdh(apiData.getDcdh().replace(api1207.getKqdm(), tykqbm));
+ }
}
return apiData;
}
@@ -572,9 +586,12 @@
apiData.setTyhwbm(tyhwbm);
}
//璁剧疆鎹熺泭鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
- if (apiData.getSydh().startsWith(apiData.getHwdm())) {
- apiData.setSydh(apiData.getSydh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ if (StringUtils.isNotEmpty(apiData.getSydh())) {
+ if (apiData.getSydh().startsWith(apiData.getHwdm())) {
+ apiData.setSydh(apiData.getSydh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
}
+
//瀹為檯鎹熻�楁暟閲忚祴鍊�
apiData.setSjsysl(api1209.getJzsysl());
@@ -597,8 +614,10 @@
apiData.setTyhwbm(tyhwbm);
}
//璁剧疆鎬ц川鍙樻洿鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
- if (apiData.getLsxzzbdh().startsWith(apiData.getHwdm())) {
- apiData.setLsxzzbdh(apiData.getLsxzzbdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ if (StringUtils.isNotEmpty(apiData.getLsxzzbdh())) {
+ if (apiData.getLsxzzbdh().startsWith(apiData.getHwdm())) {
+ apiData.setLsxzzbdh(apiData.getLsxzzbdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
}
return apiData;
}
@@ -673,8 +692,10 @@
apiData.setTyhwbm(tyhwbm);
}
//璁剧疆鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
- if (apiData.getWsdjcdh().startsWith(apiData.getHwdm())) {
- apiData.setWsdjcdh(apiData.getWsdjcdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ if (StringUtils.isNotEmpty(apiData.getWsdjcdh())) {
+ if (apiData.getWsdjcdh().startsWith(apiData.getHwdm())) {
+ apiData.setWsdjcdh(apiData.getWsdjcdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
}
return apiData;
}
@@ -692,9 +713,12 @@
apiData.setTyajbm(tyajbm);
}
//璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
- if (apiData.getHcjcdh().startsWith(apiData.getHwdm())) {
- apiData.setHcjcdh(apiData.getHcjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+ if (StringUtils.isNotEmpty(apiData.getHcjcdh())) {
+ if (apiData.getHcjcdh().startsWith(apiData.getHwdm())) {
+ apiData.setHcjcdh(apiData.getHcjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1304.equals(inteId)) {
@@ -711,9 +735,12 @@
apiData.setTyajbm(tyajbm);
}
//璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
- if (apiData.getQtndjcdh().startsWith(apiData.getHwdm())) {
- apiData.setQtndjcdh(apiData.getQtndjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+ if (StringUtils.isNotEmpty(apiData.getQtndjcdh())) {
+ if (apiData.getQtndjcdh().startsWith(apiData.getHwdm())) {
+ apiData.setQtndjcdh(apiData.getQtndjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1305.equals(inteId)) {
@@ -731,9 +758,12 @@
apiData.setTyajbm(tyajbm);
}
//璁剧疆閫氶浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
- if (apiData.getTfzydh().startsWith(api1305.getHwdm())) {
- apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
+ if (StringUtils.isNotEmpty(apiData.getTfzydh())) {
+ if (apiData.getTfzydh().startsWith(api1305.getHwdm())) {
+ apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1306.equals(inteId)) {
@@ -751,13 +781,19 @@
apiData.setTyajbm(tyajbm);
}
//璁剧疆鐔忚捀浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
- if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
- apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
+ if (StringUtils.isNotEmpty(apiData.getXzzydh())) {
+ if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
+ apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
+ }
}
+
//璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
- if (apiData.getHcjcdh().startsWith(api1306.getHwdm())) {
- apiData.setHcjcdh(apiData.getHcjcdh().replace(api1306.getHwdm(), apiData.getTyajbm()));
+ if (StringUtils.isNotEmpty(apiData.getHcjcdh())) {
+ if (apiData.getHcjcdh().startsWith(api1306.getHwdm())) {
+ apiData.setHcjcdh(apiData.getHcjcdh().replace(api1306.getHwdm(), apiData.getTyajbm()));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1307.equals(inteId)) {
@@ -782,9 +818,12 @@
//璁剧疆鏂囦欢娴�
apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
//棰勭疆浣�
- if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
- apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ if (StringUtils.isNotEmpty(apiData.getYzwbh())) {
+ if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
+ apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1308.equals(inteId)) {
@@ -809,10 +848,13 @@
apiData.setWgdwtybm(tydwbm);
}
//璁剧疆棰勮淇℃伅浠ｇ爜锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
- if (apiData.getYjxxdm().startsWith(api1309.getKqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1309.getKqdm());
- apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
+ if (StringUtils.isNotEmpty(apiData.getYjxxdm())) {
+ if (apiData.getYjxxdm().startsWith(api1309.getKqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1309.getKqdm());
+ apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1310.equals(inteId)) {
@@ -856,10 +898,13 @@
apiData.setLhhwtybm(tyhwbm);
}
//璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
- if (apiData.getJhmxdh().startsWith(apiData.getLhjhdh() + api1404.getKqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1404.getKqdm());
- apiData.setJhmxdh(apiData.getJhmxdh().replace(apiData.getLhjhdh() + api1404.getKqdm(), apiData.getLhjhdh() + tykqbm));
+ if (StringUtils.isNotEmpty(apiData.getJhmxdh())) {
+ if (apiData.getJhmxdh().startsWith(apiData.getLhjhdh() + api1404.getKqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1404.getKqdm());
+ apiData.setJhmxdh(apiData.getJhmxdh().replace(apiData.getLhjhdh() + api1404.getKqdm(), apiData.getLhjhdh() + tykqbm));
+ }
}
+
return apiData;
}
if (Constant.API_CODE_1504.equals(inteId)) {
--
Gitblit v1.9.3