From 58c47f9f7fdd6e6991db9b43607e36d2175c35ad Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 26 十一月 2024 13:48:41 +0800
Subject: [PATCH] 调试上海接口，调整对应字段
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 275 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 3e28f38..b152c6a 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -11,7 +11,10 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
+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;
@@ -47,6 +50,8 @@
@Autowired
private Api1102Rep api1102Rep;
@Autowired
+ private Api9110Rep api9110Rep;
+ @Autowired
private Api1103Rep api1103Rep;
@Autowired
private Api1104Rep api1104Rep;
@@ -60,6 +65,8 @@
private Api1202Rep api1202Rep;
@Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1310Rep api1310Rep;
@Autowired
private Api1403Rep api1403Rep;
@Autowired
@@ -77,10 +84,19 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- String inteId = param.getInteId();
+
String kqdm = param.getKqdm();
- //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ String xzqhdm= "";
+ if(param.getInteId().startsWith("91")){
+ //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
+ List<Api9110> api9110List = api9110Rep.findPushData(kqdm);
+ xzqhdm = api9110List.get(0).getXzqhdm();
+ }else {
+ //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
+ List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+ xzqhdm = api1102List.get(0).getXzqhdm();
+ }
+
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
@@ -89,24 +105,19 @@
//娣诲姞鏃ュ織
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 jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
+ //鑾峰彇JSON鎶ユ枃
+ String jsonData = getJsonData(param.getInteId(), data, xzqhdm);
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
@@ -449,6 +460,15 @@
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);
@@ -472,6 +492,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;
@@ -485,6 +512,11 @@
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())) {
@@ -518,6 +550,13 @@
}
//绮鎬ц川
api1202.setLsxzdm("200");
+ //鍞伯浜轰俊鎭�
+ if(StringUtils.isEmpty(api1202.getSlr())){
+ api1202.setSlr("鍞伯浜�");
+ }
+ if(StringUtils.isEmpty(api1202.getSlrdz())){
+ api1202.setSlrdz("鍞伯浜哄湴鍧�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
@@ -631,7 +670,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(api1310List.get(0).getZjbgdh());
+ }
+ //鐢熸垚鏂瑰紡
+ if(null == api1205.getScfs()){
+ api1205.setScfs("1");
+ }
+ if(StringUtils.isEmpty(api1205.getSdblyy())){
+ api1205.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -750,6 +800,18 @@
//绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
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());
+ }
+ api1209.setCqqrbs(apiData.getCqqrbs() + "");
+ api1209.setSfch(apiData.getSfch() + "");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
return api1209;
@@ -837,6 +899,17 @@
//璁剧疆绌哄睘鎬т负榛樿鍊�
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();
@@ -1201,6 +1274,80 @@
//璁剧疆绌哄睘鎬т负榛樿鍊�
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)) {
+ Api1505 api1505 = (Api1505)data;
+ SH2023Api1505 apiData = new SH2023Api1505();
+ BeanUtils.copyProperties(api1505, apiData);
+ apiData.setCqunit(api1505.getCqunit() +"");
+ apiData.setCyear(api1505.getCyear() +"");
+ apiData.setCdc(api1505.getCdc() +"");
+ apiData.setBl(api1505.getBl() +"");
+ apiData.setNgrade(api1505.getNgrade() +"");
+ apiData.setBq(api1505.getBq() +"");
+ apiData.setCqunit(api1505.getCqunit() +"");
+ apiData.setBcash(api1505.getBcash() +"");
+ apiData.setBbank(api1505.getBbank() +"");
+ apiData.setBxjll(api1505.getBxjll() +"");
+ apiData.setBf(api1505.getBf() +"");
+ return apiData;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ Api1506 api1506 = (Api1506)data;
+ SH2023Api1506 apiData = new SH2023Api1506();
+ BeanUtils.copyProperties(api1506, apiData);
+ apiData.setCyear(api1506.getCyear() +"");
+ apiData.setNno(api1506.getNno() +"");
+ apiData.setCdc(api1506.getCdc() +"");
+ return apiData;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ Api1507 api1507 = (Api1507)data;
+ SH2023Api1507 apiData = new SH2023Api1507();
+ BeanUtils.copyProperties(api1507, apiData);
+ apiData.setCmon(api1507.getCmon() +"");
+ apiData.setCyear(api1507.getCyear() +"");
+ apiData.setNvno(api1507.getNvno() +"");
+ apiData.setNno(api1507.getNno() +"");
+ apiData.setCdc(api1507.getCdc() +"");
+ apiData.setBpt(api1507.getBpt() +"");
+ apiData.setNanum(api1507.getNanum() +"");
+ apiData.setBtmp(api1507.getBtmp() +"");
+ return apiData;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ Api1508 api1508 = (Api1508)data;
+ SH2023Api1508 apiData = new SH2023Api1508();
+ BeanUtils.copyProperties(api1508, apiData);
+ apiData.setCmon(api1508.getCmon() +"");
+ apiData.setCyear(api1508.getCyear() +"");
+ apiData.setNvno(api1508.getNvno() +"");
+ apiData.setNrowno(api1508.getNrowno() +"");
+ apiData.setCdc(api1508.getCdc() +"");
+ return apiData;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ Api1509 api1509 = (Api1509)data;
+ SH2023Api1509 apiData = new SH2023Api1509();
+ BeanUtils.copyProperties(api1509, apiData);
+ apiData.setDeprmethodid(api1509.getDeprmethodid() + "");
+ apiData.setSourceid(api1509.getSourceid() + "");
+ apiData.setUsingperiods(api1509.getUsingperiods() + "");
+ return apiData;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ Api1510 api1510 = (Api1510)data;
+ SH2023Api1510 apiData = new SH2023Api1510();
+ BeanUtils.copyProperties(api1510, apiData);
+ apiData.setPeriod(api1510.getPeriod() + "");
+ apiData.setAcctyear(api1510.getAcctyear() + "");
+ return apiData;
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(data);
@@ -1643,4 +1790,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_3201;
+ }
+ //鏉ョ伯妫�楠屼俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9115.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3202;
+ }
+ //绮鏀惰喘鍩虹淇℃伅鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9116.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_3203;
+ }
+ 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