From 0f2d30660621ba143d5df99eab785015b0509520 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 31 十月 2025 09:54:31 +0800
Subject: [PATCH] 陕西2025版接口调整2
---
src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
index 4284dca..480c6dd 100644
--- a/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
@@ -794,17 +794,11 @@
}
return apiData;
}
-
- //TODO 寰呰皟鏁�
+ //閫氶浣滀笟
if (Constant.API_CODE_1305.equals(inteId)) {
Api1305 api1305 = (Api1305) data;
- SX2024Api1305 apiData = new SX2024Api1305();
+ SX2025Api1305 apiData = new SX2025Api1305();
BeanUtils.copyProperties(api1305, apiData);
- //璁剧疆绲变竴浠撴埧缂栫爜
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- }
//璁剧疆绲变竴寤掗棿缂栫爜
if (StringUtils.isEmpty(apiData.getTyajbm())) {
String tyajbm = apiCommonService.getTyajbm(api1305.getHwdm().substring(0, 28));
@@ -816,18 +810,13 @@
apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
}
}
-
return apiData;
}
+ //鐔忚捀浣滀笟
if (Constant.API_CODE_1306.equals(inteId)) {
Api1306 api1306 = (Api1306) data;
- SX2024Api1306 apiData = new SX2024Api1306();
+ SX2025Api1306 apiData = new SX2025Api1306();
BeanUtils.copyProperties(api1306, apiData);
- //璁剧疆绲变竴浠撴埧缂栫爜
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- }
//璁剧疆绲变竴寤掗棿缂栫爜
if (StringUtils.isEmpty(apiData.getTyajbm())) {
String tyajbm = apiCommonService.getTyajbm(api1306.getHwdm().substring(0, 28));
@@ -835,69 +824,82 @@
}
//璁剧疆鐔忚捀浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
if (StringUtils.isNotEmpty(apiData.getXzzydh())) {
- if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
- apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
+ if (apiData.getXzzydh().startsWith(api1306.getCfdm())) {
+ apiData.setXzzydh(apiData.getXzzydh().replace(api1306.getCfdm(), apiData.getTyajbm()));
}
}
-
//璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
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)) {
Api1307 api1307 = (Api1307) data;
- SX2024Api1307 apiData = new SX2024Api1307();
+ SX2025Api1307 apiData = new SX2025Api1307();
BeanUtils.copyProperties(api1307, apiData);
//璁剧疆绲变竴搴撳尯缂栫爜
if (StringUtils.isEmpty(apiData.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
apiData.setTykqbm(tykqbm);
}
//璁剧疆绲变竴浠撴埧缂栫爜
if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+ String tycfbm = apiCommonService.getTykqbm(api1307.getCfdm());
apiData.setTycfbm(tycfbm);
}
//璁剧疆绲变竴璐т綅缂栫爜
if (StringUtils.isEmpty(apiData.getTyhwbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
//璁剧疆鏂囦欢娴�
apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
//棰勭疆浣�
if (StringUtils.isNotEmpty(apiData.getYzwbh())) {
- if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
- apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ if (apiData.getYzwbh().startsWith(api1307.getHwdm())) {
+ apiData.setYzwbh(apiData.getYzwbh().replace(api1307.getHwdm(), apiData.getTyhwbm()));
}
}
-
+ //璁剧疆鏂囦欢璺緞
+ String cntxwjlj = "V2025/2432/";
+ cntxwjlj += apiData.getTykqbm() + "/";
+ cntxwjlj += apiData.getYzwbh() + "/";
+ cntxwjlj += apiData.getSpjksbid() + "/";
+ cntxwjlj += apiData.getTyhwbm() + "_" + DateFormatUtils.format(apiData.getZpsj(),"yyyyMMdd HHmmss") + "." + apiData.getTxwjhzm();
+ apiData.setCntxwjlj(cntxwjlj);
return apiData;
}
+ //瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅淇℃伅
if (Constant.API_CODE_1308.equals(inteId)) {
- SX2024Api1308 apiData = new SX2024Api1308();
- BeanUtils.copyProperties(data, apiData);
+ Api1308 api1308 = (Api1308) data;
+ SX2025Api1308 apiData = new SX2025Api1308();
+ BeanUtils.copyProperties(api1308, apiData);
//璁剧疆绲变竴搴撳尯缂栫爜
if (StringUtils.isEmpty(apiData.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
apiData.setTykqbm(tykqbm);
}
- //缁熶竴搴撳尯鍚嶇О
- apiData.setTykqmc(apiData.getKqmc());
+ //瑙嗛鏂囦欢璺緞
+ String spwjlj = "V2025/2433/";
+ spwjlj += apiData.getTykqbm() + "/";
+ spwjlj += apiData.getSpjksbid() + "/";
+ spwjlj += apiData.getSpjksbid() + "/";
+ spwjlj += apiData.getTykqbm() + "_" + DateFormatUtils.format(apiData.getGjsj(),"yyyyMMdd HHmmss") + "." + apiData.getSpwjhzm();
+ apiData.setSpwjlj(spwjlj);
return apiData;
}
+ //杩濊棰勮淇℃伅
if (Constant.API_CODE_1309.equals(inteId)) {
Api1309 api1309 = (Api1309) data;
- SX2024Api1309 apiData = new SX2024Api1309();
+ SX2025Api1309 apiData = new SX2025Api1309();
BeanUtils.copyProperties(api1309, apiData);
//璁剧疆杩濊鍗曚綅绲变竴缂栫爜
if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
+ String tydwbm = apiCommonService.getTydwbm(api1309.getQydm());
apiData.setWgdwtybm(tydwbm);
}
//璁剧疆棰勮淇℃伅浠ｇ爜锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
@@ -907,22 +909,20 @@
apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
}
}
-
return apiData;
}
+ //璐ㄦ鏁版嵁
if (Constant.API_CODE_1310.equals(inteId)) {
- SX2024Api1310 apiData = new SX2024Api1310();
- BeanUtils.copyProperties(data, apiData);
+ Api1310 api1310 = (Api1310) data;
+ SX2025Api1310 apiData = new SX2025Api1310();
+ BeanUtils.copyProperties(api1310, apiData);
//璁剧疆绲变竴璐т綅缂栫爜
if (StringUtils.isEmpty(apiData.getTyhwbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
return apiData;
}
-
-
-
//鍌ㄥ瑙勬ā淇℃伅
if (Constant.API_CODE_1401.equals(inteId)) {
Api1401 api1401 = (Api1401) data;
--
Gitblit v1.9.3