From 447c6f6eadd1363a6575cbcbc1298f9d8cefdef2 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 25 十一月 2024 09:53:54 +0800
Subject: [PATCH] 调整-上海对农接口
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 505 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 477 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index c4f80bd..6638635 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -11,8 +11,10 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.order.common.data.OrderCommonData;
+import com.fzzy.push.nx2023.NX2023Constant;
import com.fzzy.push.sh2023.dto.*;
+import com.fzzy.push.sx2024.SX2024Constant;
+import com.fzzy.push.sx2024.data.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -21,7 +23,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.lang.reflect.Field;
import java.util.*;
@@ -63,6 +64,8 @@
@Autowired
private Api1205Rep api1205Rep;
@Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
private Api1403Rep api1403Rep;
@Autowired
private Api1404Rep api1404Rep;
@@ -79,7 +82,7 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- String inteId = param.getInteId();
+
String kqdm = param.getKqdm();
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
@@ -91,23 +94,18 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
-
- //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())
- || Constant.API_CODE_1114_1502.equals(param.getInteId())
- || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
- inteId = Constant.API_CODE_1114;
- }
- apiLog.setInteId(inteId);
-
- if (StringUtils.isEmpty(inteId)) {
+ if (StringUtils.isEmpty(param.getInteId())) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
apiLogRep.save(apiLog);
return responseDto;
}
+ apiLog.setInteId(param.getInteId());
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
+ //鑾峰彇JSON鎶ユ枃
String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
@@ -338,6 +336,11 @@
SH2023Api1107 api1107 = new SH2023Api1107();
BeanUtils.copyProperties(data, api1107);
api1107.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1107.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
+ api1107.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1107);
@@ -347,6 +350,11 @@
SH2023Api1108 api1108 = new SH2023Api1108();
BeanUtils.copyProperties(data, api1108);
api1108.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1108.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
+ api1108.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1108);
@@ -357,6 +365,11 @@
Api1109 apiData = (Api1109) data;
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1109.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
+ api1109.setTykqbm(tykqbm);
+ }
Map<String, String> map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
@@ -374,6 +387,12 @@
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());
@@ -386,6 +405,11 @@
SH2023Api1111 api1111 = new SH2023Api1111();
BeanUtils.copyProperties(data, api1111);
api1111.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1111.getTykqbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
+ api1111.setTykqbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1111);
@@ -397,6 +421,16 @@
api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
api1112.setZy("01");
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1112.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
+ api1112.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1112.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
+ api1112.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1112);
@@ -406,15 +440,33 @@
SH2023Api1113 api1113 = new SH2023Api1113();
BeanUtils.copyProperties(data, api1113);
api1113.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1113.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
+ api1113.setTydwbm(tydwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1113);
return api1113;
+ }
+ //鏁版嵁鐩哥鎬ф帴鍙�
+ if (SH2023Constant.SH_2023_API_CODE_1115.equals(inteId)) {
+ SH2023Api1115 api1115 = new SH2023Api1115();
+ BeanUtils.copyProperties(data, api1115);
+ api1115.setBjw(ShAreaBjw.getBjw(code));
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ changeObject(api1115);
+ return api1115;
}
if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
SH2023Api1201 api1201 = new SH2023Api1201();
BeanUtils.copyProperties(data, api1201);
api1201.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1201.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
+ api1201.setTydwbm(tydwbm);
+ }
api1201.setHtsfzz("0");
//鍚堝悓绛捐鍦扮偣涓嶈兘涓虹┖鎴栧～鏃�
if (StringUtils.isEmpty(api1201.getQddd())) {
@@ -429,6 +481,13 @@
if(StringUtils.isEmpty(api1201.getKhtyshxydm())){
api1201.setGxfs("3");
}
+ //浠樻鏂瑰紡
+ if(StringUtils.isEmpty(api1201.getFkfs())){
+ api1201.setFkfs("4");
+ }
+ if(StringUtils.isEmpty(api1201.getYsfs())){
+ api1201.setYsfs("鎸夊皝浠撴暟閲忚繘琛岄獙鏀�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1201);
return api1201;
@@ -438,6 +497,16 @@
Api1202 apiData = (Api1202) data;
BeanUtils.copyProperties(apiData, api1202);
api1202.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1202.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
+ api1202.setTyhwbm(tyhwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1202.getLqgsdwtybm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0,18));
+ api1202.setLqgsdwtybm(tydwbm);
+ }
api1202.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1202.getCddm())) {
api1202.setCddm(api1202.getHwdm().substring(2, 8));
@@ -470,6 +539,13 @@
}
//绮鎬ц川
api1202.setLsxzdm("200");
+ //鍞伯浜轰俊鎭�
+ if(StringUtils.isEmpty(api1202.getSlr())){
+ api1202.setSlr("鍞伯浜�");
+ }
+ if(StringUtils.isEmpty(api1202.getSlrdz())){
+ api1202.setSlrdz("鍞伯浜哄湴鍧�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
@@ -480,6 +556,11 @@
Api1203 apiData = (Api1203) data;
BeanUtils.copyProperties(apiData, api1203);
api1203.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1203.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
+ api1203.setTyhwbm(tyhwbm);
+ }
if (StringUtils.isEmpty(api1203.getJyxm())) {
api1203.setJyxm("0");
}
@@ -514,7 +595,11 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1204.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
+ api1204.setTyhwbm(tyhwbm);
+ }
//璁剧疆鎵规鍙�
if (StringUtils.isNotEmpty(api1204.getHth())) {
List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
@@ -542,7 +627,11 @@
Api1205 apiData = (Api1205) data;
BeanUtils.copyProperties(apiData, api1205);
api1205.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1205.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
+ api1205.setTyhwbm(tyhwbm);
+ }
api1205.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1205.getCddm())) {
api1205.setCddm(api1205.getHwdm().substring(2, 8));
@@ -570,7 +659,18 @@
if (null != api1208List && api1208List.size() > 0) {
api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //璐ㄦ鍗曞彿
+ List<Api1310> api1310List = api1310Rep.getDataByHwdm(api1205.getHwdm(), "02");
+ if (null != api1310List && api1310List.size() > 0) {
+ api1205.setZjbgdh(apiData.getHwdm() + api1310List.get(0).getZjbgdh());
+ }
+ //鐢熸垚鏂瑰紡
+ if(null == api1205.getScfs()){
+ api1205.setScfs(1);
+ }
+ if(StringUtils.isEmpty(api1205.getSdblyy())){
+ api1205.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -580,6 +680,11 @@
Api1206 apiData = (Api1206) data;
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1206.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1206.setTykqbm(tykqbm);
+ }
//鎵规鍙�
if (StringUtils.isNotEmpty(api1206.getHth())) {
List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
@@ -608,6 +713,16 @@
api1207.setDcrq(apiData.getDcrq());
api1207.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1207.getDcdwtybm())){
+ String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
+ api1207.setDcdwtybm(dckqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1207.getDchwtybm())){
+ String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
+ api1207.setDchwtybm(dchwtybm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
if (null != api1208List && api1208List.size() > 0) {
@@ -625,6 +740,16 @@
api1208.setZglkdm(api1208.getHwdm().substring(0, 21));
api1208.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getZglktybm())){
+ String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm());
+ api1208.setZglktybm(lqgstydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
+ api1208.setTyhwbm(tyhwbm);
+ }
//璁剧疆鎵规鍙�
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
if (StringUtils.isEmpty(api1208.getCd())) {
@@ -656,10 +781,24 @@
if (null != api1208List && api1208List.size() > 0) {
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1209.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
+ api1209.setTyhwbm(tyhwbm);
+ }
//绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
api1209.setLsxzdm("122");
+ //鎹熺泭鐜妭锛岄粯璁ゅ嚭搴撴崯鑰�
+ if(StringUtils.isEmpty(api1209.getSyhj())){
+ api1209.setSyhj("2");
+ }
+ //鑾峰彇涓婃捣瑙勮寖鎹熺泭绫诲瀷
+ api1209.setSylx(getShSylxByGb(api1209.getSylx()));
+ //鍏ュ簱鏁伴噺
+ if(api1209.getRksl() < api1209.getRkjz()){
+ api1209.setRksl(api1209.getRkjz());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
return api1209;
@@ -670,6 +809,11 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1210.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
+ api1210.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -704,6 +848,11 @@
BeanUtils.copyProperties(apiData, api1211);
api1211.setZglkdm(api1211.getKqdm());
api1211.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1211.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm());
+ api1211.setTyhwbm(tyhwbm);
+ }
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
@@ -711,6 +860,11 @@
}
//涓荤绮簱浠ｇ爜
api1211.setZglkdm(apiData.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1211.getZglktybm())){
+ String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
+ api1211.setZglktybm(zglktybm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
return api1211;
@@ -719,16 +873,40 @@
SH2023Api1212 api1212 = new SH2023Api1212();
BeanUtils.copyProperties(data, api1212);
api1212.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1212.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
+ api1212.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1212.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
+ api1212.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1212);
return api1212;
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1213.equals(inteId)) {
+ Api1213 api1213 = (Api1213) data;
+ SH2023Api1213 apiData = new SH2023Api1213();
+ BeanUtils.copyProperties(api1213, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1213.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
}
if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
SH2023Api1301 api1301 = new SH2023Api1301();
BeanUtils.copyProperties(data, api1301);
api1301.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1301.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
+ api1301.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1301);
return api1301;
@@ -738,6 +916,11 @@
Api1302 apiData = (Api1302) data;
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1302.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
+ api1302.setTyhwbm(tyhwbm);
+ }
api1302.setLqjs("1");
//鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
@@ -756,6 +939,11 @@
Api1303 apiData = (Api1303) data;
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1303.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
+ api1303.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -769,6 +957,11 @@
Api1304 apiData = (Api1304) data;
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1304.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
+ api1304.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -784,6 +977,11 @@
BeanUtils.copyProperties(apiData, api1305);
api1305.setBjw(ShAreaBjw.getBjw(code));
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1305.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm());
+ api1305.setTyajbm(tyajbm);
+ }
//涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
@@ -800,6 +998,11 @@
BeanUtils.copyProperties(apiData, api1306);
api1306.setBjw(ShAreaBjw.getBjw(code));
api1306.setAjdm(apiData.getHwdm().substring(0, 28));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1306.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm());
+ api1306.setTyajbm(tyajbm);
+ }
//涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
//璁剧疆鎵规鍙�
@@ -820,7 +1023,21 @@
BeanUtils.copyProperties(apiData, api1307);
api1307.setBjw(ShAreaBjw.getBjw(code));
api1307.setAjdm(apiData.getHwdm().substring(0, 28));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
+ api1307.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm());
+ api1307.setTyajbm(tyajbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
+ api1307.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1307);
return api1307;
@@ -831,7 +1048,16 @@
BeanUtils.copyProperties(apiData, api1308);
api1308.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1308.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
+ api1308.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1308.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm());
+ api1308.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1308);
return api1308;
@@ -840,6 +1066,11 @@
SH2023Api1309 api1309 = new SH2023Api1309();
BeanUtils.copyProperties(data, api1309);
api1309.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1309.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1309.getQydm());
+ api1309.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1309);
return api1309;
@@ -850,7 +1081,11 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1310.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
+ api1310.setTyhwbm(tyhwbm);
+ }
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -893,7 +1128,11 @@
SH2023Api1311 api1311 = new SH2023Api1311();
BeanUtils.copyProperties(data, api1311);
api1311.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1311.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
+ api1311.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1311);
return api1311;
@@ -902,7 +1141,11 @@
SH2023Api1401 api1401 = new SH2023Api1401();
BeanUtils.copyProperties(data, api1401);
api1401.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1401.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy());
+ api1401.setTydwbm(tydwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1401);
return api1401;
@@ -925,7 +1168,11 @@
api1403.setJhzxdw(api1101List.get(0).getDwdm());
api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1403.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1403.getJhzxdw());
+ api1403.setTydwbm(tydwbm);
+ }
//鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺
List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
@@ -951,7 +1198,11 @@
BeanUtils.copyProperties(data, api1404);
api1404.setMxzt("1");
api1404.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1404.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
+ api1404.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1404);
return api1404;
@@ -968,6 +1219,17 @@
if (null != api1208List && api1208List.size() > 0) {
apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
}
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDrdwtybm())){
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
+ apiData.setDrdwtybm(drkqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDrhwtybm())){
+ String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+ apiData.setDrhwtybm(drhwtybm);
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -975,6 +1237,11 @@
if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
SH2023Api2103 apiData = new SH2023Api2103();
BeanUtils.copyProperties(data, apiData);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -994,6 +1261,42 @@
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(data);
return data;
+ }
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ Api1504 api1504 = (Api1504)data;
+ SH2023Api1504 apiData = new SH2023Api1504();
+ BeanUtils.copyProperties(api1504, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ SH2023Api1505 apiData = new SH2023Api1505();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ SH2023Api1506 apiData = new SH2023Api1506();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ SH2023Api1507 apiData = new SH2023Api1507();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ SH2023Api1508 apiData = new SH2023Api1508();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ SH2023Api1509 apiData = new SH2023Api1509();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ SH2023Api1510 apiData = new SH2023Api1510();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(data);
@@ -1159,6 +1462,17 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1503.getDwdm());
+ shFinanceDto.setKqdm(api1503.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("03");
shFinanceDto.setCzbz(api1503.getCzbz());
@@ -1209,6 +1523,17 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1502.getDwdm());
+ shFinanceDto.setKqdm(api1502.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("02");
shFinanceDto.setCzbz(api1502.getCzbz());
@@ -1261,6 +1586,17 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1501.getDwdm());
+ shFinanceDto.setKqdm(api1501.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("01");
shFinanceDto.setCzbz(api1501.getCzbz());
@@ -1368,7 +1704,7 @@
}
private String getYwdh(String wjlx, String wjmc, String ywdh) {
String[] s = wjmc.split("_");
- if ("2".equals(wjlx) || "3".equals(wjlx)) {
+ if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
ywdh = s[1];
}
return ywdh;
@@ -1403,4 +1739,117 @@
return object;
}
+ private String getShSylxByGb(String gbSylx){
+ if("1".equals(gbSylx)){
+ return "2";
+ }
+ if("2".equals(gbSylx)){
+ return "1";
+ }
+ return gbSylx;
+ }
+
+ /**
+ * 鏍规嵁鎺ュ彛缂栫爜鑾峰彇瀵瑰簲鐨勬帴鍙ｆ暟鎹簱琛ㄥ悕
+ *
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ //鏁版嵁鐩哥鎬�
+ if (Constant.API_CODE_9101.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1115;
+ }
+ //瑙嗛鐩戞帶鎺ュ彛
+ if (Constant.API_CODE_9102.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1311;
+ }
+ //鍊掍粨鍊掑叆鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9103.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2102;
+ }
+ //绮儏璁惧閰嶇疆鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9104.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2103;
+ }
+ //妫�鏂ゅ崟鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9105.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2101;
+ }
+ //甯傚偍椹宠繍鍗曚俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9106.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2104;
+ }
+ //浜ゆ槗涓績鍚堝悓淇″績鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9107.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2203;
+ }
+ //瀹氬寲姘存楠屾帴鍙�
+ if (Constant.API_CODE_9108.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2204;
+ }
+ //鍗曚綅淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9109.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3101;
+ }
+ //鏀剁撼搴撲俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9110.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3102;
+ }
+ //浠撴埧淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9111.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3103;
+ }
+ //寤掗棿淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9112.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3104;
+ }
+ //璐т綅淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9113.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3105;
+ }
+ //绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9114.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3106;
+ }
+ //鏉ョ伯妫�楠屼俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9115.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3107;
+ }
+ //绮鏀惰喘鍩虹淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9116.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3108;
+ }
+ if (Constant.API_CODE_1501.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1502.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1503.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1116;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1117;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1118;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1119;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1120;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1121;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1122;
+ }
+ return inteId;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3