From 6f9664ebeeca03126e6f710a7b84f3b7678cb3de Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 07 十一月 2024 14:35:54 +0800
Subject: [PATCH] 宁夏接口升级V1.2-测试调整1
---
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java | 28
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java | 33
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java | 84 ++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java | 18
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java | 7
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java | 24
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java | 63 +
src/main/resources/application-pro.yml | 18
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1213.java | 69 +
src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java | 30
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java | 19
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java | 79 ++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java | 3
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 29
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java | 8
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java | 12
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java | 40
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java | 139 +++
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 857 ++++++++++++++---------
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java | 75 ++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java | 9
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java | 6
src/main/java/com/fzzy/push/nx2023/NX2023Constant.java | 44
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java | 20
/dev/null | 34
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java | 69 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java | 10
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java | 23
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java | 103 ++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java | 10
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java | 21
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java | 15
46 files changed, 1,589 insertions(+), 485 deletions(-)
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index ef89135..50d8abc 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -1,6 +1,7 @@
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;
@@ -19,12 +20,12 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.lang.reflect.Field;
import java.util.*;
/**
* 瀹佸鐪佸钩鍙�2023鐗�-涓婁紶鏁版嵁鏈嶅姟绫�
+ *
* @author czt
* @date 2023/11/09
*/
@@ -55,6 +56,8 @@
private Api1202Rep api1202Rep;
@Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Override
public String getProtocol() {
@@ -151,25 +154,16 @@
* @return
*/
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);
- return JSON.toJSONString(object);
- } else {
- List<Object> list = new ArrayList<>();
- Object object = getJsonApiData(inteId, data);
+ List<Object> list = new ArrayList<>();
+ Object object = getJsonApiData(inteId, data);
- //闄ゅ簱瀛樻帴鍙ｅ锛屽叾浠栨帴鍙ｄ笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
- if(!NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)){
- setZhgxsjValue(data);
- }
-
- list.add(object);
- return JSON.toJSONString(list);
+ //闄ゅ簱瀛樻帴鍙ｅ锛屽叾浠栨帴鍙ｄ笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
+ if (!Constant.API_CODE_1208.equals(inteId)) {
+ setZhgxsjValue(data);
}
+ list.add(object);
+ return JSON.toJSONString(list);
}
/**
@@ -180,203 +174,495 @@
* @return
*/
private Object getJsonApiData(String inteId, Object data) {
- if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {
- Api1101 apiData = (Api1101)data;
+ if (Constant.API_CODE_1101.equals(inteId)) {
Nx2023Api1101 api1101 = new Nx2023Api1101();
- BeanUtils.copyProperties(apiData, api1101);
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1101.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- api1101.setTydwbm(tydwbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1101.getSjdwtybm()) && StringUtils.isNotEmpty(apiData.getSjdwdm())) {
- String sjdwtybm = apiCommonService.getTydwbm(apiData.getDwdm());
+ BeanUtils.copyProperties(data, api1101);
+ //璁剧疆涓婄骇鍗曚綅缁熶竴缂栫爜
+ if (StringUtils.isEmpty(api1101.getSjdwtybm()) && StringUtils.isNotEmpty(api1101.getSjdwdm())) {
+ String sjdwtybm = apiCommonService.getTydwbm(api1101.getDwdm());
api1101.setSjdwtybm(sjdwtybm);
}
return api1101;
}
- if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
- Api1102 apiData = (Api1102)data;
+ if (Constant.API_CODE_1102.equals(inteId)) {
Nx2023Api1102 api1102 = new Nx2023Api1102();
- BeanUtils.copyProperties(apiData, api1102);
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1102.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- api1102.setTykqbm(tykqbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ BeanUtils.copyProperties(data, api1102);
+ //璁剧疆缁熶竴鍗曚綅缂栫爜
if (StringUtils.isEmpty(api1102.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ String tydwbm = apiCommonService.getTydwbm(api1102.getDwdm());
api1102.setTydwbm(tydwbm);
}
return api1102;
}
- if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {
- Api1103 apiData = (Api1103)data;
+ if (Constant.API_CODE_1103.equals(inteId)) {
Nx2023Api1103 api1103 = new Nx2023Api1103();
- BeanUtils.copyProperties(apiData, api1103);
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ BeanUtils.copyProperties(data, api1103);
+ //璁剧疆缁熶竴搴撳尯缂栫爜
if (StringUtils.isEmpty(api1103.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ String tykqbm = apiCommonService.getTykqbm(api1103.getKqdm());
api1103.setTykqbm(tykqbm);
- }
- //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1103.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- api1103.setTycfbm(tycfbm);
}
return api1103;
}
- if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {
+ if (Constant.API_CODE_1104.equals(inteId)) {
Nx2023Api1104 api1104 = new Nx2023Api1104();
BeanUtils.copyProperties(data, api1104);
+ //璁剧疆缁熶竴浠撴埧缂栫爜
+ if (StringUtils.isEmpty(api1104.getTycfbm())) {
+ String tycfbm = apiCommonService.getTykqbm(api1104.getCfbh());
+ api1104.setTycfbm(tycfbm);
+ }
return api1104;
}
- if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {
+ if (Constant.API_CODE_1105.equals(inteId)) {
Nx2023Api1105 api1105 = new Nx2023Api1105();
BeanUtils.copyProperties(data, api1105);
+ //璁剧疆缁熶竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(api1105.getTyajbm())) {
+ String tyajbm = apiCommonService.getTykqbm(api1105.getAjdm());
+ api1105.setTyajbm(tyajbm);
+ }
return api1105;
}
- if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {
+ if (Constant.API_CODE_1106.equals(inteId)) {
Nx2023Api1106 api1106 = new Nx2023Api1106();
BeanUtils.copyProperties(data, api1106);
+ //璁剧疆缁熶竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1106.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1106.getKqdm());
+ api1106.setTykqbm(tykqbm);
+ }
return api1106;
}
- if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {
+ if (Constant.API_CODE_1107.equals(inteId)) {
Nx2023Api1107 api1107 = new Nx2023Api1107();
BeanUtils.copyProperties(data, api1107);
+ //璁剧疆缁熶竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1107.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1107.getDwdm());
+ api1107.setTydwbm(tydwbm);
+ }
+ //璁剧疆缁熶竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1107.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
+ api1107.setTykqbm(tykqbm);
+ }
return api1107;
}
- if (NX2023Constant.NX_2023_API_CODE_1108.equals(inteId)) {
+ if (Constant.API_CODE_1108.equals(inteId)) {
Nx2023Api1108 api1108 = new Nx2023Api1108();
BeanUtils.copyProperties(data, api1108);
+ //璁剧疆缁熶竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1108.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1108.getDwdm());
+ api1108.setTydwbm(tydwbm);
+ }
+ //璁剧疆缁熶竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1108.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
+ api1108.setTykqbm(tykqbm);
+ }
+ //璁剧疆缁熶竴鑽墏缂栫爜
+ api1108.setTyyjbh(api1108.getYjbh().replace(api1108.getKqdm(), api1108.getTykqbm()));
return api1108;
}
- if (NX2023Constant.NX_2023_API_CODE_1109.equals(inteId)) {
+ if (Constant.API_CODE_1109.equals(inteId)) {
Nx2023Api1109 api1109 = new Nx2023Api1109();
Api1109 apiData = (Api1109) data;
BeanUtils.copyProperties(apiData, api1109);
Map<String, String> map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
+ //璁剧疆缁熶竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1109.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
+ api1109.setTykqbm(tykqbm);
+ }
+ //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜_
+ if (api1109.getWjmc().startsWith(api1109.getKqdm())) {
+ api1109.setWjmc(api1109.getWjmc().replace(api1109.getKqdm(), api1109.getTykqbm()));
+ }
+ //璁剧疆鏂囦欢璺緞
+ api1109.setWjlj("V2024/2409/" + api1109.getTykqbm() + "/" + api1109.getWjlx() + "/" + api1109.getWjmc());
return api1109;
}
- if (NX2023Constant.NX_2023_API_CODE_1110.equals(inteId)) {
+ if (Constant.API_CODE_1110.equals(inteId)) {
Nx2023Api1110 api1110 = new Nx2023Api1110();
BeanUtils.copyProperties(data, api1110);
+ //璁剧疆缁熶竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1110.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
+ api1110.setTydwbm(tydwbm);
+ }
+ //璁剧疆缁熶竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1110.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1110.getKqdm());
+ api1110.setTykqbm(tykqbm);
+ }
+ //璁剧疆缁熶竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1110.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
+ api1110.setTykqbm(tyhwbm);
+ }
return api1110;
}
- if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) {
+ if (Constant.API_CODE_1111.equals(inteId)) {
Nx2023Api1111 api1111 = new Nx2023Api1111();
BeanUtils.copyProperties(data, api1111);
+ //璁剧疆缁熶竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1111.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
+ api1111.setTydwbm(tydwbm);
+ }
+ //璁剧疆缁熶竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1111.getKqdm());
+ api1111.setTykqbm(tykqbm);
+ }
return api1111;
}
- if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) {
- Api1112 apiData = (Api1112) data;
+ if (Constant.API_CODE_1112.equals(inteId)) {
Nx2023Api1112 api1112 = new Nx2023Api1112();
- BeanUtils.copyProperties(apiData, api1112);
+ BeanUtils.copyProperties(data, api1112);
+ //璁剧疆缁熶竴鍗曚綅缂栫爜
+ 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);
+ }
return api1112;
}
- if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) {
- Nx2023Api1113 api1113 = new Nx2023Api1113();
- BeanUtils.copyProperties(data, api1113);
- return api1113;
- }
- if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) {
+ if (Constant.API_CODE_1201.equals(inteId)) {
Api1201 apiData = (Api1201) data;
Nx2023Api1201 api1201 = new Nx2023Api1201();
BeanUtils.copyProperties(apiData, api1201);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1201.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
+ api1201.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(api1201.getHtzl())) {
+ api1201.setHtzl(api1201.getYwlx());
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (StringUtils.isEmpty(api1201.getTyhth())) {
+ api1201.setTyhth(api1201.getHth().replace(api1201.getDwdm(), api1201.getTydwbm()));
+ }
+ if (StringUtils.isEmpty(api1201.getYsfs())) {
+ api1201.setYsfs("鏍规嵁鍒拌揣鏁伴噺杩涜楠屾敹");
+ }
+ if (StringUtils.isEmpty(api1201.getFkfs())) {
+ api1201.setFkfs("4");
+ }
return api1201;
}
- if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
+ if (Constant.API_CODE_1202.equals(inteId)) {
Nx2023Api1202 api1202 = new Nx2023Api1202();
BeanUtils.copyProperties(data, api1202);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1202.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
+ api1202.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆绮潈鍗曚綅绲变竴缂栫爜
+ if (StringUtils.isEmpty(api1202.getLqgsdwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1202.getHwdm().substring(0, 18));
+ api1202.setLqgsdwtybm(tydwbm);
+ }
+ //鍒ゆ柇璁″垝鏄庣粏鍙凤紝涓嶄负绌�
+ if (StringUtils.isNotEmpty(api1202.getJhmxh())) {
+ Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(api1202.getJhmxh());
+ //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+ if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
+ api1202.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + api1202.getTyhwbm().substring(0, 22)));
+ }
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (api1202.getHth().startsWith(api1202.getHwdm().substring(0, 21))) {
+ api1202.setHth(api1202.getHth().replace(api1202.getHwdm().substring(0, 21), api1202.getTyhwbm().substring(0, 22)));
+ }
+ //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (StringUtils.isEmpty(api1202.getTyrkjsdh())) {
+ api1202.setTyrkjsdh(api1202.getRkjsdh().replace(api1202.getHwdm().substring(0, 21), api1202.getTyhwbm().substring(0, 22)));
+ }
return api1202;
}
- if (NX2023Constant.NX_2023_API_CODE_1203.equals(inteId)) {
+ if (Constant.API_CODE_1203.equals(inteId)) {
Nx2023Api1203 api1203 = new Nx2023Api1203();
BeanUtils.copyProperties(data, api1203);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1203.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
+ api1203.setTyhwbm(tyhwbm);
+ }
return api1203;
}
- if (NX2023Constant.NX_2023_API_CODE_1204.equals(inteId)) {
+ if (Constant.API_CODE_1204.equals(inteId)) {
+ Api1204 apiData = (Api1204) data;
Nx2023Api1204 api1204 = new Nx2023Api1204();
- BeanUtils.copyProperties(data, api1204);
+ BeanUtils.copyProperties(apiData, api1204);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1204.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
+ api1204.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (StringUtils.isEmpty(api1204.getTyrkjsdh())) {
+ api1204.setTyrkjsdh(api1204.getRkjsdh().replace(apiData.getKqdm(), api1204.getTyhwbm().substring(0, 22)));
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (api1204.getHth().startsWith(apiData.getKqdm().substring(0, 18))) {
+ api1204.setHth(api1204.getHth().replace(apiData.getKqdm().substring(0, 18), api1204.getTyhwbm().substring(0, 20)));
+ }
return api1204;
}
- if (NX2023Constant.NX_2023_API_CODE_1205.equals(inteId)) {
+ if (Constant.API_CODE_1205.equals(inteId)) {
Nx2023Api1205 api1205 = new Nx2023Api1205();
BeanUtils.copyProperties(data, api1205);
- api1205.setSzlx("09");
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1205.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
+ api1205.setTyhwbm(tyhwbm);
+ }
+ //鍒ゆ柇璁″垝鏄庣粏鍙凤紝涓嶄负绌�
+ if (StringUtils.isNotEmpty(api1205.getJhmxh())) {
+ Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(api1205.getJhmxh());
+ //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+ if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
+ api1205.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + api1205.getTyhwbm().substring(0, 22)));
+ }
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (api1205.getHth().startsWith(api1205.getHwdm().substring(0, 21))) {
+ api1205.setHth(api1205.getHth().replace(api1205.getHwdm().substring(0, 21), api1205.getTyhwbm().substring(0, 22)));
+ }
+ //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (StringUtils.isEmpty(api1205.getTyckjsdh())) {
+ String tykqbm = apiCommonService.getTykqbm(api1205.getHwdm().substring(0, 21));
+ api1205.setTyckjsdh(api1205.getCkjsdh().replace(api1205.getHwdm().substring(0, 21), tykqbm));
+ }
return api1205;
}
- if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
+ if (Constant.API_CODE_1206.equals(inteId)) {
Api1206 apiData = (Api1206) data;
Nx2023Api1206 api1206 = new Nx2023Api1206();
BeanUtils.copyProperties(apiData, api1206);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1206.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
+ api1206.setTydwbm(tydwbm);
+ }
+ //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (StringUtils.isEmpty(api1206.getTyckjsdh())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1206.setTyckjsdh(api1206.getCkjsdh().replace(apiData.getKqdm(), tykqbm));
+ }
return api1206;
}
- if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
+ if (Constant.API_CODE_1207.equals(inteId)) {
Nx2023Api1207 api1207 = new Nx2023Api1207();
BeanUtils.copyProperties(data, api1207);
+ //璁剧疆鍊掑嚭搴撳尯缁熶竴缂栫爜
+ if (StringUtils.isEmpty(api1207.getDckqtybm())) {
+ String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
+ api1207.setDckqtybm(dckqtybm);
+ }
+ //璁剧疆鍊掑叆搴撳尯缁熶竴缂栫爜
+ if (StringUtils.isEmpty(api1207.getDrkqtybm())) {
+ String drkqtybm = apiCommonService.getTykqbm(api1207.getDrdw());
+ api1207.setDrkqtybm(drkqtybm);
+ }
+ //璁剧疆鍊掑嚭璐т綅缁熶竴缂栫爜
+ if (StringUtils.isEmpty(api1207.getDchwtybm())) {
+ String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
+ api1207.setDchwtybm(dchwtybm);
+ }
+ //璁剧疆鍊掑叆璐т綅缁熶竴缂栫爜
+ if (StringUtils.isEmpty(api1207.getDrhwtybm())) {
+ String drhwtybm = apiCommonService.getTyhwbm(api1207.getDrhwdm());
+ api1207.setDrhwtybm(drhwtybm);
+ }
+ //璁剧疆鍊掍粨鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1207.getTydcdh())) {
+ String tykqbm = apiCommonService.getTykqbm(api1207.getDchwdm().substring(0, 21));
+ api1207.setTydcdh(api1207.getDcdh().replace(api1207.getDchwdm().substring(0, 21), tykqbm));
+ }
return api1207;
}
- if (NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)) {
+ if (Constant.API_CODE_1208.equals(inteId)) {
Nx2023Api1208 api1208 = new Nx2023Api1208();
BeanUtils.copyProperties(data, api1208);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1208.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
+ api1208.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆绮潈鍗曚綅绲变竴缂栫爜
+ if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1208.getHwdm());
+ api1208.setLqgstydwbm(tydwbm);
+ }
return api1208;
}
- if (NX2023Constant.NX_2023_API_CODE_1209.equals(inteId)) {
+ if (Constant.API_CODE_1209.equals(inteId)) {
+ Api1209 apiData = (Api1209) data;
Nx2023Api1209 api1209 = new Nx2023Api1209();
- BeanUtils.copyProperties(data, api1209);
+ BeanUtils.copyProperties(apiData, api1209);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1209.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
+ api1209.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鎹熺泭鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1209.getTysydh())) {
+ api1209.setTysydh(api1209.getSydh().replace(api1209.getHwdm(), api1209.getTyhwbm()));
+ }
+ //瀹為檯鎹熻�楁暟閲忚祴鍊�
+ api1209.setSjsysl(apiData.getJzsysl());
return api1209;
}
- if (NX2023Constant.NX_2023_API_CODE_1210.equals(inteId)) {
+ if (Constant.API_CODE_1210.equals(inteId)) {
Nx2023Api1210 api1210 = new Nx2023Api1210();
BeanUtils.copyProperties(data, api1210);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1210.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
+ api1210.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鎬ц川鍙樻洿鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1210.getTylsxzzbdh())) {
+ api1210.setTylsxzzbdh(api1210.getLsxzzbdh().replace(api1210.getHwdm(), api1210.getTyhwbm()));
+ }
return api1210;
}
- if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) {
+ if (Constant.API_CODE_1211.equals(inteId)) {
Nx2023Api1211 api1211 = new Nx2023Api1211();
BeanUtils.copyProperties(data, api1211);
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1211.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1211.getKqdm());
+ api1211.setTykqbm(tykqbm);
+ }
return api1211;
}
- if (NX2023Constant.NX_2023_API_CODE_1212.equals(inteId)) {
+ if (Constant.API_CODE_1212.equals(inteId)) {
Nx2023Api1212 api1212 = new Nx2023Api1212();
BeanUtils.copyProperties(data, api1212);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1212.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
+ api1212.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1212.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
+ api1212.setTykqbm(tykqbm);
+ }
return api1212;
}
- if (NX2023Constant.NX_2023_API_CODE_1301.equals(inteId)) {
+ if (Constant.API_CODE_1213.equals(inteId)) {
+ Api1213 apiData = (Api1213)data;
+ Nx2023Api1213 api1213 = new Nx2023Api1213();
+ BeanUtils.copyProperties(data, api1213);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1213.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ api1213.setTyhwbm(tyhwbm);
+ }
+ return api1213;
+ }
+ if (Constant.API_CODE_1301.equals(inteId)) {
Nx2023Api1301 api1301 = new Nx2023Api1301();
BeanUtils.copyProperties(data, api1301);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(api1301.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1301.getDwdm());
+ api1301.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1301.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1301.getKqdm());
+ api1301.setTykqbm(tykqbm);
+ }
return api1301;
}
- if (NX2023Constant.NX_2023_API_CODE_1302.equals(inteId)) {
+ if (Constant.API_CODE_1302.equals(inteId)) {
Nx2023Api1302 api1302 = new Nx2023Api1302();
BeanUtils.copyProperties(data, api1302);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1302.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
+ api1302.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1302.getTywsdjcdh())) {
+ api1302.setTywsdjcdh(api1302.getWsdjcdh().replace(api1302.getHwdm(), api1302.getTyhwbm()));
+ }
return api1302;
}
- if (NX2023Constant.NX_2023_API_CODE_1303.equals(inteId)) {
+ if (Constant.API_CODE_1303.equals(inteId)) {
Nx2023Api1303 api1303 = new Nx2023Api1303();
BeanUtils.copyProperties(data, api1303);
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(api1303.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(api1303.getHwdm().substring(0, 28));
+ api1303.setTyajbm(tyajbm);
+ }
+ //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1303.getTyhcjcdh())) {
+ api1303.setTyhcjcdh(api1303.getHcjcdh().replace(api1303.getHwdm(), api1303.getTyajbm()));
+ }
return api1303;
}
- if (NX2023Constant.NX_2023_API_CODE_1304.equals(inteId)) {
+ if (Constant.API_CODE_1304.equals(inteId)) {
Nx2023Api1304 api1304 = new Nx2023Api1304();
BeanUtils.copyProperties(data, api1304);
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(api1304.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(api1304.getHwdm().substring(0, 28));
+ api1304.setTyajbm(tyajbm);
+ }
+ //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1304.getTyqtndjcdh())) {
+ api1304.setTyqtndjcdh(api1304.getQtndjcdh().replace(api1304.getHwdm(), api1304.getTyajbm()));
+ }
return api1304;
}
- if (NX2023Constant.NX_2023_API_CODE_1305.equals(inteId)) {
+ if (Constant.API_CODE_1305.equals(inteId)) {
+ Api1305 apiData = (Api1305)data;
Nx2023Api1305 api1305 = new Nx2023Api1305();
- BeanUtils.copyProperties(data, api1305);
+ BeanUtils.copyProperties(apiData, api1305);
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(api1305.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
+ api1305.setTyajbm(tyajbm);
+ }
+ //璁剧疆閫氶浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1305.getTytfzydh())) {
+ api1305.setTytfzydh(api1305.getTfzydh().replace(apiData.getHwdm(), api1305.getTyajbm()));
+ }
return api1305;
}
- if (NX2023Constant.NX_2023_API_CODE_1306.equals(inteId)) {
+ if (Constant.API_CODE_1306.equals(inteId)) {
+ Api1306 apiData = (Api1306)data;
Nx2023Api1306 api1306 = new Nx2023Api1306();
- BeanUtils.copyProperties(data, api1306);
+ BeanUtils.copyProperties(apiData, api1306);
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(api1306.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
+ api1306.setTyajbm(tyajbm);
+ }
+ //璁剧疆鐔忚捀浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1306.getTyxzzydh())) {
+ api1306.setTyxzzydh(api1306.getXzzydh().replace(api1306.getCfdm(), api1306.getTyajbm()));
+ }
return api1306;
}
- if (NX2023Constant.NX_2023_API_CODE_1307.equals(inteId)) {
+ if (Constant.API_CODE_1307.equals(inteId)) {
Api1307 apiData = (Api1307) data;
Nx2023Api1307 api1307 = new Nx2023Api1307();
BeanUtils.copyProperties(apiData, api1307);
@@ -384,71 +670,182 @@
Map<String, String> map = new HashMap<>();
map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
api1307.setCntxwjl(JSON.toJSONString(map));
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1307.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
+ api1307.setTykqbm(tykqbm);
+ }
+ //璁剧疆绲变竴浠撴埧缂栫爜
+ if (StringUtils.isEmpty(api1307.getTycfbm())) {
+ String tycfbm = apiCommonService.getTykqbm(api1307.getCfdm());
+ api1307.setTycfbm(tycfbm);
+ }
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1307.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
+ api1307.setTyhwbm(tyhwbm);
+ }
+
+ //璁剧疆鏂囦欢璺緞
+ String cntxwjlj = "V2024/2432/";
+ cntxwjlj += api1307.getTykqbm() + "/";
+ cntxwjlj += api1307.getYzwbh() + "/";
+ cntxwjlj += api1307.getSpjksbid() + "/";
+ cntxwjlj += api1307.getTyhwbm() + "_" + DateFormatUtils.format(api1307.getZpsj(),"yyyyMMdd HHmmss") + "." + api1307.getTxwjhzm();
+ api1307.setCntxwjlj(cntxwjlj);
return api1307;
}
- if (NX2023Constant.NX_2023_API_CODE_1308.equals(inteId)) {
+ if (Constant.API_CODE_1308.equals(inteId)) {
+ Api1308 apiData = (Api1308) data;
Nx2023Api1308 api1308 = new Nx2023Api1308();
- BeanUtils.copyProperties(data, api1308);
+ BeanUtils.copyProperties(apiData, api1308);
+ Map<String, String> map = new HashMap<>();
+ map.put(api1308.getSpjksbid() + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMddHHmmss") + "." + apiData.getSpwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
+ api1308.setSpwjl(JSON.toJSONString(map));
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(api1308.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
+ api1308.setTykqbm(tykqbm);
+ }
+
+ //璁剧疆鏂囦欢璺緞
+ String spwjlj = "V2024/2433/";
+ spwjlj += api1308.getTykqbm() + "/";
+ spwjlj += api1308.getSpjksbid() + "/";
+ spwjlj += api1308.getSpjksbid() + "/";
+ spwjlj += api1308.getTykqbm() + "_" + DateFormatUtils.format(api1308.getGjsj(),"yyyyMMdd HHmmss") + "." + api1308.getSpwjhzm();
+ api1308.setSpwjlj(spwjlj);
return api1308;
}
- if (NX2023Constant.NX_2023_API_CODE_1309.equals(inteId)) {
+ if (Constant.API_CODE_1309.equals(inteId)) {
+ Api1309 apiData = (Api1309)data;
Nx2023Api1309 api1309 = new Nx2023Api1309();
BeanUtils.copyProperties(data, api1309);
+ //璁剧疆杩濊鍗曚綅绲变竴缂栫爜
+ if (StringUtils.isEmpty(api1309.getWgdwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1309.getQydm());
+ api1309.setWgdwtybm(tydwbm);
+ }
+ //璁剧疆棰勮淇℃伅浠ｇ爜锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (StringUtils.isEmpty(api1309.getTyyjxxdm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1309.setTyyjxxdm(api1309.getYjxxdm().replace(apiData.getKqdm(), tykqbm));
+ }
return api1309;
}
- if (NX2023Constant.NX_2023_API_CODE_1310.equals(inteId)) {
+ if (Constant.API_CODE_1310.equals(inteId)) {
Nx2023Api1310 api1310 = new Nx2023Api1310();
BeanUtils.copyProperties(data, api1310);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1310.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
+ api1310.setTyhwbm(tyhwbm);
+ }
return api1310;
}
- if (NX2023Constant.NX_2023_API_CODE_1401.equals(inteId)) {
- Nx2023Api1401 api1401 = new Nx2023Api1401();
- BeanUtils.copyProperties(data, api1401);
- return api1401;
- }
- if (NX2023Constant.NX_2023_API_CODE_1402.equals(inteId)) {
- Nx2023Api1402 api1402 = new Nx2023Api1402();
- BeanUtils.copyProperties(data, api1402);
- return api1402;
- }
- if (NX2023Constant.NX_2023_API_CODE_1403.equals(inteId)) {
- Nx2023Api1403 api1403 = new Nx2023Api1403();
- BeanUtils.copyProperties(data, api1403);
- return api1403;
- }
- if (NX2023Constant.NX_2023_API_CODE_1404.equals(inteId)) {
+ if (Constant.API_CODE_1404.equals(inteId)) {
+ Api1404 apiData = (Api1404)data;
Nx2023Api1404 api1404 = new Nx2023Api1404();
- BeanUtils.copyProperties(data, api1404);
+ BeanUtils.copyProperties(apiData, api1404);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(api1404.getLhhwtybm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
+ api1404.setLhhwtybm(tyhwbm);
+ }
+ //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+ if (StringUtils.isEmpty(api1404.getTyjhmxdh())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1404.setTyjhmxdh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + apiData.getKqdm(), api1404.getLhjhdh() + tykqbm));
+ }
return api1404;
}
- if (NX2023Constant.NX_2023_API_CODE_1405.equals(inteId)) {
- Nx2023Api1405 api1405 = new Nx2023Api1405();
- BeanUtils.copyProperties(data, api1405);
- return api1405;
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ Api1504 api1504 = (Api1504)data;
+ Nx2023Api1504 apiData = new Nx2023Api1504();
+ BeanUtils.copyProperties(api1504, apiData);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getXqydm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
+ apiData.setXqydm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getXkqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
+ apiData.setXkqdm(tykqbm);
+ }
+ return apiData;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ Nx2023Api1505 apiData = new Nx2023Api1505();
+ BeanUtils.copyProperties(data, apiData);
+ return data;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ Nx2023Api1506 apiData = new Nx2023Api1506();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ Nx2023Api1507 apiData = new Nx2023Api1507();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ Nx2023Api1508 apiData = new Nx2023Api1508();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ Nx2023Api1509 apiData = new Nx2023Api1509();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ Nx2023Api1510 apiData = new Nx2023Api1510();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
return data;
}
/**
* 鑾峰彇涓婁紶鐨勬帴鍙ｇ紪鐮�
+ *
* @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 (Constant.API_CODE_1213.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2442;
}
- if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
- return NX2023Constant.NX_2023_API_CODE_1114;
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2443;
}
- if (NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) {
- return NX2023Constant.NX_2023_API_CODE_1114;
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2444;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2445;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2446;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2447;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2448;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_2449;
}
return inteId;
}
/**
* 璧嬪�兼渶鍚庢洿鏂版椂闂�
+ *
* @param object
* @return
*/
@@ -462,228 +859,6 @@
e.printStackTrace();
}
return object;
- }
-
- /**
- * 鑾峰彇璐㈠姟鏁版嵁json
- *
- * @param inteId
- * @param data
- * @return
- */
- private Object getJsonFinanceData(String inteId, Object data) {
- //璐㈠姟鎶ヨ〃鏁版嵁灏佽
- if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) {
- return copyApi1501((Api1501) data);
- } else if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
- return copyApi1502((Api1502) data);
- } else {
- return copyApi1503((Api1503) data);
- }
- }
-
- private List<NxFinanceDto> copyApi1503(Api1503 api1503) {
- List<NxFinanceDto> list = new ArrayList<>();
- NxFinanceDto nxFinanceDto = new NxFinanceDto();
- nxFinanceDto.setDwdm(api1503.getDwdm());
- nxFinanceDto.setKqdm(api1503.getKqdm());
-
- nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
- nxFinanceDto.setBbm("03");
- nxFinanceDto.setCzbz(api1503.getCzbz());
- nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
- paddingData(nxFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
- paddingData(nxFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
- paddingData(nxFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
- paddingData(nxFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
- paddingData(nxFinanceDto, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
- paddingData(nxFinanceDto, list, "5", "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
- paddingData(nxFinanceDto, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
- paddingData(nxFinanceDto, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
- paddingData(nxFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
- paddingData(nxFinanceDto, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
- paddingData(nxFinanceDto, list, "10","鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
- paddingData(nxFinanceDto, list, "11","鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
- paddingData(nxFinanceDto, list, "12","鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
- paddingData(nxFinanceDto, list, "13","鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
- paddingData(nxFinanceDto, list, "14","璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
- paddingData(nxFinanceDto, list, "15","璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
- paddingData(nxFinanceDto, list, "16","浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
- paddingData(nxFinanceDto, list, "17","鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
- paddingData(nxFinanceDto, list, "18","鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
- paddingData(nxFinanceDto, list, "19","涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
- paddingData(nxFinanceDto, list, "20","鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
- paddingData(nxFinanceDto, list, "21","鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
- paddingData(nxFinanceDto, list, "22","锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
- paddingData(nxFinanceDto, list, "23","锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
- paddingData(nxFinanceDto, list, "24","浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
- paddingData(nxFinanceDto, list, "25","锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
- paddingData(nxFinanceDto, list, "26","1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
- paddingData(nxFinanceDto, list, "27","锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
- paddingData(nxFinanceDto, list, "28","1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
- paddingData(nxFinanceDto, list, "29","2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(nxFinanceDto, list, "30","3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(nxFinanceDto, list, "31","4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
- paddingData(nxFinanceDto, list, "32","5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
- paddingData(nxFinanceDto, list, "33","鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
- paddingData(nxFinanceDto, list, "34","涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
- paddingData(nxFinanceDto, list, "35","锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
- paddingData(nxFinanceDto, list, "36","锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
-
- return list;
- }
-
- private List<NxFinanceDto> copyApi1502(Api1502 api1502) {
- List<NxFinanceDto> list = new ArrayList<>();
- NxFinanceDto nxFinanceDto = new NxFinanceDto();
- nxFinanceDto.setDwdm(api1502.getDwdm());
- nxFinanceDto.setKqdm(api1502.getKqdm());
- nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
- nxFinanceDto.setBbm("02");
- nxFinanceDto.setCzbz(api1502.getCzbz());
- nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
- paddingData(nxFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
- paddingData(nxFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
- paddingData(nxFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
- paddingData(nxFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
- paddingData(nxFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
- paddingData(nxFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
- paddingData(nxFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
- paddingData(nxFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
- paddingData(nxFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
- paddingData(nxFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
- paddingData(nxFinanceDto, list, "10","缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
- paddingData(nxFinanceDto, list, "11","缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
- paddingData(nxFinanceDto, list, "12","浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
- paddingData(nxFinanceDto, list, "13","鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
- paddingData(nxFinanceDto, list, "14","鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
- paddingData(nxFinanceDto, list, "15","澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
- paddingData(nxFinanceDto, list, "16","澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
- paddingData(nxFinanceDto, list, "17","鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(nxFinanceDto, list, "18","鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
- paddingData(nxFinanceDto, list, "19","璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
- paddingData(nxFinanceDto, list, "20","鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
- paddingData(nxFinanceDto, list, "21","鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
- paddingData(nxFinanceDto, list, "22","鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
- paddingData(nxFinanceDto, list, "23","鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
- paddingData(nxFinanceDto, list, "24","鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
- paddingData(nxFinanceDto, list, "25","涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
- paddingData(nxFinanceDto, list, "26","鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
- paddingData(nxFinanceDto, list, "27","鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
- paddingData(nxFinanceDto, list, "28","鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(nxFinanceDto, list, "29","绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
- paddingData(nxFinanceDto, list, "30","鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
- paddingData(nxFinanceDto, list, "31","鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
- paddingData(nxFinanceDto, list, "32","鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
- paddingData(nxFinanceDto, list, "33","绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
- paddingData(nxFinanceDto, list, "34","绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
- paddingData(nxFinanceDto, list, "35","鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
- paddingData(nxFinanceDto, list, "36","浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
- paddingData(nxFinanceDto, list, "37","鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
- paddingData(nxFinanceDto, list, "38","鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
-
- return list;
- }
-
- private List<NxFinanceDto> copyApi1501(Api1501 api1501) {
- List<NxFinanceDto> list = new ArrayList<>();
- NxFinanceDto nxFinanceDto = new NxFinanceDto();
- nxFinanceDto.setDwdm(api1501.getDwdm());
- nxFinanceDto.setKqdm(api1501.getKqdm());
- nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
- nxFinanceDto.setBbm("01");
- nxFinanceDto.setCzbz(api1501.getCzbz());
- nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
- paddingData(nxFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(nxFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(nxFinanceDto, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
- paddingData(nxFinanceDto, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
- paddingData(nxFinanceDto, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
- paddingData(nxFinanceDto, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
- paddingData(nxFinanceDto, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
- paddingData(nxFinanceDto, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
- paddingData(nxFinanceDto, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
- paddingData(nxFinanceDto, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
- paddingData(nxFinanceDto, list, "10", "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
- paddingData(nxFinanceDto, list, "11", "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
- paddingData(nxFinanceDto, list, "12", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
- paddingData(nxFinanceDto, list, "13", "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
- paddingData(nxFinanceDto, list, "14", "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(nxFinanceDto, list, "15", "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(nxFinanceDto, list, "16", "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
- paddingData(nxFinanceDto, list, "17", "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
- paddingData(nxFinanceDto, list, "18", "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
- paddingData(nxFinanceDto, list, "19", "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
- paddingData(nxFinanceDto, list, "20", "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
- paddingData(nxFinanceDto, list, "21", "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
- paddingData(nxFinanceDto, list, "22", "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
- paddingData(nxFinanceDto, list, "23", "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
- paddingData(nxFinanceDto, list, "24", "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
- paddingData(nxFinanceDto, list, "25", "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
- paddingData(nxFinanceDto, list, "26", "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
- paddingData(nxFinanceDto, list, "27", "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
- paddingData(nxFinanceDto, list, "28", "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
- paddingData(nxFinanceDto, list, "29", "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
- paddingData(nxFinanceDto, list, "30", "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
- paddingData(nxFinanceDto, list, "31", "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
- paddingData(nxFinanceDto, list, "32", "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
- paddingData(nxFinanceDto, list, "33", "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(nxFinanceDto, list, "34", "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
- paddingData(nxFinanceDto, list, "35", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(nxFinanceDto, list, "36", "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(nxFinanceDto, list, "37", "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(nxFinanceDto, list, "38", "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
- paddingData(nxFinanceDto, list, "39", "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
- paddingData(nxFinanceDto, list, "40", "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
- paddingData(nxFinanceDto, list, "41", "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(nxFinanceDto, list, "42", "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(nxFinanceDto, list, "43", "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
- paddingData(nxFinanceDto, list, "44", "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
- paddingData(nxFinanceDto, list, "45", "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(nxFinanceDto, list, "46", "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
- paddingData(nxFinanceDto, list, "47", "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
- paddingData(nxFinanceDto, list, "48", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
- paddingData(nxFinanceDto, list, "49", "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
- paddingData(nxFinanceDto, list, "50", "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(nxFinanceDto, list, "51", "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(nxFinanceDto, list, "52", "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
- paddingData(nxFinanceDto, list, "53", "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
- paddingData(nxFinanceDto, list, "54", "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
- paddingData(nxFinanceDto, list, "55", "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
- paddingData(nxFinanceDto, list, "56", "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
- paddingData(nxFinanceDto, list, "57", "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(nxFinanceDto, list, "58", "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
- paddingData(nxFinanceDto, list, "59", "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
- paddingData(nxFinanceDto, list, "60", "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
- paddingData(nxFinanceDto, list, "61", "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(nxFinanceDto, list, "62", "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
- paddingData(nxFinanceDto, list, "63", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(nxFinanceDto, list, "64", "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
- paddingData(nxFinanceDto, list, "65", "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
- paddingData(nxFinanceDto, list, "66", "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
- paddingData(nxFinanceDto, list, "67", "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
- paddingData(nxFinanceDto, list, "68", "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
- paddingData(nxFinanceDto, list, "69", "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
- paddingData(nxFinanceDto, list, "70", "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
- paddingData(nxFinanceDto, list, "71", "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
- paddingData(nxFinanceDto, list, "72", "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
- paddingData(nxFinanceDto, list, "73", "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
- paddingData(nxFinanceDto, list, "74", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(nxFinanceDto, list, "75", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
- return list;
- }
-
- private void paddingData(NxFinanceDto common, List<NxFinanceDto> list, String zbxh, String zbmc, String zbz1, String zbz2) {
- NxFinanceDto nxFinanceDto = new NxFinanceDto();
- BeanUtils.copyProperties(common, nxFinanceDto);
- nxFinanceDto.setZbxh(zbxh);
- nxFinanceDto.setZbmc(zbmc);
- nxFinanceDto.setZbz1(zbz1);
- nxFinanceDto.setZbz2(zbz2);
- list.add(nxFinanceDto);
}
@Override
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023Constant.java b/src/main/java/com/fzzy/push/nx2023/NX2023Constant.java
index e2a8f32..2cb5cae 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023Constant.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023Constant.java
@@ -53,15 +53,6 @@
* 鎺ュ彛缂栫爜-1112 浜哄憳淇℃伅鏁版嵁鎺ュ彛
*/
public static String NX_2023_API_CODE_1112 = "1112";
- public static String NX_2023_API_CODE_1113 = "1113";
-
- /**
- * 鎺ュ彛缂栫爜-1114 璐㈠姟鎶ヨ〃鏁版嵁鎺ュ彛
- */
- public static String NX_2023_API_CODE_1114 = "1114";
- public static String NX_2023_API_CODE_1114_1501 = "1501";
- public static String NX_2023_API_CODE_1114_1502 = "1502";
- public static String NX_2023_API_CODE_1114_1503 = "1503";
/**
* 鎺ュ彛缂栫爜-1201 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
@@ -111,7 +102,6 @@
* 鎺ュ彛缂栫爜-1212 瀹㈡埛淇℃伅鏁版嵁鎺ュ彛
*/
public static String NX_2023_API_CODE_1212 = "1212";
-
/**
* 鎺ュ彛缂栫爜-1301 瀹夊叏绠＄悊鏁版嵁鎺ュ彛
*/
@@ -166,5 +156,37 @@
public static String NX_2023_API_CODE_1404 = "1404";
public static String NX_2023_API_CODE_1405 = "1405";
-
+
+ /**
+ * 鎺ュ彛缂栫爜-2442 灏佷粨纭鍗�
+ */
+ public static String NX_2023_API_CODE_2442 = "2442";
+ /**
+ * 鎺ュ彛缂栫爜-2443 璐﹀淇℃伅
+ */
+ public static String NX_2023_API_CODE_2443 = "2443";
+ /**
+ * 鎺ュ彛缂栫爜-2444 绉戠洰淇℃伅
+ */
+ public static String NX_2023_API_CODE_2444 = "2444";
+ /**
+ * 鎺ュ彛缂栫爜-2445 绉戠洰浣欓琛�
+ */
+ public static String NX_2023_API_CODE_2445 = "2445";
+ /**
+ * 鎺ュ彛缂栫爜-2446 浼氳鍑瘉淇℃伅
+ */
+ public static String NX_2023_API_CODE_2446 = "2446";
+ /**
+ * 鎺ュ彛缂栫爜-2447 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ */
+ public static String NX_2023_API_CODE_2447 = "2447";
+ /**
+ * 鎺ュ彛缂栫爜-2448 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ */
+ public static String NX_2023_API_CODE_2448 = "2448";
+ /**
+ * 鎺ュ彛缂栫爜-2449 璧勪骇鎶樻棫淇℃伅
+ */
+ public static String NX_2023_API_CODE_2449 = "2449";
}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
index 0900c48..2c8b714 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
@@ -119,9 +119,6 @@
case "1112":
pushService11.pushData1112(apiRemoteService, param);
break;
- case "1114":
- pushService15.pushData1500(apiRemoteService, param);
- break;
case "1201":
pushService12.pushData1201(apiRemoteService, param);
break;
@@ -188,12 +185,33 @@
case "1310":
pushService13.pushData1310(apiRemoteService, param);
break;
- case "1403":
- pushService14.pushData1403(apiRemoteService, param);
- break;
case "1404":
pushService14.pushData1404(apiRemoteService, param);
break;
+ case "2442":
+ pushService12.pushData1213(apiRemoteService, param);
+ break;
+ case "2443":
+ pushService15.pushData1504(apiRemoteService, param);
+ break;
+ case "2444":
+ pushService15.pushData1505(apiRemoteService, param);
+ break;
+ case "2445":
+ pushService15.pushData1506(apiRemoteService, param);
+ break;
+ case "2446":
+ pushService15.pushData1507(apiRemoteService, param);
+ break;
+ case "2447":
+ pushService15.pushData1508(apiRemoteService, param);
+ break;
+ case "2448":
+ pushService15.pushData1509(apiRemoteService, param);
+ break;
+ case "2449":
+ pushService15.pushData1510(apiRemoteService, param);
+ break;
default:
log.error("-----瀹佸鐪佸钩鍙帮細鏈尮閰嶅埌鎺ュ彛缂栫爜锛屼笉鎺ㄩ��-----");
break;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
index 58f1a05..3a93cfe 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
@@ -23,6 +23,9 @@
@PropertyDef(label = "寤掗棿鍚嶇О")
private String ajmc;
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
@PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
private String cfbh;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
index dd0a20c..1abd778 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
@@ -14,12 +14,18 @@
@Data
public class Nx2023Api1105 implements Serializable {
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
@PropertyDef(label = "璐т綅鍚嶇О" )
private String hwmc;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
@PropertyDef(label = "寤掗棿浠ｇ爜" )
private String ajdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
index d915377..e3928b7 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
@@ -14,12 +14,18 @@
@Data
public class Nx2023Api1106 implements Serializable {
+ @PropertyDef(label = "缁熶竴娌圭綈缂栫爜" )
+ private String tyygbm;
+
@PropertyDef(label = "娌圭綈浠ｇ爜" )
private String ygdm;
@PropertyDef(label = "娌圭綈鍚嶇О" )
private String ygmc;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
index 210058b..651beab 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
@@ -14,15 +14,21 @@
@Data
public class Nx2023Api1107 implements Serializable {
- @PropertyDef(label = "璁惧缂栧彿" )
- private String sbbh;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
+ @PropertyDef(label = "璁惧缂栧彿" )
+ private String sbbh;
+
@PropertyDef(label = "搴撳尯鍚嶇О" )
private String kqmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
index 6cdedb9..db5d7b7 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
@@ -12,17 +12,30 @@
@Data
public class Nx2023Api1108 implements Serializable {
+ @PropertyDef(label = "缁熶竴鑽墏缂栫爜" )
+ private String tyyjbh;
+
+ @PropertyDef(label = "鑽墏缂栧彿")
+ private String yjbh;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+
+ @PropertyDef(label = "閲囪喘鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date cgrq;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
@PropertyDef(label = "搴撳尯鍚嶇О")
private String kqmc;
-
- @PropertyDef(label = "鑽墏缂栧彿")
- private String yjbh;
@PropertyDef(label = "鑽墏鍚嶇О")
private String yjmc;
@@ -54,13 +67,8 @@
@PropertyDef(label = "娈嬫福澶勭悊鏂瑰紡")
private String czclfs;
- @PropertyDef(label = "淇濊川鏈�")
- @JSONField(format = "yyyy-MM-dd")
- private Date bzq;
-
- @PropertyDef(label = "閲囪喘鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date cgrq;
+ @PropertyDef(label = "淇濊川鏈�", description = "鍑犲勾銆佸嚑涓湀绛�")
+ private String bzq;
@PropertyDef(label = "搴撳瓨鏁伴噺")
private Double kcsl;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
index 8b18f4d..fb00cb6 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
@@ -13,14 +13,11 @@
@Data
public class Nx2023Api1109 implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = -6615204510395829490L;
-
-
@PropertyDef(label = "鏂囦欢鍚嶇О")
private String wjmc;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@@ -31,6 +28,9 @@
@PropertyDef(label = "鏂囦欢娴�")
private String wjl;
+ @PropertyDef(label = "鏂囦欢璺緞",description = "鎺ュ彛鐗堟湰鍙�/鎺ュ彛缂栧彿/缁熶竴搴撳尯缂栫爜/鏂囦欢绫诲瀷/鏂囦欢鍚嶇О")
+ private String wjlj;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
index 55d854d..87562d9 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
@@ -14,23 +14,23 @@
@Data
public class Nx2023Api1110 implements Serializable {
- @PropertyDef(label = "璐т綅浠ｇ爜" )
- private String hwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
- @PropertyDef(label = "鍗曚綅鍚嶇О" )
- private String dwmc;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
- @PropertyDef(label = "搴撳尯鍚嶇О" )
- private String kqmc;
-
- @PropertyDef(label = "璐т綅鍚嶇О" )
- private String hwmc;
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ private String hwdm;
@PropertyDef(label = "璐т綅鐩稿浣嶇疆" )
private String hwxdwz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
index bbcc7a8..7b00c13 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
@@ -12,14 +12,14 @@
@Data
public class Nx2023Api1111 implements Serializable {
- @PropertyDef(label = "鍗曚綅鍚嶇О" )
- private String dwmc;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
- @PropertyDef(label = "搴撳尯鍚嶇О" )
- private String kqmc;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
index 109a140..ad2da33 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
@@ -12,9 +12,18 @@
@Data
public class Nx2023Api1112 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜" )
+ private String kqdm;
+
@PropertyDef(label = "鍗曚綅鍚嶇О" )
private String dwmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java
deleted file mode 100644
index 5c9e0b5..0000000
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.fzzy.push.nx2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 鎺ュ彛琛�-浼佷笟淇＄敤淇℃伅
- */
-@Data
-public class Nx2023Api1113 implements Serializable {
-
-
- @PropertyDef(label = "鍗曚綅浠ｇ爜" )
- private String dwdm;
-
- @PropertyDef(label = "淇＄敤绛夌骇" )
- private String xydj;
-
- @PropertyDef(label = "璇勫畾骞翠唤" )
- private String pdnf;
-
- @PropertyDef(label = "璇勫畾鍗曚綅/鏈烘瀯鍚嶇О" )
- private String pddw;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織" )
- private String czbz;
-
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private Date zhgxsj;
-}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
index 0d1d694..f107b86 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
@@ -14,14 +14,23 @@
@Data
public class Nx2023Api1201 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍚堝悓鍙�")
+ private String tyhth;
+
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
@PropertyDef(label = "鍚堝悓鍚嶇О")
private String htmc;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
+
+ @PropertyDef(label = "鍚堝悓绉嶇被" ,description = "1:閿�鍞悎鍚�,2:閲囪喘鍚堝悓,3锛氬鎵樻敹鍌ㄥ悎鍚�,4锛氬鎵樻敹璐悎鍚�")
+ private String htzl;
@PropertyDef(label = "涓氬姟绫诲埆")
private String ywlx;
@@ -64,6 +73,9 @@
@PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
private Date ydwcsj;
+ @PropertyDef(label = "楠屾敹鏂瑰紡")
+ private String ysfs;
+
@PropertyDef(label = "绛捐鍦扮偣")
private String qddd;
@@ -106,6 +118,15 @@
@PropertyDef(label = "缁撶畻鎬婚噾棰�")
private BigDecimal jszje;
+ /**
+ * 1锛氬叏棰濆厛娆惧悗璐�
+ * 2锛氭寜鍒版杩涘害閫愭壒鍙戣揣
+ * 3锛氳揣鍒板苟纭鍚庝竴娆℃�т粯娆�
+ * 4锛氭寜鍒拌揣鎵规閫愭壒纭銆侀�愭壒浠樻
+ */
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ private String fkfs;
+
@PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��")
private String jsyhtyzx;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
index d4b4ff4..693a867 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
@@ -17,6 +17,9 @@
@PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
private String rkywdh;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
@@ -36,6 +39,9 @@
@PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
private String lqgsdwdm;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ private String lqgsdwtybm;
+
@PropertyDef(label = "鎵胯繍浜�")
private String cyr;
@@ -54,11 +60,23 @@
@PropertyDef(label = "杞﹁埞鍙�")
private String cch;
- @PropertyDef(label = "杞﹁埞鍙风被鍨�")
- private String cchlx;
-
@PropertyDef(label = "鎸傝溅鍙�")
private String gch;
+
+ @PropertyDef(label = "鍞伯浜�")
+ private String slr;
+
+ @PropertyDef(label = "鍞伯浜鸿仈绯绘柟寮�")
+ private String slrlxfs;
+
+ @PropertyDef(label = "鍞伯浜鸿韩浠借瘉鍙�")
+ private String slrsfzh;
+
+ @PropertyDef(label = "鍞伯浜鸿处鍙凤紙閾惰鍗℃垨璐︽埛锛�")
+ private String slrzh;
+
+ @PropertyDef(label = "鍞伯浜哄湴鍧�")
+ private String slrdz;
@PropertyDef(label = "瑁呯伯鍦扮偣")
private String ldd;
@@ -190,6 +208,15 @@
@PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿")
private String rkjsdh;
+ @PropertyDef(label = "缁熶竴鍏ュ簱缁撶畻鍗曞彿")
+ private String tyrkjsdh;
+
+ @PropertyDef(label = "鐢熸垚鏂瑰紡")
+ private Integer scfs = 1;
+
+ @PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
+ private String sdblyy;
+
@PropertyDef(label = "澶囨敞")
private String bz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
index 0acfc06..c22d63e 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
@@ -15,6 +15,9 @@
@PropertyDef(label = "鍏ュ簱妫�楠屽崟鍙�")
private String rkjydh;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
index a2ef649..9967b3e 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
@@ -14,9 +14,15 @@
@Data
public class Nx2023Api1204 implements Serializable {
+ @PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿", description = "鐢辩粺涓�搴撶偣浠ｇ爜+缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
+ private String tyrkjsdh;
+
@PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿", description = "鐢卞簱鐐逛唬鐮�+缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
private String rkjsdh;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
index 6b40ff6..18e2a76 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
@@ -15,8 +15,14 @@
@PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
private String ckywdh;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh;
@PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
private String cktzdh;
@@ -30,6 +36,9 @@
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
+
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
+ private String zjbgdh;
@PropertyDef(label = "鎵胯繍浜�")
private String cyr;
@@ -131,8 +140,14 @@
@PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
private String ckjsdh;
- @PropertyDef(label = "鏀舵敮绫诲瀷")
- private String szlx;
+ @PropertyDef(label = "缁熶竴鍑哄簱缁撶畻鍗曞彿")
+ private String tyckjsdh;
+
+ @PropertyDef(label = "鐢熸垚鏂瑰紡")
+ private Integer scfs;
+
+ @PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
+ private String sdblyy;
@PropertyDef(label = "澶囨敞")
private String bz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java
index b760299..7b377f5 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java
@@ -14,9 +14,15 @@
@Data
public class Nx2023Api1206 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍑哄簱缁撶畻鍗曞彿")
+ private String tyckjsdh;
+
@PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿" )
private String ckjsdh;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍚堝悓鍙�" )
private String hth;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
index 655dac4..b55e719 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1207 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍊掍粨鍗曞彿" )
+ private String tydcdh;
+
@PropertyDef(label = "鍊掍粨鍗曞彿" )
private String dcdh;
@@ -26,8 +29,14 @@
@PropertyDef(label = "閫氱煡鍗曞彿" )
private String tzdh;
+ @PropertyDef(label = "鍊掑嚭搴撳尯缁熶竴缂栫爜")
+ private String dckqtybm;
+
@PropertyDef(label = "鍊掑嚭鍗曚綅" )
private String dcdw;
+
+ @PropertyDef(label = "鍊掑叆搴撳尯缁熶竴缂栫爜")
+ private String drkqtybm;
@PropertyDef(label = "鍊掑叆鍗曚綅" )
private String drdw;
@@ -35,8 +44,14 @@
@PropertyDef(label = "绮鍝佺浠ｇ爜" )
private String lspzdm;
+ @PropertyDef(label = "鍊掑嚭璐т綅缁熶竴缂栫爜" )
+ private String dchwtybm;
+
@PropertyDef(label = "鍊掑嚭璐т綅浠ｇ爜" )
private String dchwdm;
+
+ @PropertyDef(label = "鍊掑叆璐т綅缁熶竴缂栫爜" )
+ private String drhwtybm;
@PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜" )
private String drhwdm;
@@ -45,6 +60,14 @@
@PropertyDef(label = "鍊掍粨鏃ユ湡" )
private Date dcrq;
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掍粨寮�濮嬫棩鏈�" )
+ private Date dcksrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掍粨缁撴潫鏃ユ湡" )
+ private Date dcjsrq;
+
@PropertyDef(label = "鍊掍粨鏁伴噺(鍏枻)" )
private double dcsl;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
index 2f21d38..2fe96c6 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
@@ -17,6 +17,9 @@
@JSONField(serialize = false)
private String id;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
@@ -44,6 +47,9 @@
@PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
private String lqgsdwdm;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ private String lqgstydwbm;
+
@PropertyDef(label = "绠＄悊鏂瑰紡")
private String glfs;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
index 8c388ec..215e142 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
@@ -14,8 +14,14 @@
@Data
public class Nx2023Api1209 implements Serializable {
+ @PropertyDef(label = "缁熶竴鎹熸孩鍗曞彿" )
+ private String tysydh;
+
@PropertyDef(label = "鎹熸孩鍗曞彿" )
private String sydh;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
@@ -24,8 +30,17 @@
@PropertyDef(label = "涓氬姟鏃ユ湡" )
private Date ywrq;
+ @PropertyDef(label = "鎹熸孩绫诲瀷", description = "1:鎹熷け锛�2锛氭崯鑰楋紝3锛氭孩浣欙紝4锛氬叾浠�")
+ private String sylx;
+
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
+ private String syhj;
+
@PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)" )
private double rkjz;
+
+ @PropertyDef(label = "鍏ュ簱鏁伴噺(鍏枻)")
+ private double rksl;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍏ュ簱鏃堕棿" )
@@ -50,17 +65,20 @@
@PropertyDef(label = "鍑哄簱鏉傝川(%)" )
private double ckzz;
- @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)" )
- private double jzsysl;
+ @PropertyDef(label = "鍌ㄥ鏃堕暱")
+ private Integer ccsc;
- @PropertyDef(label = "鍏朵腑锛氭垚璐т綅鍓嶆崯鑰�(鍏枻)")
- private double qzchwqsh;
+ @PropertyDef(label = "瀹為檯鎹熸孩鏁伴噺(鍏枻)")
+ private double sjsysl;
- @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
+ @PropertyDef(label = "姘存潅鍑忛噺(鍏枻)" )
private double qzszkl;
- @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)" )
+ @PropertyDef(label = "鑷劧鎹熻�楀畾棰�(鍏枻)" )
private double qzzrshde;
+
+ @PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
+ private Integer sfch;
@PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
private double chsl;
@@ -68,12 +86,16 @@
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父" )
private String sysfzc;
- @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
- private String sylx;
-
@PropertyDef(label = "鎹熸孩鍘熷洜" )
private String syyy;
+ @PropertyDef(label = "鍑烘竻纭鏍囪瘑",description = "0锛氭湭瀹屾垚鍑烘竻纭锛�1锛氬凡瀹屾垚鍑烘竻纭")
+ private Integer cqqrbs;
+
+ @PropertyDef(label = "鍑烘竻纭鏃堕棿")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date cqqrsj;
+
@PropertyDef(label = "浠撳偍瀹℃牳浜�" )
private String ccshr;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
index 0d58568..af07c58 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
@@ -13,11 +13,16 @@
*/
@Data
public class Nx2023Api1210 implements Serializable {
-
+
+ @PropertyDef(label = "缁熶竴绮鎬ц川杞彉鍗曞彿")
+ private String tylsxzzbdh;
@PropertyDef(label = "绮鎬ц川杞彉鍗曞彿")
private String lsxzzbdh;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
index c9653a3..b63f2e4 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
@@ -13,6 +13,9 @@
@Data
public class Nx2023Api1211 implements Serializable {
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
index d48c850..b261dd7 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
@@ -14,17 +14,17 @@
@Data
public class Nx2023Api1212 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
-
- @PropertyDef(label = "搴撳尯鍚嶇О")
- private String kqmc;
@PropertyDef(label = "瀹㈡埛绫诲瀷")
private String khlx;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1213.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1213.java
new file mode 100644
index 0000000..659196b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1213.java
@@ -0,0 +1,69 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author CZT
+ * @Date 2024/11/07 10:23
+ */
+@Data
+public class Nx2023Api1213 implements Serializable {
+
+ @PropertyDef(label = "灏佷粨纭鍗曞彿", description = "2浣嶄笟鍔＄紪鐮�(21浠ｈ〃灏佷粨)+yyMMdd+4浣嶉『搴忕爜锛�212405040001")
+ private String fcqrdh;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
+
+ @PropertyDef(label = "灏佷粨鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date fcrq;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "鍥藉埆")
+ private String gb;
+
+ @PropertyDef(label = "浜у湴")
+ private String cd;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgy;
+
+ @PropertyDef(label = "灏佷粨鏁伴噺")
+ private Double fcsl;
+
+ @PropertyDef(label = "灏佷粨鐢宠浜�")
+ private String fcsqr;
+
+ @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
+ private String bmshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
index 27e9b53..dac19fe 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
+
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -14,21 +16,24 @@
@Data
public class Nx2023Api1301 implements Serializable {
- @PropertyDef(label = "椋庨櫓鐐圭紪鐮�" )
- private String fxdbm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
- @PropertyDef(label = "搴撳尯鍚嶇О" )
- private String kqmc;
-
@PropertyDef(label = "鍦扮偣" )
private String dd;
+ @PropertyDef(label = "椋庨櫓鐐圭紪鐮�" )
+ private String fxdbm;
+
@PropertyDef(label = "璇嗗埆浜�" )
private String sbr;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
index d64bd5d..21be2c7 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1302 implements Serializable {
+ @PropertyDef(label = "缁熶竴娓╂箍搴︽娴嬪崟鍙�" )
+ private String tywsdjcdh;
+
@PropertyDef(label = "娓╂箍搴︽娴嬪崟鍙�" )
private String wsdjcdh;
@@ -21,6 +24,9 @@
@PropertyDef(label = "妫�娴嬫椂闂�")
private Date jcsj;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
index c9f536f..d10717f 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1303 implements Serializable {
+ @PropertyDef(label = "缁熶竴瀹宠櫕妫�娴嬪崟鍙�" ,description = "鐢辩粺涓�寤掗棿浠ｇ爜+妫�娴嬫棩鏈燂紙yyyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
+ private String tyhcjcdh;
+
@PropertyDef(label = "瀹宠櫕妫�娴嬪崟鍙�" ,description = "鐢辫揣浣嶄唬鐮�+妫�娴嬫棩鏈燂紙yyyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
private String hcjcdh;
@@ -21,6 +24,9 @@
@PropertyDef(label = "妫�娴嬫椂闂�" )
private Date jcsj;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜" )
+ private String tyajbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
index 81b94f1..fbe074f 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1304 implements Serializable {
+ @PropertyDef(label = "缁熶竴姘斾綋娴撳害妫�娴嬪崟鍙�" )
+ private String tyqtndjcdh;
+
@PropertyDef(label = "姘斾綋娴撳害妫�娴嬪崟鍙�" )
private String qtndjcdh;
@@ -21,6 +24,9 @@
@PropertyDef(label = "妫�娴嬫椂闂�" )
private Date jcsj;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜" )
+ private String tyajbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
index 11f932f..18a1c2f 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
@@ -20,6 +20,9 @@
@Data
public class Nx2023Api1305 implements Serializable {
+ @PropertyDef(label = "閫氶閫氶浣滀笟鍗曞彿" )
+ private String tytfzydh;
+
@PropertyDef(label = "閫氶浣滀笟鍗曞彿" )
private String tfzydh;
@@ -27,6 +30,9 @@
@PropertyDef(label = "閫氶鏃ユ湡" )
private Date tfrq;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜" )
+ private String tyajbm;
+
@PropertyDef(label = "浠撴埧浠ｇ爜" )
private String cfdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
index c1af926..19fda89 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
@@ -18,9 +18,15 @@
@Data
public class Nx2023Api1306 implements Serializable {
+ @PropertyDef(label = "缁熶竴鐔忚捀浣滀笟鍗曞彿" )
+ private String tyxzzydh;
+
@PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿" )
private String xzzydh;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜" )
+ private String tyajbm;
+
@PropertyDef(label = "浠撴埧浠ｇ爜" )
private String cfdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
index 067ecc2..a2d55eb 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
@@ -15,24 +15,36 @@
@Data
public class Nx2023Api1307 implements Serializable {
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@PropertyDef(label = "瑙嗛鐩戞帶璁惧id" )
private String spjksbid;
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
@PropertyDef(label = "浠撴埧浠ｇ爜" )
private String cfdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
- @PropertyDef(label = "浠撳唴鍥惧儚鏂囦欢娴�" )
- private String cntxwjl;
-
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鎶撴媿鏃堕棿" )
private Date zpsj;
+
+ @PropertyDef(label = "浠撳唴鍥惧儚鏂囦欢璺緞" )
+ private String cntxwjlj;
+
+ @PropertyDef(label = "浠撳唴鍥惧儚鏂囦欢娴�" )
+ private String cntxwjl;
@PropertyDef(label = "鍥惧儚鏂囦欢鍚庣紑鍚�")
private String txwjhzm;
@@ -47,7 +59,5 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
private Date zhgxsj;
-
-
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
index 317ea5b..ca09510 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
@@ -22,6 +22,9 @@
@PropertyDef(label = "搴撳尯鍚嶇О" )
private String kqmc;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
@@ -40,23 +43,14 @@
@PropertyDef(label = "寮傚父鍛婅璇存槑" )
private String ycgjsm;
- @PropertyDef(label = "鍥惧儚缂栧彿")
- private String txbh;
+ @PropertyDef(label = "瑙嗛鏂囦欢璺緞")
+ private String spwjlj;
- @PropertyDef(label = "瑙嗛缂栧彿")
- private String spbh;
+ @PropertyDef(label = "瑙嗛鏂囦欢娴�")
+ private String spwjl;
- @PropertyDef(label = "褰撳墠澶勭疆鐘舵��")
- private String czzt;
-
- @PropertyDef(label = "澶勭疆鍐呭")
- private String hxczqk;
-
- @PropertyDef(label = "澶勭疆浜�")
- private String hxczr;
-
- @PropertyDef(label = "澶勭疆鏃堕棿")
- private Date hhxczsj;
+ @PropertyDef(label = "瑙嗛鏂囦欢鍚庣紑鍚�")
+ private String spwjhzm;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
private String czbz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
index 344dcd2..14b3b50 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1309 implements Serializable {
+ @PropertyDef(label = "缁熶竴棰勮淇℃伅浠ｇ爜" )
+ private String tyyjxxdm;
+
@PropertyDef(label = "棰勮淇℃伅浠ｇ爜" )
private String yjxxdm;
@@ -24,6 +27,9 @@
@PropertyDef(label = "杩濊涓讳綋绫诲瀷" )
private String wgztlx;
+ @PropertyDef(label = "杩濊鍗曚綅缁熶竴缂栫爜" )
+ private String wgdwtybm;
+
@PropertyDef(label = "杩濊鍗曚綅浠ｇ爜" )
private String qydm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
index 12721ff..b7d4064 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
@@ -17,6 +17,9 @@
@PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿" )
private String zjbgdh;
+ @PropertyDef(label = "缁熶竴璐т綅浠ｇ爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
index c8b405b..35281c5 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1404 implements Serializable {
+ @PropertyDef(label = "缁熶竴璁″垝鏄庣粏鍗曞彿" )
+ private String tyjhmxdh;
+
@PropertyDef(label = "璁″垝鏄庣粏鍗曞彿" )
private String jhmxdh;
@@ -32,6 +35,9 @@
@PropertyDef(label = "鏀惰幏骞村害" )
private String shnd;
+ @PropertyDef(label = "杞崲璐т綅缁熶竴缂栫爜" )
+ private String lhhwtybm;
+
@PropertyDef(label = "杞崲璐т綅浠ｇ爜" )
private String lhhwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
new file mode 100644
index 0000000..6d001fc
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
@@ -0,0 +1,69 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 璐﹀淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:15
+ */
+@Data
+public class Nx2023Api1504 implements Serializable {
+
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "璐﹀鍚嶇О")
+ private String cAcctName;
+
+ @PropertyDef(label = "鏈綅甯�")
+ private String cCurrency;
+
+ @PropertyDef(label = "浼氳涓荤")
+ private String cAcctChief;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏈熼棿")
+ private String cPeriodStart;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏃ユ湡")
+ private String cYearBmd;
+
+ @PropertyDef(label = "鏈熼棿鏁�")
+ private Double nAcctPeriodNum;
+
+ @PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
+ private String cAccClassCode;
+
+ @PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
+ private Double nAccGrade;
+
+ @PropertyDef(label = "绉戠洰缂栫爜瑙勫垯", description = "4222XXXX:榛樿鍓嶅洓绾х骇闀胯鍒欎负4222")
+ private String cAccCodeStr;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String cCropName;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String cOrgCode;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String xqydm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String xkqdm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java
new file mode 100644
index 0000000..0f1f3fa
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java
@@ -0,0 +1,79 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绉戠洰淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:20
+ */
+@Data
+public class Nx2023Api1505 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "骞村害")
+ private String cYear;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ private String cCode;
+
+ @PropertyDef(label = "绉戠洰鍚嶇О")
+ private String cName;
+
+ @PropertyDef(label = "绉戠洰鍏ㄧО")
+ private String cAllName;
+
+ /**
+ * 1:璧勪骇绫�
+ * 2:璐熷�虹被
+ * 3:鍏卞悓绫�
+ * 4:鎵�鏈夎�呮潈鐩婄被
+ * 5:鎴愭湰璐圭敤绫�
+ * 6:鎹熺泭绫�
+ */
+ @PropertyDef(label = "绉戠洰绫诲埆")
+ private String nClass;
+ /**
+ * (-1)-璐锋柟锛�1-鍊熸柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ private String cDc;
+
+ @PropertyDef(label = "鏈骇绉戠洰")
+ private String bL;
+
+ @PropertyDef(label = "绉戠洰绾ф")
+ private Double nGrade;
+
+ @PropertyDef(label = "鏁伴噺绉戠洰")
+ private String bQ;
+
+ @PropertyDef(label = "鏁伴噺鍗曚綅")
+ private String cQUnit;
+
+ @PropertyDef(label = "鐜伴噾绫荤鐩�")
+ private String bCash;
+
+ @PropertyDef(label = "閾惰绫荤鐩�")
+ private String bBank;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
+ private String bXjll;
+
+ @PropertyDef(label = "鍐荤粨")
+ private String bF;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java
new file mode 100644
index 0000000..5bded04
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java
@@ -0,0 +1,75 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绉戠洰浣欓淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:25
+ */
+@Data
+public class Nx2023Api1506 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鏈熼棿")
+ private String cYear;
+
+ @PropertyDef(label = "骞村害")
+ private String nNo;
+
+ @PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
+ private Double bM;
+
+ @PropertyDef(label = "鏈熸湯鏈綅甯佷綑棰�")
+ private Double eM;
+
+ @PropertyDef(label = "鏈熷垵鏁伴噺")
+ private Double bQty;
+
+ @PropertyDef(label = "鏈熸湯鏁伴噺")
+ private Double eQty;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ private String cDc;
+
+ @PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
+ private Double dM;
+
+ @PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
+ private Double cM;
+
+ @PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
+ private Double dQ;
+
+ @PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
+ private Double cQ;
+
+ @PropertyDef(label = "鏈熷垵澶栧竵浣欓")
+ private Double bFm;
+
+ @PropertyDef(label = "鏈熸湯澶栧竵浣欓")
+ private Double eFm;
+
+ @PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
+ private Double dFm;
+
+ @PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
+ private Double cFm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java
new file mode 100644
index 0000000..8d005d2
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java
@@ -0,0 +1,103 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 浼氳鍑瘉淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:30
+ */
+@Data
+public class Nx2023Api1507 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ private String cVKind;
+
+ @PropertyDef(label = "鏈熼棿")
+ private Double cMon;
+
+ @PropertyDef(label = "骞村害")
+ private Double cYear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ private Double nVNo;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ private Double nNo;
+
+ @PropertyDef(label = "鍑瘉鍒嗙被")
+ private Double bTmp;
+
+ @PropertyDef(label = "鎽樿")
+ private String Digest;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ private Double cCode;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍑瘉鏃ユ湡")
+ private String cVSmallDatetime;
+
+ @PropertyDef(label = "鍒跺崟浜�")
+ private String cMaker;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ private String cDc;
+
+ @PropertyDef(label = "瀹℃牳浜�")
+ private String cCkEr;
+
+ @PropertyDef(label = "璁拌处浜�")
+ private String cPtEr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "璁拌处鏍囧織")
+ private Double bPt;
+
+ @PropertyDef(label = "闄勪欢寮犳暟")
+ private Double nANum;
+
+ @PropertyDef(label = "閲戦")
+ private Double nM;
+
+ @PropertyDef(label = "鏁伴噺")
+ private Double nQty;
+
+ @PropertyDef(label = "鍗曚环")
+ private Double nPrice;
+
+ @PropertyDef(label = "缁撶畻鍙�")
+ private String cSettleNo;
+
+ @PropertyDef(label = "鍑虹撼")
+ private String cCashier;
+
+ @PropertyDef(label = "姹囩巼")
+ private Double rate;
+
+ @PropertyDef(label = "澶栧竵閲戦")
+ private Double nFm;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅",description = "璁￠噺鍗曚綅姹夊瓧")
+ private String meterUnitId;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java
new file mode 100644
index 0000000..8da3701
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java
@@ -0,0 +1,63 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:35
+ */
+@Data
+public class Nx2023Api1508 implements Serializable {
+
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ private String cVKind;
+
+ @PropertyDef(label = "鏈熼棿")
+ private Double cMon;
+
+ @PropertyDef(label = "骞村害")
+ private Double cYear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ private Double nVNo;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ private String cCode;
+
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ private String cDFCode;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺椤圭洰浠ｇ爜")
+ private String cCashCode;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ private Double nNo;
+
+ @PropertyDef(label = "閲戦")
+ private Double nM;
+
+ /**
+ * 1:娴佸叆
+ * -1:娴佸嚭
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ private String cDc;
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java
new file mode 100644
index 0000000..25fe5db
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java
@@ -0,0 +1,139 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:35
+ */
+@Data
+public class Nx2023Api1509 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ private String fixAssetCode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
+ private String origFixAssetCode;
+
+ @PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
+ private String groupCode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
+ private String fixAssetName;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
+ private String unitName;
+
+ @PropertyDef(label = "鍘熷��")
+ private Double valueOrg;
+
+ @PropertyDef(label = "褰撳墠鍘熷��")
+ private Double dresentValueOrg;
+ /**
+ * 1:涓嶆彁鎶樻棫娉�
+ * 2:骞冲潎骞撮檺娉�
+ * 3:鍔ㄦ�佸钩鍧囧勾闄愭硶
+ * 4:宸ヤ綔閲忔硶
+ * 5:骞存暟鎬诲拰娉�
+ * 6:鍙屽�嶄綑棰濋�掑噺娉�
+ */
+ @PropertyDef(label = "鎶樻棫鏂规硶")
+ private Double deprMethodId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ private Double sourceid;
+ /**
+ * 1:鎶曡祫
+ * 2:鑷缓
+ * 3:璐拱
+ * 4:铻嶈祫绉熻祦
+ * 5:缁忚惀绉熷叆
+ * 6:鏃犲伩璋冨叆
+ * 7:鎹愯禒
+ * 8:鎹㈠叆
+ */
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ private String cDFCode;
+
+ @PropertyDef(label = "鍨嬪彿")
+ private String model;
+
+ @PropertyDef(label = "瑙勬牸")
+ private String specs;
+
+ @PropertyDef(label = "鍒堕�犲晢")
+ private String manufacturer;
+
+ @PropertyDef(label = "浜у湴")
+ private String makingPlace;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "杩涘崟浣嶆棩鏈�")
+ private String enterDay;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
+ private String beginUseDay;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤哄崱鏃ユ湡")
+ private String makinDay;
+
+ @PropertyDef(label = "绠＄悊浜�")
+ private String keeper;
+
+ @PropertyDef(label = "寤哄崱浜�")
+ private String maker;
+
+ @PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
+ private Double usingPeriods;
+
+ @PropertyDef(label = "棰勮鍑�娈嬪��")
+ private Double expecRemain;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
+ private String assetAcctCode;
+
+ @PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
+ private String deprAcctCode;
+
+
+ @PropertyDef(label = "绱鎶樻棫")
+ private Double accumulateDepr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
+ private String abadoned;
+
+ /**
+ * 1:鍦ㄤ娇鐢�
+ * 2:鏈娇鐢�
+ * 3:鍋滅敤
+ * 4:鍑哄敭
+ * 5:鎶ユ崯
+ * 6:鐩樹簭
+ */
+ @PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
+ private String presentStatus;
+
+ @PropertyDef(label = "澶囨敞")
+ private String notes;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java
new file mode 100644
index 0000000..ce0da1a
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java
@@ -0,0 +1,84 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 璧勪骇鎶樻棫淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:40
+ */
+@Data
+public class Nx2023Api1510 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ private String fixAssetCode;
+
+ @PropertyDef(label = "鏈熼棿")
+ private Double period;
+
+ @PropertyDef(label = "骞村害")
+ private Double AcctYear;
+
+ @PropertyDef(label = "鏈熷垵鍘熷��")
+ private Double bValueOrg;
+
+ @PropertyDef(label = "绱鎶樻棫")
+ private Double bAccumDepr;
+
+ @PropertyDef(label = "鏈湡璁℃彁鎶樻棫")
+ private Double deprAmmount;
+
+ @PropertyDef(label = "鏈勾绱璁℃彁鎶樻棫")
+ private Double yAccumDepr;
+
+ @PropertyDef(label = "鏈湡鏁伴噺澧炲姞")
+ private Double qtyAdd;
+
+ @PropertyDef(label = "鏈湡鏁伴噺鍑忓皯")
+ private Double qtyDecrease;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎鍔�")
+ private Double valueOrgAdd;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎噺灏�")
+ private Double valueOrgDerease;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨")
+ private Double accuDeprAdjustAdd;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨噺")
+ private Double accuDeprAdjustDec;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺澧炲姞")
+ private Double yQtyIncrease;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺鍑忓皯")
+ private Double yQtyDecrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″鍔�")
+ private Double yValueIncrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″噺灏�")
+ private Double yValueDecrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨")
+ private Double yAccuDeprIncrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
+ private Double YAccuDeprDecrease;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index c93a2c7..9c3cb9e 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -326,7 +326,7 @@
}
//璁剧疆鏂囦欢娴�
apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
- //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜_
if (apiData.getWjmc().startsWith(apiData.getKqdm())) {
apiData.setWjmc(apiData.getWjmc().replace(apiData.getKqdm(), apiData.getTykqbm()));
}
@@ -434,6 +434,10 @@
if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
}
+ //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
+ apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ }
return apiData;
}
if (Constant.API_CODE_1203.equals(inteId)) {
@@ -485,6 +489,11 @@
if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
}
+ //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
+ apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
+ }
return apiData;
}
if (Constant.API_CODE_1206.equals(inteId)) {
@@ -509,12 +518,12 @@
BeanUtils.copyProperties(api1207, apiData);
//璁剧疆鍊掑嚭搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDckqtybm())) {
- String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0, 21));
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
//璁剧疆鍊掑叆搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
- String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0, 21));
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//璁剧疆鍊掑嚭璐т綅缁熶竴缂栫爜
@@ -854,37 +863,37 @@
String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
apiData.setXkqdm(tykqbm);
}
- return data;
+ return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
SX2024Api1505 apiData = new SX2024Api1505();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
SX2024Api1506 apiData = new SX2024Api1506();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
SX2024Api1507 apiData = new SX2024Api1507();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
SX2024Api1508 apiData = new SX2024Api1508();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
SX2024Api1509 apiData = new SX2024Api1509();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
SX2024Api1510 apiData = new SX2024Api1510();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
return data;
}
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 2c51c37..3625350 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢娼槼 ##########################
+########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱 ##########################
server:
port: 8090
jetty:
@@ -10,15 +10,15 @@
#涓绘暟鎹簮
primary:
url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
@@ -51,7 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5317
-
+ companyId: 5306
file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
+ #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==
--
Gitblit v1.9.3