From 95dfe7d0073fd85c465f49bd66c1c39542ffdb55 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 09 四月 2026 14:28:56 +0800
Subject: [PATCH] 调整上海核验接口
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index a6c334d..2528443 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -160,12 +160,14 @@
reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
- log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
+ log.debug("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
- apiLogRep.save(apiLog);
+ if (responseDto.getCode() != 200) {
+ apiLogRep.save(apiLog);
+ }
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getResult());
@@ -400,15 +402,16 @@
Api1110 apiData = (Api1110) data;
BeanUtils.copyProperties(apiData, api1110);
api1110.setBjw(ShAreaBjw.getBjw(code));
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1110.getTyajbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
- api1110.setTyajbm(tyhwbm);
- }
api1110.setAjdm(apiData.getHwdm().substring(0, 28));
api1110.setAjxdwz(apiData.getHwxdwz());
api1110.setAjwzys(apiData.getHwwzys());
+
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1110.getTyajbm())) {
+ String tyhwbm = apiCommonService.getTyajbm(api1110.getAjdm());
+ api1110.setTyajbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1110);
@@ -420,7 +423,7 @@
api1111.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1111.getTykqbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
+ String tyhwbm = apiCommonService.getTykqbm(api1111.getKqdm());
api1111.setTykqbm(tyhwbm);
}
@@ -935,7 +938,7 @@
api1301.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1301.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
+ String tykqbm = apiCommonService.getTykqbm(api1301.getKqdm());
api1301.setTykqbm(tykqbm);
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -1160,10 +1163,9 @@
BeanUtils.copyProperties(data, api1311);
api1311.setBjw(ShAreaBjw.getBjw(code));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1311.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
- api1311.setTykqbm(tykqbm);
- }
+ String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
+ api1311.setTykqbm(tykqbm);
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1311);
return api1311;
@@ -1217,8 +1219,8 @@
}
}
}
- api1403.setLrsl(lrsl + "");
- api1403.setLcsl(lcsl + "");
+ api1403.setLrsl(String.format("%.2f", lrsl));
+ api1403.setLcsl(String.format("%.2f", lcsl));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
@@ -1269,10 +1271,9 @@
SH2023Api2103 apiData = new SH2023Api2103();
BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
- }
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -1297,6 +1298,10 @@
Api1504 api1504 = (Api1504) data;
SH2023Api1504 apiData = new SH2023Api1504();
BeanUtils.copyProperties(api1504, apiData);
+ if(apiData.getNacctid().startsWith(api1504.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1504.getKqdm(),api1504.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
@@ -1314,6 +1319,10 @@
apiData.setBbank(api1505.getBbank() + "");
apiData.setBxjll(api1505.getBxjll() + "");
apiData.setBf(api1505.getBf() + "");
+ if(apiData.getNacctid().startsWith(api1505.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1505.getKqdm(),api1505.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
@@ -1323,6 +1332,10 @@
apiData.setCyear(api1506.getCyear() + "");
apiData.setNno(api1506.getNno() + "");
apiData.setCdc(api1506.getCdc() + "");
+ if(apiData.getNacctid().startsWith(api1506.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1506.getKqdm(),api1506.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
@@ -1337,6 +1350,10 @@
apiData.setBpt(api1507.getBpt() + "");
apiData.setNanum(api1507.getNanum() + "");
apiData.setBtmp(api1507.getBtmp() + "");
+ if(apiData.getNacctid().startsWith(api1507.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1507.getKqdm(),api1507.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
@@ -1348,6 +1365,10 @@
apiData.setNvno(api1508.getNvno() + "");
apiData.setNrowno(api1508.getNrowno() + "");
apiData.setCdc(api1508.getCdc() + "");
+ if(apiData.getNacctid().startsWith(api1508.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1508.getKqdm(),api1508.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
@@ -1357,6 +1378,10 @@
apiData.setDeprmethodid(api1509.getDeprmethodid() + "");
apiData.setSourceid(api1509.getSourceid() + "");
apiData.setUsingperiods(api1509.getUsingperiods() + "");
+ if(apiData.getNacctid().startsWith(api1509.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1509.getKqdm(),api1509.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
@@ -1365,6 +1390,10 @@
BeanUtils.copyProperties(api1510, apiData);
apiData.setPeriod(api1510.getPeriod() + "");
apiData.setAcctyear(api1510.getAcctyear() + "");
+ if(apiData.getNacctid().startsWith(api1510.getKqdm())){
+ apiData.setNacctid(apiData.getNacctid().replace(api1510.getKqdm(),api1510.getTykqbm()));
+ }
+ apiData.setBjw(ShAreaBjw.getBjw(code));
return apiData;
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -1791,7 +1820,7 @@
if (field.get(object) == null || field.get(object) == "") {
//鏍规嵁绫诲瀷璁剧疆榛樿鍊�
if (field.getType() == String.class) {
- field.set(object, "鏃�");
+ field.set(object, "绌�");
}
if (field.getType() == Integer.class) {
field.set(object, 0);
--
Gitblit v1.9.3