From f3d2007e78e8df1064ee7a3b4b9b4c790717fba7 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 四月 2024 16:09:33 +0800
Subject: [PATCH] 调整广东省平台市局推送-增加指令推送，测试使用
---
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 1127 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 812 insertions(+), 315 deletions(-)
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index a83ebc4..482be71 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -9,13 +9,16 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.gd2022.dto.*;
-import com.fzzy.push.gd2022.dto.Api1101;
-import com.fzzy.push.gd2022.dto.Api1109;
-import com.fzzy.push.gd2022.dto.Api1208;
-import com.fzzy.push.gd2022.dto.Api1307;
-import com.fzzy.push.gd2022.dto.Api1308;
+import com.fzzy.push.gd2022.dto.Gd2022Api1101;
+import com.fzzy.push.gd2022.dto.Gd2022Api1109;
+import com.fzzy.push.gd2022.dto.Gd2022Api1208;
+import com.fzzy.push.gd2022.dto.Gd2022Api1307;
+import com.fzzy.push.gd2022.dto.Gd2022Api1308;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -25,6 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.lang.reflect.Field;
import java.util.*;
/**
@@ -45,7 +49,12 @@
@Autowired
private ApiCommonService apiCommonService;
-
+ @Autowired
+ private Api1404Rep api1404Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -55,7 +64,18 @@
}
@Override
+ public ResponseDto pushData(ApiParam param, Object data) {
+ return pushData(param, null, data);
+ }
+
+ @Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
+ 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())) {
+ return pushFinanceData(param, conf, data);
+ }
+
String inteId = param.getInteId();
String kqdm = param.getKqdm();
String bizId = param.getBizId();
@@ -75,7 +95,7 @@
String jsonData = getJsonData(inteId, data, conf.getApiUrl(), token);
log.info("鎶ユ枃淇℃伅=" + jsonData);
inteId = getInteId(inteId);
- if(StringUtils.isEmpty(inteId)){
+ if (StringUtils.isEmpty(inteId)) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�", bizId);
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
@@ -102,15 +122,14 @@
}
Map<String, Object> map = new HashMap<>();
- GD2022ResponseDto responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId,jsonData,conf, token);
+ GD2022ResponseDto responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf, token);
responseDto.setBizId(bizId);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getMsg());
apiLogRep.save(apiLog);
- ResponseDto resd= new ResponseDto();
+ ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getMsg());
- //updateGD2022AuthToken(responseDto,conf, token);
return resd;
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -118,85 +137,96 @@
}
}
- @Override
- public ResponseDto pushData(ApiParam param, Object data) {
- return pushData(param, null, data);
+ /**
+ * 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
+ *
+ * @param param
+ * @param conf
+ * @param data
+ * @return
+ */
+ private ResponseDto pushFinanceData(ApiParam param, ApiConfs conf, Object data) {
+
+ String inteId = param.getInteId();
+ String kqdm = param.getKqdm();
+ String bizId = param.getBizId();
+
+ try {
+
+ if (null == conf) {
+ conf = apiCommonService.getConf(kqdm);
+ }
+ //鑾峰彇TOKEN
+ GD2022AuthToken token = getGD2022AuthToken(conf);
+
+ //娣诲姞LOGO
+ ApiLog apiLog = new ApiLog();
+ apiLog.setId(ContextUtil.getUUID());
+ apiLog.setInteId(inteId);
+
+
+ inteId = getInteId(inteId);
+ if (StringUtils.isEmpty(inteId)) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�", bizId);
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+
+ if (conf == null) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�", bizId);
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+ if (null == token) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒癟OKEN淇℃伅", bizId);
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒癟OKEN淇℃伅");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ List<GDFinanceDto> list = null;
+ if (Constant.API_CODE_1114_1501.equals(param.getInteId())) {
+ list = copyApi1501((Api1501) data);
+ } else if (Constant.API_CODE_1114_1502.equals(param.getInteId())) {
+ list = copyApi1502((Api1502) data);
+ } else if (Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ list = copyApi1503((Api1503) data);
+ }
+ GD2022ResponseDto responseDto;
+ ResponseDto resd = null;
+ String jsonData;
+ for (GDFinanceDto gdFinanceDto : list) {
+ resd = new ResponseDto();
+ jsonData = getJsonData(param.getInteId(), gdFinanceDto, conf.getApiUrl(), token);
+ log.info("鎶ユ枃淇℃伅=" + jsonData);
+ responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf, token);
+ responseDto.setBizId(bizId);
+
+ apiLog.setData(jsonData);
+ apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ apiLog.setResult(responseDto.getMsg());
+
+ resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ resd.setMsg(responseDto.getMsg());
+ if (resd.success > 0) {
+ break;
+ }
+ }
+ apiLogRep.save(apiLog);
+ return resd;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return new ResponseDto(99, e.getMessage());
+ }
}
-
-
-// /**
-// * @Desc: 鍥芥爣鑷畾涔夋柟娉�
-// * @author: Andy
-// * @update-time: 2022/10/10
-// */
-// public GD2022ResponseDto pushData(String inteId, String kqdm, String bizId, Object data) {
-// ApiConfs conf = apiCommonService.getConf(kqdm);
-//
-// ApiParam param = new ApiParam(conf);
-//
-// param.setInteId(inteId);
-// param.setInteCategory(inteId.substring(0, 2));
-// param.setBizId(bizId);
-//
-// return pushData(param, conf, data);
-// }
-
-
-// /**
-// * 鍗曟潯涓婁紶鏁版嵁
-// *
-// * @param inteId
-// * @param data
-// * @return
-// */
-// public ResponseDto pushData(String inteId, ApiParent data) {
-// try {
-// //鑾峰彇閰嶇疆
-// ApiConfs conf = apiCommonService.getConf(data.getKqdm());
-// //鑾峰彇TOKEN
-// GD2022AuthToken token = getGD2022AuthToken(conf);
-//
-// //娣诲姞LOGO
-// ApiLog apiLog = new ApiLog();
-// apiLog.setId(ContextUtil.getUUID());
-// if (!Constant.API_CODE_1109.equals(inteId)) {
-// apiLog.setData(JSON.toJSONString(data));
-// }
-// apiLog.setInteId(inteId);
-// apiLog.setKqdm(data.getKqdm());
-// apiLog.setUploadTime(new Date());
-//
-// if (conf == null) {
-// GD2022ResponseDto responseDto = new GD2022ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�", data.getBizId());
-// apiLog.setStatus(99);
-// apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
-// apiLogRep.save(apiLog);
-// return responseDto;
-// }
-// if (null == token) {
-// GD2022ResponseDto responseDto = new GD2022ResponseDto(99, "娌℃湁鑾峰彇鍒癟OKEN淇℃伅", data.getBizId());
-// apiLog.setStatus(99);
-// apiLog.setResult("娌℃湁鑾峰彇鍒癟OKEN淇℃伅");
-// apiLogRep.save(apiLog);
-// return responseDto;
-// }
-//
-// Map<String, Object> map = new HashMap<>();
-// GD2022ResponseDto responseDto = GD2022HttpClientUtil.postPushData(conf.getApiUrl() + inteId,JSON.toJSONString(data),conf, token);
-// responseDto.setBizId(data.getBizId());
-// apiLog.setStatus(responseDto.getSuccess());
-// apiLog.setResult(responseDto.getMsg());
-//
-// apiLogRep.save(apiLog);
-//
-// updateGD2022AuthToken(responseDto, token);
-//
-// return responseDto;
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// return new ResponseDto(99, e.getMessage());
-// }
-// }
/**
* 浠ｇ爜璋冩暣
@@ -214,12 +244,11 @@
//浠庢柊鑾峰彇TOKEN
Map<String, Object> map = new HashMap<>();
map.put("appid", conf.getUserName());
-// map.put("appkey", EncryptUtil.encryptHex(conf.getPassword(),conf.getPublicKey()));
- map.put("appkey", AESUtils.encrypt(conf.getPassword(),conf.getPublicKey()));
- GD2022ResponseDto<GD2022AuthToken> responseDto = GD2022HttpClientUtil.postGetToken(conf.getApiUrl() + "sfrz",map);
+ map.put("appkey", AESUtils.encrypt(conf.getPassword(), conf.getPublicKey()));
+ GD2022ResponseDto<GD2022AuthToken> responseDto = GD2022HttpClientUtil.postGetToken(conf.getApiUrl() + "sfrz", map);
token = new GD2022AuthToken();
- updateGD2022AuthToken(responseDto, conf,token);
+ updateGD2022AuthToken(responseDto, conf, token);
return token;
} catch (Exception e) {
@@ -232,13 +261,13 @@
String key = RedisConst.buildKey(RedisConst.KYE_TOKEN, conf.getKqdm());
if (null == dto) {
- // redisUtil.set(key, token, 170);
+ // redisUtil.set(key, token, 170);
return;
}
if (dto.getCode() != 200) {
return;
- } else {
+ } else {
GD2022AuthToken token1 = dto.getData();
token.setAccess_token(token1.getAccess_token());
token.setAppid(token1.getAppid());
@@ -246,32 +275,386 @@
}
}
- private String getJsonData(String inteId , Object data, String url, GD2022AuthToken authToken) throws Exception {
- if(Constant.API_CODE_1101.equals(inteId)){
- Api1101 api1101 = new Api1101();
- BeanUtils.copyProperties(data,api1101);
+ private Object changeObject(Object object) {
+ // 浣跨敤鍙嶅皠鑾峰彇灞炴�у垪琛� object涓哄疄浣撳璞″悕
+ Field[] fields = object.getClass().getDeclaredFields();
+ for (Field field : fields) {
+ field.setAccessible(true);
+ try {
+ // 鍒ゆ柇灞炴�у�兼槸鍚︿负null
+ if (field.get(object) == null || field.get(object) == "") {
+ //鏍规嵁绫诲瀷璁剧疆榛樿鍊�
+ if (field.getType() == String.class) {
+ field.set(object, "0");
+ }
+ if (field.getType() == Integer.class) {
+ field.set(object, 0);
+ }
+ if (field.getType() == Double.class) {
+ field.set(object, 0.0);
+ }
+ if (field.getType() == Date.class) {
+ field.set(object, new Date());
+ }
+ }
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+ return object;
+ }
+
+ private String getJsonData(String inteId, Object data, String url, GD2022AuthToken authToken) throws Exception {
+ if (Constant.API_CODE_1101.equals(inteId)) {
+ Gd2022Api1101 api1101 = new Gd2022Api1101();
+ BeanUtils.copyProperties(data, api1101);
+ api1101.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1101);
- }else if(Constant.API_CODE_1109.equals(inteId)){
+ }
+ if (Constant.API_CODE_1102.equals(inteId)) {
+ Gd2022Api1102 api1102 = new Gd2022Api1102();
+ BeanUtils.copyProperties(data, api1102);
+ api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1102);
+ }
+ if (Constant.API_CODE_1103.equals(inteId)) {
+ Gd2022Api1103 api1103 = new Gd2022Api1103();
+ BeanUtils.copyProperties(data, api1103);
+ changeObject(api1103);
+ api1103.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1103);
+ }
+ if (Constant.API_CODE_1104.equals(inteId)) {
+ Gd2022Api1104 api1104 = new Gd2022Api1104();
+ BeanUtils.copyProperties(data, api1104);
+ changeObject(api1104);
+ api1104.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1104);
+ }
+ if (Constant.API_CODE_1105.equals(inteId)) {
+ Gd2022Api1105 api1105 = new Gd2022Api1105();
+ BeanUtils.copyProperties(data, api1105);
+ api1105.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1105);
+ }
+ if (Constant.API_CODE_1106.equals(inteId)) {
+ Api1106 api1106 = (Api1106) data;
+ api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1106);
+ }
+ if (Constant.API_CODE_1107.equals(inteId)) {
+ Api1107 api1107 = (Api1107) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1107.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
+ api1107.setTykqbm(tykqbm);
+ }
+ api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1107);
+ }
+ if (Constant.API_CODE_1108.equals(inteId)) {
+ Api1108 api1108 = (Api1108) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1108.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
+ api1108.setTykqbm(tykqbm);
+ }
+ api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1108);
+ }
+ if (Constant.API_CODE_1109.equals(inteId)) {
//灏佽鏁版嵁
- Api1109 api1109 = new Api1109();
- BeanUtils.copyProperties(data,api1109);
+ Gd2022Api1109 api1109 = new Gd2022Api1109();
+ BeanUtils.copyProperties(data, api1109);
if (null == authToken) {
return JSON.toJSONString(api1109);
}
//鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
+ System.out.println((String) responseDto.getData());
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1109.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
+ api1109.setTykqbm(tykqbm);
+ }
+ api1109.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1109);
- }else if(Constant.API_CODE_1208.equals(inteId)){
- Api1208 api1208 = new Api1208();
- BeanUtils.copyProperties(data,api1208);
+ }
+ if (Constant.API_CODE_1110.equals(inteId)) {
+ Api1110 api1110 = (Api1110) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1110.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
+ api1110.setTyhwbm(tyhwbm);
+ }
+ api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1110);
+ }
+ if (Constant.API_CODE_1111.equals(inteId)) {
+ Gd2022Api1111 api1111 = new Gd2022Api1111();
+ BeanUtils.copyProperties(data, api1111);
+ Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
+ if(null != api1102List){
+ api1111.setKqmc(api1102List.getKqmc());
+ if(StringUtils.isEmpty(api1111.getTykqbm())){
+ api1111.setTykqbm(api1102List.getTykqbm());
+ }
+ }
+ Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
+ if(null != api1101List){
+ api1111.setDwmc(api1101List.getDwmc());
+ }
+ api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1111);
+ }
+ if (Constant.API_CODE_1112.equals(inteId)) {
+ Api1112 api1112 = (Api1112) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ 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);
+ }
+ api1112.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1112);
+ }
+ if (Constant.API_CODE_1113.equals(inteId)) {
+ Api1113 api1113 = (Api1113) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1113.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
+ api1113.setTydwbm(tydwbm);
+ }
+ api1113.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1113);
+ }
+ if (Constant.API_CODE_1201.equals(inteId)) {
+ Api1201 apiData = (Api1201) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1202.equals(inteId)) {
+ Api1202 apiData = (Api1202) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1203.equals(inteId)) {
+ Api1203 apiData = (Api1203) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1204.equals(inteId)) {
+ Api1204 apiData = (Api1204) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1205.equals(inteId)) {
+ Api1205 apiData = (Api1205) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1206.equals(inteId)) {
+ Api1206 apiData = (Api1206) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
+ apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1207.equals(inteId)) {
+ Api1207 apiData = (Api1207) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDckqtybm())){
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
+ apiData.setDckqtybm(dckqtybm);
+ }
+ if(StringUtils.isEmpty(apiData.getDrkqtybm())){
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
+ apiData.setDrkqtybm(drkqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDchwtybm())){
+ String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
+ apiData.setDchwtybm(dchwtybm);
+ }
+ if(StringUtils.isEmpty(apiData.getDrhwtybm())){
+ String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+ apiData.setDrhwtybm(drhwtybm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1208.equals(inteId)) {
+ Gd2022Api1208 api1208 = new Gd2022Api1208();
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if(null == api1208.getBclbs()){
+ api1208.setBclbs(0);
+ }
+ if("2".equals(api1208.getClfs()) && api1208.getBclbs() == 0){
+ api1208.setBclbs((int)(api1208.getSjsl()/25));
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getLqgstydwbm())){
+ String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
+ api1208.setLqgstydwbm(lqgstydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
+ api1208.setTyhwbm(tyhwbm);
+ }
+ BeanUtils.copyProperties(data, api1208);
return JSON.toJSONString(api1208);
- }else if(Constant.API_CODE_1307.equals(inteId)){
+ }
+ if (Constant.API_CODE_1209.equals(inteId)) {
+ Api1209 apiData = (Api1209) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1210.equals(inteId)) {
+ Gd2022Api1210 api1210 = new Gd2022Api1210();
+ BeanUtils.copyProperties(data, api1210);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1210.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
+ api1210.setTyhwbm(tyhwbm);
+ }
+ api1210.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1210);
+ }
+ if (Constant.API_CODE_1211.equals(inteId)) {
+ Api1211 apiData = (Api1211) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1212.equals(inteId)) {
+ Api1212 apiData = (Api1212) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1301.equals(inteId)) {
+ Api1301 apiData = (Api1301) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1302.equals(inteId)) {
+ Api1302 apiData = (Api1302) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1303.equals(inteId)) {
+ Api1303 apiData = (Api1303) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1304.equals(inteId)) {
+ Api1304 apiData = (Api1304) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1305.equals(inteId)) {
+ Api1305 apiData = (Api1305) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTycfbm())){
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1306.equals(inteId)) {
+ Api1306 apiData = (Api1306) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTycfbm())){
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1307.equals(inteId)) {
//灏佽鏁版嵁
- Api1307 api1307 = new Api1307();
- BeanUtils.copyProperties(data,api1307);
+ Gd2022Api1307 api1307 = new Gd2022Api1307();
+ BeanUtils.copyProperties(data, api1307);
if (null == authToken) {
return JSON.toJSONString(api1307);
@@ -280,11 +663,28 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1307.getWjdz());
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
+ api1307.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTycfbm())){
+ String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
+ api1307.setTycfbm(tycfbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
+ api1307.setTyhwbm(tyhwbm);
+ }
+ api1307.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1307);
- }else if(Constant.API_CODE_1308.equals(inteId)){
+ }
+ if (Constant.API_CODE_1308.equals(inteId)) {
//灏佽鏁版嵁
- Api1308 api1308 = new Api1308();
- BeanUtils.copyProperties(data,api1308);
+ Gd2022Api1308 api1308 = new Gd2022Api1308();
+ BeanUtils.copyProperties(data, api1308);
if (null == authToken) {
return JSON.toJSONString(api1308);
@@ -293,91 +693,163 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1308.getWjdz());
//璁剧疆涓婁紶鏂囦欢id
api1308.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1308.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
+ api1308.setTykqbm(tykqbm);
+ }
+ api1308.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1308);
- }else if(Constant.API_CODE_1501.equals(inteId)){
- //灏佽鏁版嵁
-// List<GDFinanceDto> list = copyApi1501((Api1501) data);
-// return JSON.toJSONString(list);
- Api1501 api1501 = (Api1501) data;
- GDFinanceDto gdFinanceDto = new GDFinanceDto();
- gdFinanceDto.setDwdm(api1501.getDwdm());
- gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
- gdFinanceDto.setBbm("01");
- gdFinanceDto.setCzbz(api1501.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
- gdFinanceDto.setZbxh("1");
- gdFinanceDto.setZbmc("璧勪骇//t");
- gdFinanceDto.setZbz1("鏈熸湯浣欓//t");
- gdFinanceDto.setZbz2("骞村垵浣欓//t");
- return JSON.toJSONString(gdFinanceDto);
- }else if(Constant.API_CODE_1502.equals(inteId)){
- //灏佽鏁版嵁
- List<GDFinanceDto> list = copyApi1502((Api1502) data);
- return JSON.toJSONString(list);
- }else if(Constant.API_CODE_1503.equals(inteId)){
- //灏佽鏁版嵁
- List<GDFinanceDto> list = copyApi1503((Api1503) data);
- return JSON.toJSONString(list);
- }else{
- return JSON.toJSONString(data);
}
+ if (Constant.API_CODE_1309.equals(inteId)) {
+ Api1309 apiData = (Api1309) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
+ apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1310.equals(inteId)) {
+ Gd2022Api1310 api1310 = new Gd2022Api1310();
+ BeanUtils.copyProperties(data, api1310);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1310.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
+ api1310.setTyhwbm(tyhwbm);
+ }
+ api1310.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1310);
+ }
+ if (Constant.API_CODE_1401.equals(inteId)) {
+ Api1401 apiData = (Api1401) data;
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1402.equals(inteId)) {
+ Api1402 apiData = (Api1402) data;
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ if (Constant.API_CODE_1403.equals(inteId)) {
+ //杞崲璁″垝锛屽崟鐙煡璇㈣疆鎹㈣鍒掓槑缁嗕俊鎭紝缁熶竴灏佽鍚庝笂浼�
+ Gd2022Api1403 api1403 = new Gd2022Api1403();
+ BeanUtils.copyProperties(data, api1403);
+ List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
+ Gd2022Api1404 gd2022Api1404;
+ List<Gd2022Api1404> dtls = new ArrayList<>();
+ Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
+ if(null != list && list.size() > 0){
+ for (Api1404 api1404 : list) {
+ gd2022Api1404 = new Gd2022Api1404();
+ BeanUtils.copyProperties(api1404, gd2022Api1404);
+ if(null!= gd2022Api1404.getLhlx() && "2".equals(gd2022Api1404.getLhlx())){
+ lrsl += gd2022Api1404.getLhsl();
+ }
+ if(null!= gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())){
+ lcsl += gd2022Api1404.getLhsl();
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(gd2022Api1404.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(gd2022Api1404.getLhhwdm());
+ gd2022Api1404.setTyhwbm(tyhwbm);
+ }
+ gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ dtls.add(gd2022Api1404);
+ }
+ }
+ api1403.setRotationInQty(lrsl);
+ api1403.setRotationOutQty(lcsl);
+ api1403.setDtls(dtls);
+ //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
+ GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
+ //璁剧疆涓婁紶鏂囦欢id
+ api1403.setFileStorageId((String) responseDto.getData());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1403.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
+ api1403.setTydwbm(tydwbm);
+ }
+ api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1403);
+ }
+ if (Constant.API_CODE_1404.equals(inteId)) {
+ //杞崲璁″垝鏄庣粏锛屼笉鍗曠嫭涓婁紶锛屽湪杞崲璁″垝涓粺涓�涓婁紶
+ return null;
+ }
+ if (Constant.API_CODE_1405.equals(inteId)) {
+ Api1405 apiData = (Api1405) data;
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getXmdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(apiData);
+ }
+ return JSON.toJSONString(data);
}
+
private List<GDFinanceDto> copyApi1503(Api1503 data) {
Api1503 api1503 = data;
List<GDFinanceDto> list = new ArrayList<>();
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1503.getDwdm());
+ gdFinanceDto.setKqdm(api1503.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
+ gdFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
+ gdFinanceDto.setTykqbm(tykqbm);
+ }
gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
- gdFinanceDto.setBbm("01");
+ gdFinanceDto.setBbm("03");
gdFinanceDto.setCzbz(api1503.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyyMMdd"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
- paddingData(gdFinanceDto, list, "0", "椤圭洰//t","鏈湡閲戦//t", "鏈勾绱//t");
- paddingData(gdFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�",api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
- paddingData(gdFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰",api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
- paddingData(gdFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�",api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
- paddingData(gdFinanceDto, list, "4", "閿�鍞垂鐢�",api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
- paddingData(gdFinanceDto, list, "5", "绠＄悊璐圭敤",api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
- paddingData(gdFinanceDto, list, "6", "鐮斿彂璐圭敤",api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
- paddingData(gdFinanceDto, list, "7", "璐㈠姟璐圭敤",api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
- paddingData(gdFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�",api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
- paddingData(gdFinanceDto, list, "9", "鍒╂伅鏀跺叆",api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
- paddingData(gdFinanceDto, list, "10", "鍔狅細鍏朵粬鏀剁泭",api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
- paddingData(gdFinanceDto, list, "11", "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�",api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
- paddingData(gdFinanceDto, list, "12", "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭",api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
- paddingData(gdFinanceDto, list, "13", "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�",api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
- paddingData(gdFinanceDto, list, "14", "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�",api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
- paddingData(gdFinanceDto, list, "15", "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�",api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
- paddingData(gdFinanceDto, list, "16", "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�",api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
- paddingData(gdFinanceDto, list, "17", "鍔狅細钀ヤ笟澶栨敹鍏�",api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
- paddingData(gdFinanceDto, list, "18", "鍑忥細钀ヤ笟澶栨敮鍑�",api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
- paddingData(gdFinanceDto, list, "19", "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�",api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
- paddingData(gdFinanceDto, list, "20", "鍑忥細鎵�寰楃◣璐圭敤",api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
- paddingData(gdFinanceDto, list, "21", "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�",api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
- paddingData(gdFinanceDto, list, "22", "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�",api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
- paddingData(gdFinanceDto, list, "23", "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�",api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
- paddingData(gdFinanceDto, list, "24", "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�",api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
- paddingData(gdFinanceDto, list, "25", "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭",api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
- paddingData(gdFinanceDto, list, "26", "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ",api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
- paddingData(gdFinanceDto, list, "27", "2.鏉冪泭娉曚笅涓嶈兘杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭",api1503.getQyfbnzsybqye() + "", api1503.getQyfbnzsybnlj() + "");
- paddingData(gdFinanceDto, list, "28", "3.鍏朵粬鏉冪泭宸ュ叿鎶曡祫鍏厑浠峰�煎彉鍔�",api1503.getQtqygjjzbdbqye() + "", api1503.getQtqygjjzbdbnlj() + "");
- paddingData(gdFinanceDto, list, "29", "4.浼佷笟鑷韩淇＄敤椋庨櫓鍏厑浠峰�煎彉鍔�",api1503.getQyxyfxbdbqye() + "", api1503.getQyxyfxbdbnlj() + "");
- paddingData(gdFinanceDto, list, "30", "5.鍏朵粬",api1503.getBnflzhsyqtbqye() + "", api1503.getBnflzhsyqtbnlj() + "");
- paddingData(gdFinanceDto, list, "31", "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�","0", "0");
- paddingData(gdFinanceDto, list, "32", "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭",api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
- paddingData(gdFinanceDto, list, "33", "2锛庡叾浠栧�烘潈鎶曡祫鍏厑浠峰�煎彉鍔�",api1503.getQtzqtzjzbqye() + "", api1503.getQtzqtzjzbnlj() + "");
- paddingData(gdFinanceDto, list, "34", "3锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�",api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(gdFinanceDto, list, "35", "4锛庨噾铻嶈祫浜ч噸鍒嗙被璁″叆鍏朵粬缁煎悎鏀剁泭鐨勯噾棰�",api1503.getJrzcflsyjebqye() + "", api1503.getJrzcflsyjebnlj() + "");
- paddingData(gdFinanceDto, list, "36", "5锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭",api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(gdFinanceDto, list, "37", "6.鍏朵粬鍊烘潈鎶曡祫淇＄敤鍑忓�煎噯澶�",api1503.getQtzqtzjzbqye() + "", api1503.getQtzqtzjzbnlj() + "");
- paddingData(gdFinanceDto, list, "38", "7.鐜伴噾娴侀噺濂楁湡鎹熺泭鐨勬湁鏁堥儴鍒�",api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
- paddingData(gdFinanceDto, list, "39", "8.澶栧竵璐㈠姟鎶ヨ〃鎶樼畻宸",api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
- paddingData(gdFinanceDto, list, "40", "9.鍏朵粬",api1503.getCflsybqye() + "", api1503.getCflsybnlj() + "");
- paddingData(gdFinanceDto, list, "41", "鍏�佺患鍚堟敹鐩婃�婚",api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
- paddingData(gdFinanceDto, list, "42", "涓冦�佹瘡鑲℃敹鐩婏細",api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
- paddingData(gdFinanceDto, list, "43", "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�",api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
- paddingData(gdFinanceDto, list, "44", "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�",api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
+ paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+ paddingData(gdFinanceDto, list, 2, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+ paddingData(gdFinanceDto, list, 3, "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+ paddingData(gdFinanceDto, list, 4, "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+ paddingData(gdFinanceDto, list, 5, "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+ paddingData(gdFinanceDto, list, 6, "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+ paddingData(gdFinanceDto, list, 7, "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+ paddingData(gdFinanceDto, list, 8, "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+ paddingData(gdFinanceDto, list, 9, "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+ paddingData(gdFinanceDto, list, 10, "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+ paddingData(gdFinanceDto, list, 11, "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
+ paddingData(gdFinanceDto, list, 12, "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
+ paddingData(gdFinanceDto, list, 13, "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
+ paddingData(gdFinanceDto, list, 14, "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
+ paddingData(gdFinanceDto, list, 15, "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
+ paddingData(gdFinanceDto, list, 16, "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
+ paddingData(gdFinanceDto, list, 17, "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
+ paddingData(gdFinanceDto, list, 18, "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
+ paddingData(gdFinanceDto, list, 19, "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
+ paddingData(gdFinanceDto, list, 20, "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
+ paddingData(gdFinanceDto, list, 21, "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
+ paddingData(gdFinanceDto, list, 22, "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
+ paddingData(gdFinanceDto, list, 23, "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
+ paddingData(gdFinanceDto, list, 24, "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
+ paddingData(gdFinanceDto, list, 25, "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
+ paddingData(gdFinanceDto, list, 26, "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
+ paddingData(gdFinanceDto, list, 27, "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
+ paddingData(gdFinanceDto, list, 28, "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
+ paddingData(gdFinanceDto, list, 29, "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
+ paddingData(gdFinanceDto, list, 30, "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(gdFinanceDto, list, 31, "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(gdFinanceDto, list, 32, "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
+ paddingData(gdFinanceDto, list, 33, "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
+ paddingData(gdFinanceDto, list, 34, "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
+ paddingData(gdFinanceDto, list, 35, "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
+ paddingData(gdFinanceDto, list, 36, "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
+ paddingData(gdFinanceDto, list, 37, "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
return list;
}
@@ -387,50 +859,61 @@
List<GDFinanceDto> list = new ArrayList<>();
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1502.getDwdm());
+ gdFinanceDto.setKqdm(api1502.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
+ gdFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
+ gdFinanceDto.setTykqbm(tykqbm);
+ }
gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
- gdFinanceDto.setBbm("01");
+ gdFinanceDto.setBbm("02");
gdFinanceDto.setCzbz(api1502.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyyMMdd"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
- paddingData(gdFinanceDto, list, "0", "椤圭洰//t","鏈湀鏁�//t", "鏈勾绱鏁�//t");
- paddingData(gdFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺",api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
- paddingData(gdFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾",api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
- paddingData(gdFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�",api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
- paddingData(gdFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾",api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
- paddingData(gdFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚",api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
- paddingData(gdFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾",api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
- paddingData(gdFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�",api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
- paddingData(gdFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�",api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
- paddingData(gdFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾",api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
- paddingData(gdFinanceDto, list, "10", "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚",api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
- paddingData(gdFinanceDto, list, "11", "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�",api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
- paddingData(gdFinanceDto, list, "12", "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺",api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
- paddingData(gdFinanceDto, list, "13", "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�",api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
- paddingData(gdFinanceDto, list, "14", "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�",api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
- paddingData(gdFinanceDto, list, "15", "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�",api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
- paddingData(gdFinanceDto, list, "16", "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�",api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
- paddingData(gdFinanceDto, list, "17", "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾",api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(gdFinanceDto, list, "18", "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚",api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
- paddingData(gdFinanceDto, list, "19", "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�",api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
- paddingData(gdFinanceDto, list, "20", "鎶曡祫鏀粯鐨勭幇閲�",api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
- paddingData(gdFinanceDto, list, "21", "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�",api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
- paddingData(gdFinanceDto, list, "22", "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾",api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
- paddingData(gdFinanceDto, list, "23", "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚",api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
- paddingData(gdFinanceDto, list, "24", "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�",api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
- paddingData(gdFinanceDto, list, "25", "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺",api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
- paddingData(gdFinanceDto, list, "26", "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�",api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
- paddingData(gdFinanceDto, list, "27", "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�",api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
- paddingData(gdFinanceDto, list, "28", "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾",api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(gdFinanceDto, list, "29", "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚",api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
- paddingData(gdFinanceDto, list, "30", "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�",api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
- paddingData(gdFinanceDto, list, "31", "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�",api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
- paddingData(gdFinanceDto, list, "32", "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾",api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
- paddingData(gdFinanceDto, list, "33", "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚",api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
- paddingData(gdFinanceDto, list, "34", "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�",api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
- paddingData(gdFinanceDto, list, "35", "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�",api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
- paddingData(gdFinanceDto, list, "36", "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�",api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
- paddingData(gdFinanceDto, list, "37", "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓",api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
- paddingData(gdFinanceDto, list, "38", "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�",api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
+ paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+ paddingData(gdFinanceDto, list, 2, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+ paddingData(gdFinanceDto, list, 3, "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 4, "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+ paddingData(gdFinanceDto, list, 5, "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 6, "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+ paddingData(gdFinanceDto, list, 7, "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+ paddingData(gdFinanceDto, list, 8, "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 9, "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+ paddingData(gdFinanceDto, list, 10, "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 11, "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
+ paddingData(gdFinanceDto, list, 12, "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
+ paddingData(gdFinanceDto, list, 13, "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
+ paddingData(gdFinanceDto, list, 14, "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 15, "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 16, "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
+ paddingData(gdFinanceDto, list, 17, "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
+ paddingData(gdFinanceDto, list, 18, "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 19, "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
+ paddingData(gdFinanceDto, list, 20, "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 21, "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 22, "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
+ paddingData(gdFinanceDto, list, 23, "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 24, "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
+ paddingData(gdFinanceDto, list, 25, "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
+ paddingData(gdFinanceDto, list, 26, "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
+ paddingData(gdFinanceDto, list, 27, "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 28, "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 29, "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 30, "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
+ paddingData(gdFinanceDto, list, 31, "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 32, "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 33, "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
+ paddingData(gdFinanceDto, list, 34, "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
+ paddingData(gdFinanceDto, list, 35, "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
+ paddingData(gdFinanceDto, list, 36, "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
+ paddingData(gdFinanceDto, list, 37, "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
+ paddingData(gdFinanceDto, list, 38, "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
+ paddingData(gdFinanceDto, list, 39, "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
return list;
}
@@ -439,99 +922,104 @@
List<GDFinanceDto> list = new ArrayList<>();
GDFinanceDto gdFinanceDto = new GDFinanceDto();
gdFinanceDto.setDwdm(api1501.getDwdm());
+ gdFinanceDto.setKqdm(api1501.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(gdFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(gdFinanceDto.getDwdm());
+ gdFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(gdFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(gdFinanceDto.getKqdm());
+ gdFinanceDto.setTykqbm(tykqbm);
+ }
gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("01");
gdFinanceDto.setCzbz(api1501.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
- paddingData(gdFinanceDto, list, "1", "璧勪骇//t","鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(gdFinanceDto, list, "2", "娴佸姩璧勪骇",api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(gdFinanceDto, list, "3", "璐у竵璧勯噾",api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
- paddingData(gdFinanceDto, list, "4", "浜ゆ槗鎬ч噾铻嶈祫浜�",api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
- paddingData(gdFinanceDto, list, "5", "琛嶇敓閲戣瀺璧勪骇",api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
- paddingData(gdFinanceDto, list, "6", "搴旀敹绁ㄦ嵁",api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
- paddingData(gdFinanceDto, list, "7", "搴旀敹璐︽",api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
- paddingData(gdFinanceDto, list, "8", "棰勪粯娆鹃」",api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
- paddingData(gdFinanceDto, list, "9", "鍏朵粬搴旀敹娆�",api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
- paddingData(gdFinanceDto, list, "10", "瀛樿揣",api1501.getChqmye() + "", api1501.getChncye() + "");
- paddingData(gdFinanceDto, list, "11", "鍚堝悓璧勪骇",api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
- paddingData(gdFinanceDto, list, "12", "鎸佹湁寰呭敭璧勪骇",api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
- paddingData(gdFinanceDto, list, "13", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇",api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
- paddingData(gdFinanceDto, list, "14", "鍏朵粬娴佸姩璧勪骇",api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
- paddingData(gdFinanceDto, list, "15", "娴佸姩璧勪骇鍚堣",api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(gdFinanceDto, list, "16", "闈炴祦鍔ㄨ祫浜�",api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(gdFinanceDto, list, "17", "鍊哄埜鎶曡祫",api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
- paddingData(gdFinanceDto, list, "18", "鍏朵粬鍊哄埜鎶曡祫",api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
- paddingData(gdFinanceDto, list, "19", "闀挎湡搴旀敹娆�",api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
- paddingData(gdFinanceDto, list, "20", "闀挎湡鑲℃潈鎶曡祫",api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
- paddingData(gdFinanceDto, list, "21", "鍏朵粬鏉冪泭宸ュ叿鎶曡祫",api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
- paddingData(gdFinanceDto, list, "22", "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�",api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
- paddingData(gdFinanceDto, list, "23", "鎶曡祫鎬ф埧鍦颁骇",api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
- paddingData(gdFinanceDto, list, "24", "鍥哄畾璧勪骇",api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
- paddingData(gdFinanceDto, list, "25", "鍦ㄥ缓宸ョ▼",api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
- paddingData(gdFinanceDto, list, "26", "鐢熶骇鎬х敓鐗╄祫浜�",api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
- paddingData(gdFinanceDto, list, "27", "娌规皵璧勪骇",api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
- paddingData(gdFinanceDto, list, "28", "鏃犲舰璧勪骇",api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
- paddingData(gdFinanceDto, list, "29", "寮�鍙戞敮鍑�",api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
- paddingData(gdFinanceDto, list, "30", "鍟嗚獕",api1501.getSyqmye() + "", api1501.getSyncye() + "");
- paddingData(gdFinanceDto, list, "31", "闀挎湡寰呮憡璐圭敤",api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
- paddingData(gdFinanceDto, list, "32", "閫掑欢鎵�寰楃◣璧勪骇",api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
- paddingData(gdFinanceDto, list, "33", "鍏朵粬闈炴祦鍔ㄨ祫浜�",api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
- paddingData(gdFinanceDto, list, "34", "闈炴祦鍔ㄨ祫浜у悎璁�",api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(gdFinanceDto, list, "35", "璧勪骇鎬昏",api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
- paddingData(gdFinanceDto, list, "36", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t","鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(gdFinanceDto, list, "37", "娴佸姩璐熷��",api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(gdFinanceDto, list, "38", "鐭湡鍊熸",api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(gdFinanceDto, list, "39", "浜ゆ槗鎬ч噾铻嶈礋鍊�",api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
- paddingData(gdFinanceDto, list, "40", "琛嶇敓閲戣瀺璐熷��",api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
- paddingData(gdFinanceDto, list, "41", "搴斾粯绁ㄦ嵁",api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
- paddingData(gdFinanceDto, list, "42", "搴斾粯璐︽",api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(gdFinanceDto, list, "43", "棰勬敹娆鹃」",api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(gdFinanceDto, list, "44", "鍚堝悓璐熷��",api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
- paddingData(gdFinanceDto, list, "45", "搴斾粯鑱屽伐钖叕",api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
- paddingData(gdFinanceDto, list, "46", "搴斾氦绋庤垂",api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(gdFinanceDto, list, "47", "鍏朵粬搴斾粯娆�",api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
- paddingData(gdFinanceDto, list, "48", "鎸佹湁寰呭敭璐熷��",api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
- paddingData(gdFinanceDto, list, "49", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��",api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
- paddingData(gdFinanceDto, list, "50", "鍏朵粬娴佸姩璐熷��",api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
- paddingData(gdFinanceDto, list, "51", "娴佸姩璐熷�哄悎璁�",api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(gdFinanceDto, list, "52", "闈炴祦鍔ㄨ礋鍊�",api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(gdFinanceDto, list, "53", "闀挎湡鍊熸",api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
- paddingData(gdFinanceDto, list, "54", "搴斾粯鍊哄埜",api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
- paddingData(gdFinanceDto, list, "55", "鍏朵腑锛氫紭鍏堣偂",api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
- paddingData(gdFinanceDto, list, "56", " 姘哥画鍊�",api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
- paddingData(gdFinanceDto, list, "57", "闀挎湡搴斾粯娆�",api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
- paddingData(gdFinanceDto, list, "58", "棰勮璐熷��",api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(gdFinanceDto, list, "59", "閫掑欢鏀剁泭",api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
- paddingData(gdFinanceDto, list, "60", "閫掑欢鎵�寰楃◣璐熷��",api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
- paddingData(gdFinanceDto, list, "61", "鍏朵粬闈炴祦鍔ㄨ礋鍊�",api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
- paddingData(gdFinanceDto, list, "62", "闈炴祦鍔ㄨ礋鍊哄悎璁�",api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(gdFinanceDto, list, "63", "璐熷�哄悎璁�",api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
- paddingData(gdFinanceDto, list, "64", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級",api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(gdFinanceDto, list, "65", "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�",api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
- paddingData(gdFinanceDto, list, "66", "鍏朵粬鏉冪泭宸ュ叿",api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
- paddingData(gdFinanceDto, list, "67", "鍏朵腑锛氫紭鍏堣偂",api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
- paddingData(gdFinanceDto, list, "68", "姘哥画鍊�",api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
- paddingData(gdFinanceDto, list, "69", "璧勬湰鍏Н",api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
- paddingData(gdFinanceDto, list, "70", "鍑忥細搴撳瓨鑲�",api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
- paddingData(gdFinanceDto, list, "71", "鍏朵粬缁煎悎鏀剁泭",api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
- paddingData(gdFinanceDto, list, "72", "涓撻」鍌ㄥ",api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
- paddingData(gdFinanceDto, list, "73", "鐩堜綑鍏Н",api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
- paddingData(gdFinanceDto, list, "74", "鏈垎閰嶅埄娑�",api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
- paddingData(gdFinanceDto, list, "75", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級 鍚堣",api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(gdFinanceDto, list, "76", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏",api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
+ paddingData(gdFinanceDto, list, 1, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(gdFinanceDto, list, 2, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(gdFinanceDto, list, 3, "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+ paddingData(gdFinanceDto, list, 4, "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+ paddingData(gdFinanceDto, list, 5, "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+ paddingData(gdFinanceDto, list, 6, "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+ paddingData(gdFinanceDto, list, 7, "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+ paddingData(gdFinanceDto, list, 8, "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+ paddingData(gdFinanceDto, list, 9, "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+ paddingData(gdFinanceDto, list, 10, "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+ paddingData(gdFinanceDto, list, 11, "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
+ paddingData(gdFinanceDto, list, 12, "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
+ paddingData(gdFinanceDto, list, 13, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
+ paddingData(gdFinanceDto, list, 14, "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
+ paddingData(gdFinanceDto, list, 15, "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(gdFinanceDto, list, 16, "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(gdFinanceDto, list, 17, "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
+ paddingData(gdFinanceDto, list, 18, "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
+ paddingData(gdFinanceDto, list, 19, "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
+ paddingData(gdFinanceDto, list, 20, "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
+ paddingData(gdFinanceDto, list, 21, "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
+ paddingData(gdFinanceDto, list, 22, "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
+ paddingData(gdFinanceDto, list, 23, "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
+ paddingData(gdFinanceDto, list, 24, "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
+ paddingData(gdFinanceDto, list, 25, "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
+ paddingData(gdFinanceDto, list, 26, "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
+ paddingData(gdFinanceDto, list, 27, "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
+ paddingData(gdFinanceDto, list, 28, "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
+ paddingData(gdFinanceDto, list, 29, "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
+ paddingData(gdFinanceDto, list, 30, "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
+ paddingData(gdFinanceDto, list, 31, "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
+ paddingData(gdFinanceDto, list, 32, "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
+ paddingData(gdFinanceDto, list, 33, "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
+ paddingData(gdFinanceDto, list, 34, "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(gdFinanceDto, list, 35, "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
+ paddingData(gdFinanceDto, list, 36, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(gdFinanceDto, list, 37, "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(gdFinanceDto, list, 38, "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(gdFinanceDto, list, 39, "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
+ paddingData(gdFinanceDto, list, 40, "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
+ paddingData(gdFinanceDto, list, 41, "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
+ paddingData(gdFinanceDto, list, 42, "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(gdFinanceDto, list, 43, "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(gdFinanceDto, list, 44, "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
+ paddingData(gdFinanceDto, list, 45, "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
+ paddingData(gdFinanceDto, list, 46, "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(gdFinanceDto, list, 47, "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
+ paddingData(gdFinanceDto, list, 48, "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
+ paddingData(gdFinanceDto, list, 49, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
+ paddingData(gdFinanceDto, list, 50, "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
+ paddingData(gdFinanceDto, list, 51, "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(gdFinanceDto, list, 52, "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(gdFinanceDto, list, 53, "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
+ paddingData(gdFinanceDto, list, 54, "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
+ paddingData(gdFinanceDto, list, 55, "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
+ paddingData(gdFinanceDto, list, 56, "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
+ paddingData(gdFinanceDto, list, 57, "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
+ paddingData(gdFinanceDto, list, 58, "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(gdFinanceDto, list, 59, "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
+ paddingData(gdFinanceDto, list, 60, "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
+ paddingData(gdFinanceDto, list, 61, "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
+ paddingData(gdFinanceDto, list, 62, "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(gdFinanceDto, list, 63, "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
+ paddingData(gdFinanceDto, list, 64, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(gdFinanceDto, list, 65, "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
+ paddingData(gdFinanceDto, list, 66, "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
+ paddingData(gdFinanceDto, list, 67, "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
+ paddingData(gdFinanceDto, list, 68, "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
+ paddingData(gdFinanceDto, list, 69, "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
+ paddingData(gdFinanceDto, list, 70, "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
+ paddingData(gdFinanceDto, list, 71, "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
+ paddingData(gdFinanceDto, list, 72, "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
+ paddingData(gdFinanceDto, list, 73, "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
+ paddingData(gdFinanceDto, list, 74, "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
+ paddingData(gdFinanceDto, list, 75, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(gdFinanceDto, list, 76, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
return list;
}
- private void paddingData(GDFinanceDto common,
- List<GDFinanceDto> list,
- String zbxh,
- String zbmc,
- String zbz1,
- String zbz2)
- {
+ private void paddingData(GDFinanceDto common, List<GDFinanceDto> list, Integer zbxh, String zbmc, String zbz1, String zbz2) {
GDFinanceDto gdFinanceDto = new GDFinanceDto();
- BeanUtils.copyProperties(common,gdFinanceDto);
+ BeanUtils.copyProperties(common, gdFinanceDto);
gdFinanceDto.setZbxh(zbxh);
gdFinanceDto.setZbmc(zbmc);
gdFinanceDto.setZbz1(zbz1);
@@ -540,8 +1028,8 @@
}
- private String getInteId(String inteId){
- switch (inteId){
+ private String getInteId(String inteId) {
+ switch (inteId) {
case "1101":
return ApiCodeConstant.API_CODE_DWXX;
case "1102":
@@ -567,7 +1055,7 @@
case "1112":
return ApiCodeConstant.API_CODE_RYXX;
case "1113":
- return "";
+ return ApiCodeConstant.API_CODE_QYXYXX;
case "1201":
return ApiCodeConstant.API_CODE_HTXX;
case "1202":
@@ -615,11 +1103,11 @@
case "1401":
return ApiCodeConstant.API_CODE_CBGM;
case "1402":
- return ApiCodeConstant.API_CODE_CBJHXX;
+ return ApiCodeConstant.API_CODE_CBJH;
case "1403":
- return ApiCodeConstant.API_CODE_LHJHXX;
+ return ApiCodeConstant.API_CODE_LHJH;
case "1404":
- return ApiCodeConstant.API_CODE_LHJHMXXX;
+ return null;
case "1405":
return "";
case "1501":
@@ -628,8 +1116,17 @@
return ApiCodeConstant.API_CODE_CWBBXX;
case "1503":
return ApiCodeConstant.API_CODE_CWBBXX;
+ case "1023":
+ return ApiCodeConstant.API_CODE_XZBA;
default:
return inteId;
}
}
+
+
+ @Override
+ public ResponseDto pullData(ApiParam param, ApiConfs conf) {
+ //璇ュ崗璁棤姝ゅ疄鐜�
+ return null;
+ }
}
--
Gitblit v1.9.3