From f6c758e165d5ff5900e27b8b305857fde9ac80b6 Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期四, 25 七月 2024 19:06:56 +0800 Subject: [PATCH] 增加宁夏省平台2004版协议 --- src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 303 +++++-------------------------------------------- 1 files changed, 34 insertions(+), 269 deletions(-) diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java index 09d58ce..76d1034 100644 --- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java +++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java @@ -1,7 +1,6 @@ package com.fzzy.push.nx2023; import com.alibaba.fastjson.JSON; -import com.fzzy.api.Constant; import com.fzzy.api.data.ApiParam; import com.fzzy.api.data.PushProtocol; import com.fzzy.api.dto.ResponseDto; @@ -69,10 +68,8 @@ @Override public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) { - String inteId = param.getInteId(); String kqdm = param.getKqdm(); - //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮� - List<Api1102> api1102List = api1102Rep.findPushData(kqdm); + try { if (null == conf) { conf = apiCommonService.getConf(kqdm); @@ -82,12 +79,8 @@ 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; - } + //鑾峰彇鎺ュ彛缂栫爜 + String inteId = this.getInteId(param.getInteId()); apiLog.setInteId(inteId); if (StringUtils.isEmpty(inteId)) { @@ -98,7 +91,7 @@ return responseDto; } - String jsonData = getJsonData(param.getInteId(), data, conf); + String jsonData = getJsonData(param.getInteId(), data); log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData); apiLog.setData(jsonData); apiLog.setKqdm(kqdm); @@ -134,7 +127,7 @@ //鎽樿锛屾暟鎹富浣撶殑MD5鍊� reqData.setDigst(MyMD5Util.encrypt(jsonData)); log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData)); - Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf); + Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData)); apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getResult()); @@ -157,16 +150,16 @@ * @param data * @return */ - private String getJsonData(String inteId, Object data, ApiConfs conf) { + private String getJsonData(String inteId, Object data) { //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114 if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId) || NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId) || NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) { - Object object = getJsonFinanceData(inteId, data, conf); + Object object = getJsonFinanceData(inteId, data); return JSON.toJSONString(object); } else { List<Object> list = new ArrayList<>(); - Object object = getJsonApiData(inteId, data, conf); + Object object = getJsonApiData(inteId, data); //闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂� if(!NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)){ @@ -186,87 +179,46 @@ * @param data * @return */ - private Object getJsonApiData(String inteId, Object data, ApiConfs conf) { + private Object getJsonApiData(String inteId, Object data) { if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) { - Nx2023Api1101 api1101 = new Nx2023Api1101(); BeanUtils.copyProperties(data, api1101); - //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱 - if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){ - api1101.setTydwbm(null); - } return api1101; } if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) { Nx2023Api1102 api1102 = new Nx2023Api1102(); BeanUtils.copyProperties(data, api1102); api1102.setLkxz(null); - //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱 - if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){ - api1102.setTykqbm(null); - api1102.setLkxz("1"); - } return api1102; } if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) { - Nx2023Api1103 api1103 = new Nx2023Api1103(); BeanUtils.copyProperties(data, api1103); - //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱 - if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){ - api1103.setTycfbm(null); - } return api1103; } if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) { - Nx2023Api1104 api1104 = new Nx2023Api1104(); BeanUtils.copyProperties(data, api1104); - //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱 - if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){ - api1104.setTyajbm(null); - } return api1104; } if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) { - Nx2023Api1105 api1105 = new Nx2023Api1105(); BeanUtils.copyProperties(data, api1105); - //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱 - if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){ - api1105.setTyhwbm(null); - } return api1105; } if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) { - Nx2023Api1106 api1106 = new Nx2023Api1106(); BeanUtils.copyProperties(data, api1106); - //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱 - if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){ - api1106.setTyygbm(null); - } return api1106; } if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) { - Nx2023Api1107 api1107 = new Nx2023Api1107(); BeanUtils.copyProperties(data, api1107); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm()); - api1107.setTykqbm(tykqbm); - } return api1107; } if (NX2023Constant.NX_2023_API_CODE_1108.equals(inteId)) { Nx2023Api1108 api1108 = new Nx2023Api1108(); BeanUtils.copyProperties(data, api1108); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm()); - api1108.setTykqbm(tykqbm); - } return api1108; } if (NX2023Constant.NX_2023_API_CODE_1109.equals(inteId)) { @@ -276,252 +228,120 @@ Map<String, String> map = new HashMap<>(); map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz())); api1109.setWjl(JSON.toJSONString(map)); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm()); - api1109.setTykqbm(tykqbm); - } return api1109; } if (NX2023Constant.NX_2023_API_CODE_1110.equals(inteId)) { Nx2023Api1110 api1110 = new Nx2023Api1110(); BeanUtils.copyProperties(data, api1110); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm()); - api1110.setTyhwbm(tyhwbm); - } return api1110; } if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) { Nx2023Api1111 api1111 = new Nx2023Api1111(); BeanUtils.copyProperties(data, api1111); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm()); - api1111.setTykqbm(api1102List.getTykqbm()); - } return api1111; } if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) { Api1112 apiData = (Api1112) data; Nx2023Api1112 api1112 = new Nx2023Api1112(); BeanUtils.copyProperties(apiData, api1112); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm()); - api1112.setTydwbm(tydwbm); - String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm()); - api1112.setTykqbm(tykqbm); - } return api1112; } if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) { Nx2023Api1113 api1113 = new Nx2023Api1113(); BeanUtils.copyProperties(data, api1113); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm()); - api1113.setTydwbm(tydwbm); - } return api1113; } if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) { Api1201 apiData = (Api1201) data; Nx2023Api1201 api1201 = new Nx2023Api1201(); BeanUtils.copyProperties(apiData, api1201); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm()); - api1201.setTydwbm(tydwbm); - } return api1201; } if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) { Nx2023Api1202 api1202 = new Nx2023Api1202(); BeanUtils.copyProperties(data, api1202); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm()); - api1202.setTyhwbm(tyhwbm); - } return api1202; } if (NX2023Constant.NX_2023_API_CODE_1203.equals(inteId)) { Nx2023Api1203 api1203 = new Nx2023Api1203(); BeanUtils.copyProperties(data, api1203); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm()); - api1203.setTyhwbm(tyhwbm); - } return api1203; } if (NX2023Constant.NX_2023_API_CODE_1204.equals(inteId)) { Nx2023Api1204 api1204 = new Nx2023Api1204(); BeanUtils.copyProperties(data, api1204); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm()); - api1204.setTyhwbm(tyhwbm); - } return api1204; } if (NX2023Constant.NX_2023_API_CODE_1205.equals(inteId)) { Nx2023Api1205 api1205 = new Nx2023Api1205(); BeanUtils.copyProperties(data, api1205); api1205.setSzlx("09"); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm()); - api1205.setTyhwbm(tyhwbm); - api1205.setSzlx(null); - } return api1205; } if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) { Api1206 apiData = (Api1206) data; Nx2023Api1206 api1206 = new Nx2023Api1206(); BeanUtils.copyProperties(apiData, api1206); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18)); - api1206.setTydwbm(tydwbm); - } return api1206; } if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) { Nx2023Api1207 api1207 = new Nx2023Api1207(); BeanUtils.copyProperties(data, api1207); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw()); - api1207.setDckqtybm(dckqtybm); - String drkqtybm = apiCommonService.getTykqbm(api1207.getDrdw()); - api1207.setDrkqtybm(drkqtybm); - String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm()); - api1207.setDchwtybm(dchwtybm); - String drhwtybm = apiCommonService.getTyhwbm(api1207.getDrhwdm()); - api1207.setDrhwtybm(drhwtybm); - } return api1207; } if (NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)) { Nx2023Api1208 api1208 = new Nx2023Api1208(); BeanUtils.copyProperties(data, api1208); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm()); - api1208.setTyhwbm(tyhwbm); - if(StringUtils.isEmpty(api1208.getTyhwbm())){ - String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm()); - api1208.setLqgstydwbm(lqgstydwbm); - } - } return api1208; } if (NX2023Constant.NX_2023_API_CODE_1209.equals(inteId)) { Nx2023Api1209 api1209 = new Nx2023Api1209(); BeanUtils.copyProperties(data, api1209); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm()); - api1209.setTyhwbm(tyhwbm); - } return api1209; } if (NX2023Constant.NX_2023_API_CODE_1210.equals(inteId)) { Nx2023Api1210 api1210 = new Nx2023Api1210(); BeanUtils.copyProperties(data, api1210); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm()); - api1210.setTyhwbm(tyhwbm); - } return api1210; } if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) { Nx2023Api1211 api1211 = new Nx2023Api1211(); BeanUtils.copyProperties(data, api1211); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tykqbm = apiCommonService.getTykqbm(api1211.getKqdm()); - api1211.setTykqbm(tykqbm); - } return api1211; } if (NX2023Constant.NX_2023_API_CODE_1212.equals(inteId)) { Nx2023Api1212 api1212 = new Nx2023Api1212(); BeanUtils.copyProperties(data, api1212); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm()); - api1212.setTydwbm(tydwbm); - String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm()); - api1212.setTykqbm(tykqbm); - } return api1212; } if (NX2023Constant.NX_2023_API_CODE_1301.equals(inteId)) { Nx2023Api1301 api1301 = new Nx2023Api1301(); BeanUtils.copyProperties(data, api1301); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(api1301.getDwdm()); - api1301.setTydwbm(tydwbm); - String tykqbm = apiCommonService.getTykqbm(api1301.getKqdm()); - api1301.setTykqbm(tykqbm); - } return api1301; } if (NX2023Constant.NX_2023_API_CODE_1302.equals(inteId)) { Nx2023Api1302 api1302 = new Nx2023Api1302(); BeanUtils.copyProperties(data, api1302); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm()); - api1302.setTyhwbm(tyhwbm); - } return api1302; } if (NX2023Constant.NX_2023_API_CODE_1303.equals(inteId)) { Nx2023Api1303 api1303 = new Nx2023Api1303(); BeanUtils.copyProperties(data, api1303); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm()); - api1303.setTyhwbm(tyhwbm); - } return api1303; } if (NX2023Constant.NX_2023_API_CODE_1304.equals(inteId)) { Nx2023Api1304 api1304 = new Nx2023Api1304(); BeanUtils.copyProperties(data, api1304); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm()); - api1304.setTyhwbm(tyhwbm); - } return api1304; } if (NX2023Constant.NX_2023_API_CODE_1305.equals(inteId)) { Nx2023Api1305 api1305 = new Nx2023Api1305(); BeanUtils.copyProperties(data, api1305); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tycfbm = apiCommonService.getTycfbm(api1305.getCfdm()); - api1305.setTycfbm(tycfbm); - } return api1305; } if (NX2023Constant.NX_2023_API_CODE_1306.equals(inteId)) { Nx2023Api1306 api1306 = new Nx2023Api1306(); BeanUtils.copyProperties(data, api1306); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tycfbm = apiCommonService.getTycfbm(api1306.getCfdm()); - api1306.setTycfbm(tycfbm); - } return api1306; } if (NX2023Constant.NX_2023_API_CODE_1307.equals(inteId)) { @@ -532,46 +352,21 @@ Map<String, String> map = new HashMap<>(); map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz())); api1307.setCntxwjl(JSON.toJSONString(map)); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - api1307.setTxwjhzm(null); - String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm()); - api1307.setTykqbm(tykqbm); - String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm()); - api1307.setTycfbm(tycfbm); - String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm()); - api1307.setTyhwbm(tyhwbm); - } return api1307; } if (NX2023Constant.NX_2023_API_CODE_1308.equals(inteId)) { Nx2023Api1308 api1308 = new Nx2023Api1308(); BeanUtils.copyProperties(data, api1308); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm()); - api1308.setTykqbm(tykqbm); - } return api1308; } if (NX2023Constant.NX_2023_API_CODE_1309.equals(inteId)) { Nx2023Api1309 api1309 = new Nx2023Api1309(); BeanUtils.copyProperties(data, api1309); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(api1309.getQydm()); - api1309.setWgdwtybm(tydwbm); - } return api1309; } if (NX2023Constant.NX_2023_API_CODE_1310.equals(inteId)) { Nx2023Api1310 api1310 = new Nx2023Api1310(); BeanUtils.copyProperties(data, api1310); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm()); - api1310.setTyhwbm(tyhwbm); - } return api1310; } if (NX2023Constant.NX_2023_API_CODE_1401.equals(inteId)) { @@ -587,34 +382,37 @@ if (NX2023Constant.NX_2023_API_CODE_1403.equals(inteId)) { Nx2023Api1403 api1403 = new Nx2023Api1403(); BeanUtils.copyProperties(data, api1403); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw()); - api1403.setJhxddwtybm(tydwbm); - } return api1403; } if (NX2023Constant.NX_2023_API_CODE_1404.equals(inteId)) { Nx2023Api1404 api1404 = new Nx2023Api1404(); BeanUtils.copyProperties(data, api1404); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm()); - api1404.setLhhwtybm(tyhwbm); - } return api1404; } if (NX2023Constant.NX_2023_API_CODE_1405.equals(inteId)) { Nx2023Api1405 api1405 = new Nx2023Api1405(); BeanUtils.copyProperties(data, api1405); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - String tydwbm = apiCommonService.getTydwbm(api1405.getXmdm()); - api1405.setTydwbm(tydwbm); - } return api1405; } return data; + } + + /** + * 鑾峰彇涓婁紶鐨勬帴鍙g紪鐮� + * @param inteId + * @return + */ + private String getInteId(String inteId) { + if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) { + return NX2023Constant.NX_2023_API_CODE_1114; + } + if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) { + return NX2023Constant.NX_2023_API_CODE_1114; + } + if (NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) { + return NX2023Constant.NX_2023_API_CODE_1114; + } + return inteId; } /** @@ -641,33 +439,22 @@ * @param data * @return */ - private Object getJsonFinanceData(String inteId, Object data, ApiConfs conf) { + private Object getJsonFinanceData(String inteId, Object data) { //璐㈠姟鎶ヨ〃鏁版嵁灏佽 if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) { - return copyApi1501((Api1501) data, conf); + return copyApi1501((Api1501) data); } else if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) { - return copyApi1502((Api1502) data, conf); + return copyApi1502((Api1502) data); } else { - return copyApi1503((Api1503) data, conf); + return copyApi1503((Api1503) data); } } - private List<NxFinanceDto> copyApi1503(Api1503 api1503, ApiConfs conf) { + private List<NxFinanceDto> copyApi1503(Api1503 api1503) { List<NxFinanceDto> list = new ArrayList<>(); NxFinanceDto nxFinanceDto = new NxFinanceDto(); nxFinanceDto.setDwdm(api1503.getDwdm()); nxFinanceDto.setKqdm(api1503.getKqdm()); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){ - String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm()); - nxFinanceDto.setTydwbm(tydwbm); - } - if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){ - String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm()); - nxFinanceDto.setTykqbm(tykqbm); - } - } nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd")); nxFinanceDto.setBbm("03"); @@ -715,22 +502,11 @@ return list; } - private List<NxFinanceDto> copyApi1502(Api1502 api1502, ApiConfs conf) { + private List<NxFinanceDto> copyApi1502(Api1502 api1502) { List<NxFinanceDto> list = new ArrayList<>(); NxFinanceDto nxFinanceDto = new NxFinanceDto(); nxFinanceDto.setDwdm(api1502.getDwdm()); nxFinanceDto.setKqdm(api1502.getKqdm()); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){ - String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm()); - nxFinanceDto.setTydwbm(tydwbm); - } - if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){ - String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm()); - nxFinanceDto.setTykqbm(tykqbm); - } - } nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd")); nxFinanceDto.setBbm("02"); nxFinanceDto.setCzbz(api1502.getCzbz()); @@ -779,22 +555,11 @@ return list; } - private List<NxFinanceDto> copyApi1501(Api1501 api1501, ApiConfs conf) { + private List<NxFinanceDto> copyApi1501(Api1501 api1501) { List<NxFinanceDto> list = new ArrayList<>(); NxFinanceDto nxFinanceDto = new NxFinanceDto(); nxFinanceDto.setDwdm(api1501.getDwdm()); nxFinanceDto.setKqdm(api1501.getKqdm()); - //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� - if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){ - if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){ - String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm()); - nxFinanceDto.setTydwbm(tydwbm); - } - if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){ - String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm()); - nxFinanceDto.setTykqbm(tykqbm); - } - } nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd")); nxFinanceDto.setBbm("01"); nxFinanceDto.setCzbz(api1501.getCzbz()); -- Gitblit v1.9.3