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 | 187 ++++++++++++++++++++++++++++++----------------
1 files changed, 123 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index c93a2c7..7cf9c19 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -11,6 +11,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1208Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -25,6 +26,7 @@
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -43,6 +45,8 @@
private ApiCommonService apiCommonService;
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1208Rep api1208Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -97,12 +101,8 @@
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;
+ //闄曡タ2024鎺ュ彛锛屽彇娑堟寚浠ゆ牎楠�
+ orderId = ContextUtil.getUUID();
}
//灏佽鎺ㄩ�佹暟鎹�
@@ -246,7 +246,7 @@
BeanUtils.copyProperties(data, apiData);
//璁剧疆绲变竴浠撴埧缂栫爜
if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
apiData.setTycfbm(tycfbm);
}
//璁剧疆绲变竴寤掗棿鍚嶇О
@@ -326,7 +326,7 @@
}
//璁剧疆鏂囦欢娴�
apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
- //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜_
if (apiData.getWjmc().startsWith(apiData.getKqdm())) {
apiData.setWjmc(apiData.getWjmc().replace(apiData.getKqdm(), apiData.getTykqbm()));
}
@@ -406,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)) {
@@ -431,8 +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)));
+ }
+ }
+ 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;
}
@@ -456,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)) {
@@ -482,8 +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 (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;
}
@@ -509,12 +534,12 @@
BeanUtils.copyProperties(api1207, apiData);
//璁剧疆鍊掑嚭搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDckqtybm())) {
- String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0, 21));
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
//璁剧疆鍊掑叆搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
- String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0, 21));
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//璁剧疆鍊掑嚭璐т綅缁熶竴缂栫爜
@@ -528,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;
}
@@ -544,7 +571,7 @@
}
//璁剧疆绮潈鍗曚綅绲变竴缂栫爜
if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
+ String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgstydwbm(tydwbm);
}
return apiData;
@@ -559,11 +586,23 @@
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());
+
+ //璁剧疆鍝佺銆佹�ц川銆佺瓑绾с�佸勾搴�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setLspzdm(api1208List.get(0).getLspzdm());
+ apiData.setLsxzdm(api1208List.get(0).getLsxzdm());
+ apiData.setLsdjdm(api1208List.get(0).getLsdjdm());
+ apiData.setShnd(api1208List.get(0).getShnd());
+ }
return apiData;
}
if (Constant.API_CODE_1210.equals(inteId)) {
@@ -575,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;
}
@@ -651,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;
}
@@ -670,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)) {
@@ -689,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)) {
@@ -709,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)) {
@@ -729,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)) {
@@ -760,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)) {
@@ -787,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)) {
@@ -834,57 +898,52 @@
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)) {
Api1504 api1504 = (Api1504)data;
SX2024Api1504 apiData = new SX2024Api1504();
BeanUtils.copyProperties(api1504, apiData);
- //璁剧疆绲变竴鍗曚綅缂栫爜
- if (StringUtils.isEmpty(apiData.getXqydm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
- apiData.setXqydm(tydwbm);
- }
- //璁剧疆绲变竴搴撳尯缂栫爜
- if (StringUtils.isEmpty(apiData.getXkqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
- apiData.setXkqdm(tykqbm);
- }
- return data;
+ return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
+ Api1505 api1505 = (Api1505)data;
SX2024Api1505 apiData = new SX2024Api1505();
- BeanUtils.copyProperties(data, apiData);
- return data;
+ BeanUtils.copyProperties(api1505, apiData);
+ apiData.setCqunit(api1505.getCqunit() + "");
+ return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
SX2024Api1506 apiData = new SX2024Api1506();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
SX2024Api1507 apiData = new SX2024Api1507();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
SX2024Api1508 apiData = new SX2024Api1508();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
SX2024Api1509 apiData = new SX2024Api1509();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
SX2024Api1510 apiData = new SX2024Api1510();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
return data;
}
--
Gitblit v1.9.3