From f6c758e165d5ff5900e27b8b305857fde9ac80b6 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 七月 2024 19:06:56 +0800
Subject: [PATCH] 增加宁夏省平台2004版协议
---
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java | 3
src/main/java/com/fzzy/api/data/PushProtocol.java | 1
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2414.java | 155 +
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2422.java | 104 +
src/main/java/com/fzzy/push/nx2024/NX2024Constant.java | 180 +
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2406.java | 76
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java | 18
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java | 65
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2437.java | 58
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2429.java | 58
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java | 3
src/main/java/com/fzzy/push/nx2023/NX2023HttpClientUtil.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2415.java | 205 ++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2407.java | 68
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2423.java | 74
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2431.java | 216 ++
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 1
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2438.java | 56
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 303 --
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2424.java | 59
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2432.java | 61
src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java | 77
src/main/java/com/fzzy/push/nx2024/NX2024PushService14.java | 53
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2421.java | 109 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2416.java | 76
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2440.java | 121 +
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2435.java | 119 +
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2419.java | 73
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2427.java | 64
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2408.java | 80
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2405.java | 49
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java | 12
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2413.java | 39
src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java | 984 +++++++++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2410.java | 54
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java | 6
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2402.java | 69
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java | 3
src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java | 212 ++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2417.java | 78
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java | 6
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2409.java | 39
src/main/java/com/fzzy/push/nx2024/package-info.java | 4
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2425.java | 78
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2403.java | 190 +
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2411.java | 56
src/main/java/com/fzzy/push/nx2024/NX2024PushService12.java | 75
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2412.java | 95
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2426.java | 95
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2420.java | 79
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2404.java | 54
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2418.java | 148 +
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2434.java | 65
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java | 6
src/main/java/com/fzzy/push/nx2024/dto/Nx2024RespDto.java | 30
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024ReqDto.java | 48
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2401.java | 99
src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java | 9
src/main/java/com/fzzy/push/nx2024/NX2024PushService13.java | 69
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2430.java | 180 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2441.java | 59
src/main/java/com/fzzy/push/nx2024/NX2024HttpClientUtil.java | 88
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2433.java | 71
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java | 3
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2428.java | 55
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2436.java | 54
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2439.java | 54
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java | 6
95 files changed, 5,451 insertions(+), 493 deletions(-)
diff --git a/src/main/java/com/fzzy/api/data/PushProtocol.java b/src/main/java/com/fzzy/api/data/PushProtocol.java
index 363c7e9..b9dcd9c 100644
--- a/src/main/java/com/fzzy/api/data/PushProtocol.java
+++ b/src/main/java/com/fzzy/api/data/PushProtocol.java
@@ -20,6 +20,7 @@
SB_SHJdJW_2023("SB_SHJdJW_2023", "涓婃捣鍢夊畾绾鐩戠骞冲彴2023鐗�"),
SB_SH_2023("SB_SH_2023", "涓婃捣甯傚钩鍙�2023鐗�"),
SB_NX_2023("SB_NX_2023", "瀹佸鐪佸钩鍙�2023鐗�"),
+ SB_NX_2024("SB_NX_2024", "瀹佸鐪佸钩鍙�2024鐗�"),
SB_SX_2023("SB_SX_2023", "闄曡タ鐪佸钩鍙�2023鐗�");
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index aff72ab..1ac7857 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -190,6 +190,7 @@
list.add(new ApiTrigger(PushProtocol.SB_SHJdJW_2023.getCode(), PushProtocol.SB_SHJdJW_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SH_2023.getCode(), PushProtocol.SB_SH_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_NX_2023.getCode(), PushProtocol.SB_NX_2023.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_NX_2024.getCode(), PushProtocol.SB_NX_2024.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SX_2023.getCode(), PushProtocol.SB_SX_2023.getName()));
return list;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 09d58ce..76d1034 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -1,7 +1,6 @@
package com.fzzy.push.nx2023;
import com.alibaba.fastjson.JSON;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -69,10 +68,8 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- String inteId = param.getInteId();
String kqdm = param.getKqdm();
- //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
+
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
@@ -82,12 +79,8 @@
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
- //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())
- || Constant.API_CODE_1114_1502.equals(param.getInteId())
- || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
- inteId = Constant.API_CODE_1114;
- }
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
apiLog.setInteId(inteId);
if (StringUtils.isEmpty(inteId)) {
@@ -98,7 +91,7 @@
return responseDto;
}
- String jsonData = getJsonData(param.getInteId(), data, conf);
+ String jsonData = getJsonData(param.getInteId(), data);
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
@@ -134,7 +127,7 @@
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
- Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
+ Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData));
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
@@ -157,16 +150,16 @@
* @param data
* @return
*/
- private String getJsonData(String inteId, Object data, ApiConfs conf) {
+ private String getJsonData(String inteId, Object data) {
//鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)
|| NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)
|| NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) {
- Object object = getJsonFinanceData(inteId, data, conf);
+ Object object = getJsonFinanceData(inteId, data);
return JSON.toJSONString(object);
} else {
List<Object> list = new ArrayList<>();
- Object object = getJsonApiData(inteId, data, conf);
+ Object object = getJsonApiData(inteId, data);
//闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
if(!NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)){
@@ -186,87 +179,46 @@
* @param data
* @return
*/
- private Object getJsonApiData(String inteId, Object data, ApiConfs conf) {
+ private Object getJsonApiData(String inteId, Object data) {
if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {
-
Nx2023Api1101 api1101 = new Nx2023Api1101();
BeanUtils.copyProperties(data, api1101);
- //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
- if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
- api1101.setTydwbm(null);
- }
return api1101;
}
if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
Nx2023Api1102 api1102 = new Nx2023Api1102();
BeanUtils.copyProperties(data, api1102);
api1102.setLkxz(null);
- //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
- if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
- api1102.setTykqbm(null);
- api1102.setLkxz("1");
- }
return api1102;
}
if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {
-
Nx2023Api1103 api1103 = new Nx2023Api1103();
BeanUtils.copyProperties(data, api1103);
- //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
- if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
- api1103.setTycfbm(null);
- }
return api1103;
}
if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {
-
Nx2023Api1104 api1104 = new Nx2023Api1104();
BeanUtils.copyProperties(data, api1104);
- //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
- if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
- api1104.setTyajbm(null);
- }
return api1104;
}
if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {
-
Nx2023Api1105 api1105 = new Nx2023Api1105();
BeanUtils.copyProperties(data, api1105);
- //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
- if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
- api1105.setTyhwbm(null);
- }
return api1105;
}
if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {
-
Nx2023Api1106 api1106 = new Nx2023Api1106();
BeanUtils.copyProperties(data, api1106);
- //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
- if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
- api1106.setTyygbm(null);
- }
return api1106;
}
if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {
-
Nx2023Api1107 api1107 = new Nx2023Api1107();
BeanUtils.copyProperties(data, api1107);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
- api1107.setTykqbm(tykqbm);
- }
return api1107;
}
if (NX2023Constant.NX_2023_API_CODE_1108.equals(inteId)) {
Nx2023Api1108 api1108 = new Nx2023Api1108();
BeanUtils.copyProperties(data, api1108);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
- api1108.setTykqbm(tykqbm);
- }
return api1108;
}
if (NX2023Constant.NX_2023_API_CODE_1109.equals(inteId)) {
@@ -276,252 +228,120 @@
Map<String, String> map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
- api1109.setTykqbm(tykqbm);
- }
return api1109;
}
if (NX2023Constant.NX_2023_API_CODE_1110.equals(inteId)) {
Nx2023Api1110 api1110 = new Nx2023Api1110();
BeanUtils.copyProperties(data, api1110);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
- api1110.setTyhwbm(tyhwbm);
- }
return api1110;
}
if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) {
Nx2023Api1111 api1111 = new Nx2023Api1111();
BeanUtils.copyProperties(data, api1111);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
- api1111.setTykqbm(api1102List.getTykqbm());
- }
return api1111;
}
if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) {
Api1112 apiData = (Api1112) data;
Nx2023Api1112 api1112 = new Nx2023Api1112();
BeanUtils.copyProperties(apiData, api1112);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- api1112.setTydwbm(tydwbm);
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- api1112.setTykqbm(tykqbm);
- }
return api1112;
}
if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) {
Nx2023Api1113 api1113 = new Nx2023Api1113();
BeanUtils.copyProperties(data, api1113);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
- api1113.setTydwbm(tydwbm);
- }
return api1113;
}
if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) {
Api1201 apiData = (Api1201) data;
Nx2023Api1201 api1201 = new Nx2023Api1201();
BeanUtils.copyProperties(apiData, api1201);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- api1201.setTydwbm(tydwbm);
- }
return api1201;
}
if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
Nx2023Api1202 api1202 = new Nx2023Api1202();
BeanUtils.copyProperties(data, api1202);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
- api1202.setTyhwbm(tyhwbm);
- }
return api1202;
}
if (NX2023Constant.NX_2023_API_CODE_1203.equals(inteId)) {
Nx2023Api1203 api1203 = new Nx2023Api1203();
BeanUtils.copyProperties(data, api1203);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
- api1203.setTyhwbm(tyhwbm);
- }
return api1203;
}
if (NX2023Constant.NX_2023_API_CODE_1204.equals(inteId)) {
Nx2023Api1204 api1204 = new Nx2023Api1204();
BeanUtils.copyProperties(data, api1204);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
- api1204.setTyhwbm(tyhwbm);
- }
return api1204;
}
if (NX2023Constant.NX_2023_API_CODE_1205.equals(inteId)) {
Nx2023Api1205 api1205 = new Nx2023Api1205();
BeanUtils.copyProperties(data, api1205);
api1205.setSzlx("09");
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
- api1205.setTyhwbm(tyhwbm);
- api1205.setSzlx(null);
- }
return api1205;
}
if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
Api1206 apiData = (Api1206) data;
Nx2023Api1206 api1206 = new Nx2023Api1206();
BeanUtils.copyProperties(apiData, api1206);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
- api1206.setTydwbm(tydwbm);
- }
return api1206;
}
if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
Nx2023Api1207 api1207 = new Nx2023Api1207();
BeanUtils.copyProperties(data, api1207);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
- api1207.setDckqtybm(dckqtybm);
- String drkqtybm = apiCommonService.getTykqbm(api1207.getDrdw());
- api1207.setDrkqtybm(drkqtybm);
- String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
- api1207.setDchwtybm(dchwtybm);
- String drhwtybm = apiCommonService.getTyhwbm(api1207.getDrhwdm());
- api1207.setDrhwtybm(drhwtybm);
- }
return api1207;
}
if (NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)) {
Nx2023Api1208 api1208 = new Nx2023Api1208();
BeanUtils.copyProperties(data, api1208);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
- api1208.setTyhwbm(tyhwbm);
- if(StringUtils.isEmpty(api1208.getTyhwbm())){
- String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
- api1208.setLqgstydwbm(lqgstydwbm);
- }
- }
return api1208;
}
if (NX2023Constant.NX_2023_API_CODE_1209.equals(inteId)) {
Nx2023Api1209 api1209 = new Nx2023Api1209();
BeanUtils.copyProperties(data, api1209);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
- api1209.setTyhwbm(tyhwbm);
- }
return api1209;
}
if (NX2023Constant.NX_2023_API_CODE_1210.equals(inteId)) {
Nx2023Api1210 api1210 = new Nx2023Api1210();
BeanUtils.copyProperties(data, api1210);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
- api1210.setTyhwbm(tyhwbm);
- }
return api1210;
}
if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) {
Nx2023Api1211 api1211 = new Nx2023Api1211();
BeanUtils.copyProperties(data, api1211);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tykqbm = apiCommonService.getTykqbm(api1211.getKqdm());
- api1211.setTykqbm(tykqbm);
- }
return api1211;
}
if (NX2023Constant.NX_2023_API_CODE_1212.equals(inteId)) {
Nx2023Api1212 api1212 = new Nx2023Api1212();
BeanUtils.copyProperties(data, api1212);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
- api1212.setTydwbm(tydwbm);
- String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
- api1212.setTykqbm(tykqbm);
- }
return api1212;
}
if (NX2023Constant.NX_2023_API_CODE_1301.equals(inteId)) {
Nx2023Api1301 api1301 = new Nx2023Api1301();
BeanUtils.copyProperties(data, api1301);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(api1301.getDwdm());
- api1301.setTydwbm(tydwbm);
- String tykqbm = apiCommonService.getTykqbm(api1301.getKqdm());
- api1301.setTykqbm(tykqbm);
- }
return api1301;
}
if (NX2023Constant.NX_2023_API_CODE_1302.equals(inteId)) {
Nx2023Api1302 api1302 = new Nx2023Api1302();
BeanUtils.copyProperties(data, api1302);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
- api1302.setTyhwbm(tyhwbm);
- }
return api1302;
}
if (NX2023Constant.NX_2023_API_CODE_1303.equals(inteId)) {
Nx2023Api1303 api1303 = new Nx2023Api1303();
BeanUtils.copyProperties(data, api1303);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
- api1303.setTyhwbm(tyhwbm);
- }
return api1303;
}
if (NX2023Constant.NX_2023_API_CODE_1304.equals(inteId)) {
Nx2023Api1304 api1304 = new Nx2023Api1304();
BeanUtils.copyProperties(data, api1304);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
- api1304.setTyhwbm(tyhwbm);
- }
return api1304;
}
if (NX2023Constant.NX_2023_API_CODE_1305.equals(inteId)) {
Nx2023Api1305 api1305 = new Nx2023Api1305();
BeanUtils.copyProperties(data, api1305);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tycfbm = apiCommonService.getTycfbm(api1305.getCfdm());
- api1305.setTycfbm(tycfbm);
- }
return api1305;
}
if (NX2023Constant.NX_2023_API_CODE_1306.equals(inteId)) {
Nx2023Api1306 api1306 = new Nx2023Api1306();
BeanUtils.copyProperties(data, api1306);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tycfbm = apiCommonService.getTycfbm(api1306.getCfdm());
- api1306.setTycfbm(tycfbm);
- }
return api1306;
}
if (NX2023Constant.NX_2023_API_CODE_1307.equals(inteId)) {
@@ -532,46 +352,21 @@
Map<String, String> map = new HashMap<>();
map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
api1307.setCntxwjl(JSON.toJSONString(map));
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- api1307.setTxwjhzm(null);
- String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
- api1307.setTykqbm(tykqbm);
- String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
- api1307.setTycfbm(tycfbm);
- String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
- api1307.setTyhwbm(tyhwbm);
- }
return api1307;
}
if (NX2023Constant.NX_2023_API_CODE_1308.equals(inteId)) {
Nx2023Api1308 api1308 = new Nx2023Api1308();
BeanUtils.copyProperties(data, api1308);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
- api1308.setTykqbm(tykqbm);
- }
return api1308;
}
if (NX2023Constant.NX_2023_API_CODE_1309.equals(inteId)) {
Nx2023Api1309 api1309 = new Nx2023Api1309();
BeanUtils.copyProperties(data, api1309);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(api1309.getQydm());
- api1309.setWgdwtybm(tydwbm);
- }
return api1309;
}
if (NX2023Constant.NX_2023_API_CODE_1310.equals(inteId)) {
Nx2023Api1310 api1310 = new Nx2023Api1310();
BeanUtils.copyProperties(data, api1310);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
- api1310.setTyhwbm(tyhwbm);
- }
return api1310;
}
if (NX2023Constant.NX_2023_API_CODE_1401.equals(inteId)) {
@@ -587,34 +382,37 @@
if (NX2023Constant.NX_2023_API_CODE_1403.equals(inteId)) {
Nx2023Api1403 api1403 = new Nx2023Api1403();
BeanUtils.copyProperties(data, api1403);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
- api1403.setJhxddwtybm(tydwbm);
- }
return api1403;
}
if (NX2023Constant.NX_2023_API_CODE_1404.equals(inteId)) {
Nx2023Api1404 api1404 = new Nx2023Api1404();
BeanUtils.copyProperties(data, api1404);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
- api1404.setLhhwtybm(tyhwbm);
- }
return api1404;
}
if (NX2023Constant.NX_2023_API_CODE_1405.equals(inteId)) {
Nx2023Api1405 api1405 = new Nx2023Api1405();
BeanUtils.copyProperties(data, api1405);
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- String tydwbm = apiCommonService.getTydwbm(api1405.getXmdm());
- api1405.setTydwbm(tydwbm);
- }
return api1405;
}
return data;
+ }
+
+ /**
+ * 鑾峰彇涓婁紶鐨勬帴鍙g紪鐮�
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ if (NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) {
+ return NX2023Constant.NX_2023_API_CODE_1114;
+ }
+ return inteId;
}
/**
@@ -641,33 +439,22 @@
* @param data
* @return
*/
- private Object getJsonFinanceData(String inteId, Object data, ApiConfs conf) {
+ private Object getJsonFinanceData(String inteId, Object data) {
//璐㈠姟鎶ヨ〃鏁版嵁灏佽
if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) {
- return copyApi1501((Api1501) data, conf);
+ return copyApi1501((Api1501) data);
} else if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
- return copyApi1502((Api1502) data, conf);
+ return copyApi1502((Api1502) data);
} else {
- return copyApi1503((Api1503) data, conf);
+ return copyApi1503((Api1503) data);
}
}
- private List<NxFinanceDto> copyApi1503(Api1503 api1503, ApiConfs conf) {
+ private List<NxFinanceDto> copyApi1503(Api1503 api1503) {
List<NxFinanceDto> list = new ArrayList<>();
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1503.getDwdm());
nxFinanceDto.setKqdm(api1503.getKqdm());
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){
- String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm());
- nxFinanceDto.setTydwbm(tydwbm);
- }
- if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){
- String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm());
- nxFinanceDto.setTykqbm(tykqbm);
- }
- }
nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("03");
@@ -715,22 +502,11 @@
return list;
}
- private List<NxFinanceDto> copyApi1502(Api1502 api1502, ApiConfs conf) {
+ private List<NxFinanceDto> copyApi1502(Api1502 api1502) {
List<NxFinanceDto> list = new ArrayList<>();
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1502.getDwdm());
nxFinanceDto.setKqdm(api1502.getKqdm());
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){
- String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm());
- nxFinanceDto.setTydwbm(tydwbm);
- }
- if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){
- String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm());
- nxFinanceDto.setTykqbm(tykqbm);
- }
- }
nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("02");
nxFinanceDto.setCzbz(api1502.getCzbz());
@@ -779,22 +555,11 @@
return list;
}
- private List<NxFinanceDto> copyApi1501(Api1501 api1501, ApiConfs conf) {
+ private List<NxFinanceDto> copyApi1501(Api1501 api1501) {
List<NxFinanceDto> list = new ArrayList<>();
NxFinanceDto nxFinanceDto = new NxFinanceDto();
nxFinanceDto.setDwdm(api1501.getDwdm());
nxFinanceDto.setKqdm(api1501.getKqdm());
- //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
- if(StringUtils.isEmpty(nxFinanceDto.getTydwbm())){
- String tydwbm = apiCommonService.getTydwbm(nxFinanceDto.getDwdm());
- nxFinanceDto.setTydwbm(tydwbm);
- }
- if(StringUtils.isEmpty(nxFinanceDto.getTykqbm())){
- String tykqbm = apiCommonService.getTykqbm(nxFinanceDto.getKqdm());
- nxFinanceDto.setTykqbm(tykqbm);
- }
- }
nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
nxFinanceDto.setBbm("01");
nxFinanceDto.setCzbz(api1501.getCzbz());
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023HttpClientUtil.java b/src/main/java/com/fzzy/push/nx2023/NX2023HttpClientUtil.java
index 8b9ffc0..99926d3 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023HttpClientUtil.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023HttpClientUtil.java
@@ -1,7 +1,6 @@
package com.fzzy.push.nx2023;
import com.alibaba.fastjson.JSON;
-import com.fzzy.api.entity.ApiConfs;
import com.fzzy.push.nx2023.dto.Nx2023RespDto;
import lombok.extern.slf4j.Slf4j;
import java.io.BufferedReader;
@@ -25,7 +24,7 @@
* @throws Exception
*/
@SuppressWarnings("resource")
- public static Nx2023RespDto postPushData(String url, String reqData , ApiConfs apiConfs) throws Exception {
+ public static Nx2023RespDto postPushData(String url, String reqData) throws Exception {
log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + reqData +"---------");
BufferedReader in = null;
URL urls = new URL(url);
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
index 6613d72..cebe49e 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
@@ -21,9 +21,6 @@
@PropertyDef(label = "鍗曚綅鍚嶇О")
private String dwmc;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
@PropertyDef(label = "鍗曚綅绫诲瀷")
private String dwlx;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
index bd76d8a..e942a45 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
@@ -15,9 +15,6 @@
@PropertyDef(label = "搴撳尯浠g爜")
private String kqdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "鍗曚綅浠g爜")
private String dwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
index 5021733..b13c472 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
@@ -18,9 +18,6 @@
@PropertyDef(label = "浠撴埧浠g爜" )
private String cfdm;
- @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
- private String tycfbm;
-
@PropertyDef(label = "浠撴埧鍚嶇О" )
private String cfmc;
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 ccc5b7d..a5dc4d4 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
@@ -17,9 +17,6 @@
@PropertyDef(label = "寤掗棿浠g爜")
private String ajdh;
- @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
- private String tyajbm;
-
@PropertyDef(label = "寤掗棿鍚嶇О")
private String ajmc;
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 612910c..dd0a20c 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
@@ -17,9 +17,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "璐т綅鍚嶇О" )
private String hwmc;
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 0d9aaff..d915377 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
@@ -17,9 +17,6 @@
@PropertyDef(label = "娌圭綈浠g爜" )
private String ygdm;
- @PropertyDef(label = "缁熶竴娌圭綈缂栫爜" )
- private String tyygbm;
-
@PropertyDef(label = "娌圭綈鍚嶇О" )
private String ygmc;
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 f87311a..210058b 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
@@ -20,9 +20,6 @@
@PropertyDef(label = "搴撳尯浠g爜" )
private String kqdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "鍗曚綅浠g爜" )
private String dwdm;
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 fb5c994..6cdedb9 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
@@ -15,9 +15,6 @@
@PropertyDef(label = "搴撳尯浠g爜")
private String kqdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "鍗曚綅浠g爜")
private String dwdm;
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 b1cf941..8b18f4d 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
@@ -24,9 +24,6 @@
@PropertyDef(label = "搴撳尯浠g爜")
private String kqdm;
-
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
@PropertyDef(label = "鏂囦欢绫诲瀷", description = "1锛氬簱鍖洪笩鐬板浘 2锛氬叆搴撳浘鐗� 3锛氬嚭搴撳浘鐗� 4锛氬叆搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5绉掗挓瑙嗛锛�5锛氬嚭搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5 绉掗挓瑙嗛锛�104锛氱啅钂稿妗堟帴鍙i檮浠�")
private String wjlx;
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 1914f5f..55d854d 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
@@ -17,9 +17,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "鍗曚綅浠g爜" )
private String dwdm;
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 c1b4311..bbcc7a8 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
@@ -24,9 +24,6 @@
@PropertyDef(label = "搴撳尯浠g爜" )
private String kqdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "瑙嗛鐩戞帶璁惧鍚嶇О" )
private String spjksbmc;
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 83817d6..109a140 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
@@ -12,12 +12,6 @@
@Data
public class Nx2023Api1112 implements Serializable {
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "鍗曚綅浠g爜" )
private String dwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java
index 61e036a..5c9e0b5 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java
@@ -16,9 +16,6 @@
@PropertyDef(label = "鍗曚綅浠g爜" )
private String dwdm;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
@PropertyDef(label = "淇$敤绛夌骇" )
private String xydj;
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 3a4bbd5..0d1d694 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
@@ -23,9 +23,6 @@
@PropertyDef(label = "鍗曚綅浠g爜")
private String dwdm;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
@PropertyDef(label = "涓氬姟绫诲埆")
private String ywlx;
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 ccc866a..d4b4ff4 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
@@ -20,9 +20,6 @@
@PropertyDef(label = "璐т綅浠g爜")
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
private String ywlx = "2";
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 eb9f8b0..0acfc06 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
@@ -18,9 +18,6 @@
@PropertyDef(label = "璐т綅浠g爜")
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
private String rkywdh;
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 ce64587..a2ef649 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
@@ -20,9 +20,6 @@
@PropertyDef(label = "璐т綅浠g爜")
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
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 a9b3f9c..6b40ff6 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
@@ -2,10 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.persistence.Id;
import java.io.Serializable;
import java.util.Date;
@@ -13,26 +10,13 @@
* 鎺ュ彛琛�-绮鍑哄簱淇℃伅
*/
@Data
-@EqualsAndHashCode(callSuper = false)
-public class Nx2023Api1205 extends ApiParent implements Serializable {
+public class Nx2023Api1205 implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -6381473449862569451L;
-
-
- //涓氬姟鍗曞彿鐢� 12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟缂栫爜锛�15 浠h〃绮鍑哄簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
- @Id
@PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
private String ckywdh;
@PropertyDef(label = "璐т綅浠g爜")
private String hwdm;
-
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
@PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
private String cktzdh;
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 457cdd1..b760299 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,6 @@
@Data
public class Nx2023Api1206 implements Serializable {
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
@PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿" )
private String ckjsdh;
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 fe86190..655dac4 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
@@ -32,12 +32,6 @@
@PropertyDef(label = "鍊掑叆鍗曚綅" )
private String drdw;
- @PropertyDef(label = "鍊掑嚭搴撳尯缁熶竴缂栫爜")
- private String dckqtybm;
-
- @PropertyDef(label = "鍊掑叆搴撳尯缁熶竴缂栫爜")
- private String drkqtybm;
-
@PropertyDef(label = "绮鍝佺浠g爜" )
private String lspzdm;
@@ -46,12 +40,6 @@
@PropertyDef(label = "鍊掑叆璐т綅浠g爜" )
private String drhwdm;
-
- @PropertyDef(label = "鍊掑嚭璐т綅缁熶竴缂栫爜" )
- private String dchwtybm;
-
- @PropertyDef(label = "鍊掑叆璐т綅缁熶竴缂栫爜" )
- private String drhwtybm;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍊掍粨鏃ユ湡" )
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 13a6430..2f21d38 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
@@ -20,12 +20,6 @@
@PropertyDef(label = "璐т綅浠g爜")
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
- @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
- private String lqgstydwbm;
-
@PropertyDef(label = "绮鍝佺浠g爜")
private String lspzdm;
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 c74b6f1..8c388ec 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
@@ -20,9 +20,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "涓氬姟鏃ユ湡" )
private Date ywrq;
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 cdaad54..0d58568 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
@@ -21,9 +21,6 @@
@PropertyDef(label = "璐т綅浠g爜")
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "绮鏁伴噺(鍏枻)")
private double lssl;
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 0477e4f..c9653a3 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
@@ -16,9 +16,6 @@
@PropertyDef(label = "搴撳尯浠g爜")
private String kqdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "绮鍝佺浠g爜")
private String lspzdm;
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 e085c67..d48c850 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
@@ -17,12 +17,6 @@
@PropertyDef(label = "鍗曚綅浠g爜")
private String dwdm;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "鍗曚綅鍚嶇О")
private String dwmc;
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 a799052..27e9b53 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
@@ -23,12 +23,6 @@
@PropertyDef(label = "鍗曚綅浠g爜" )
private String dwdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
@PropertyDef(label = "搴撳尯鍚嶇О" )
private String kqmc;
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 e521660..d64bd5d 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
@@ -24,9 +24,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "浠撴埧澶栨俯" )
private double cfww;
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 4eec1bb..c9f536f 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
@@ -24,9 +24,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "妫�鏌ュ铏柟娉�" )
private String jchcff;
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 829c1bb..81b94f1 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
@@ -24,9 +24,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "姘ф皵鍚噺鍊奸泦鍚�" )
private String yqhlzjh;
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 f96d1a2..11f932f 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
@@ -18,224 +18,161 @@
* @Date 2024/4/18 16:23
*/
@Data
-@Entity
-@Table(name = "API_1305")
-@EqualsAndHashCode(callSuper=false)
-public class Nx2023Api1305 extends ApiParent implements Serializable {
+public class Nx2023Api1305 implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- @Id
@PropertyDef(label = "閫氶浣滀笟鍗曞彿" )
- @Column(name = "tfzydh", length = 41)
private String tfzydh;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "閫氶鏃ユ湡" )
- @Column(name = "tfrq")
private Date tfrq;
@PropertyDef(label = "浠撴埧浠g爜" )
- @Column(name = "cfdm", length = 25)
private String cfdm;
- @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
- private String tycfbm;
-
@PropertyDef(label = "閫氶鐩殑" )
- @Column(name = "tfmd", length = 128)
private String tfmd;
@PropertyDef(label = "绮爢瀛旈殭搴�" )
- @Column(name = "ldkxd")
private Double ldkxd;
@PropertyDef(label = "閫氶绫诲瀷" )
- @Column(name = "tflx", length = 1)
private String tflx;
@PropertyDef(label = "椋庨亾鍨嬪紡" )
- @Column(name = "fdxs", length = 1)
private String fdxs;
@PropertyDef(label = "椋庣綉璁剧疆鏂瑰紡" )
- @Column(name = "fwszfs", length = 64)
private String fwszfs;
@PropertyDef(label = "涓婚閬撴埅闈㈢Н" )
- @Column(name = "zfdjmj")
private Double zfdjmj;
@PropertyDef(label = "鏀閬撴埅闈㈢Н" )
- @Column(name = "zhfdjmj")
private Double zhfdjmj;
@PropertyDef(label = "鏀閬撴�婚暱搴�" )
- @Column(name = "zfdzcd", precision = 20, scale = 3)
private Double zfdzcd;
@PropertyDef(label = "椋庣綉寮�瀛旂巼" )
- @Column(name = "fwkkl")
private Double fwkkl;
@PropertyDef(label = "绌烘皵閫斿緞姣�" )
- @Column(name = "kqtjb")
private Double kqtjb;
@PropertyDef(label = "閫氶鍙h缃釜鏁�" )
- @Column(name = "tfkszgs")
private Integer tfkszgs;
@PropertyDef(label = "閫氶鏈哄瀷鍙�" )
- @Column(name = "tfjxh", length = 128)
private String tfjxh;
@PropertyDef(label = "閫氶鏈哄彴鏁�" )
- @Column(name = "tfjts")
private Integer tfjts;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇" )
- @Column(name = "dtfjedqy")
private Double dtfjedqy;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺" )
- @Column(name = "dtfjedfl")
private Double dtfjedfl;
@PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼" )
- @Column(name = "dtfjedgl")
private Double dtfjedgl;
@PropertyDef(label = "閫侀鏂瑰紡" )
- @Column(name = "sffs", length = 1)
private String sffs;
@PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺" )
- @Column(name = "dtfjscfl")
private Double dtfjscfl;
@PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�" )
- @Column(name = "dtfjzgl")
private Double dtfjzgl;
@PropertyDef(label = "鎬婚閲�" )
- @Column(name = "zfl")
private Double zfl;
@PropertyDef(label = "鍗曚綅閫氶閲�" )
- @Column(name = "dwtfl")
private Double dwtfl;
@PropertyDef(label = "瀹炴祴绯荤粺闃诲姏" )
- @Column(name = "scxtzl")
private Double scxtzl;
@PropertyDef(label = "鎬昏�楃數閲�" )
- @Column(name = "zhdl")
private Double zhdl;
@PropertyDef(label = "浣滀笟鏃舵皵娓�" )
- @Column(name = "zysqw")
private Double zysqw;
@PropertyDef(label = "浣滀笟鏃舵皵婀�" )
- @Column(name = "zysqs")
private Double zysqs;
@PropertyDef(label = "閫氶鏃堕暱" )
- @Column(name = "tfsc")
private Double tfsc;
@PropertyDef(label = "浣滀笟鍓嶅钩鍧囩伯娓�" )
- @Column(name = "zyqpjlw")
private Double zyqpjlw;
@PropertyDef(label = "缁撴潫鍚庡钩鍧囩伯娓�" )
- @Column(name = "jshpjlw")
private Double jshpjlw;
@PropertyDef(label = "闄嶆俯骞呭害" )
- @Column(name = "jwfd")
private Double jwfd;
@PropertyDef(label = "鍚ㄧ伯闄嶆俯鑳借��" )
- @Column(name = "dljwnh")
private Double dljwnh;
@PropertyDef(label = "澶辨按鐜�" )
- @Column(name = "ssl_")
private Double ssl;
@PropertyDef(label = "淇濇按鏁堟灉璇勪环缁撴灉" )
- @Column(name = "bsxgpjjg", length = 128)
private String bsxgpjjg;
@PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇鏁翠粨" )
- @Column(name = "tfjwjyxpjzc", length = 128)
private String tfjwjyxpjzc;
@PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓婂眰" )
- @Column(name = "tfjwjyxpjsc", length = 128)
private String tfjwjyxpjsc;
@PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓�(闂�)灞�" )
- @Column(name = "tfjwjyxpjzjc", length = 128)
private String tfjwjyxpjzjc;
@PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓嬪眰" )
- @Column(name = "tfjwjyxpjxc", length = 128)
private String tfjwjyxpjxc;
@PropertyDef(label = "浣滀笟鍓嶅钩鍧囨按鍒�" )
- @Column(name = "zyqpjsf")
private Double zyqpjsf;
@PropertyDef(label = "缁撴潫鍚庡钩鍧囨按鍒�" )
- @Column(name = "zyhpjsf")
private Double zyhpjsf;
@PropertyDef(label = "闄嶆按骞呭害" )
- @Column(name = "jsfd")
private Double jsfd;
@PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��" )
- @Column(name = "dljsnh")
private Double dljsnh;
@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨" )
- @Column(name = "tfjsjyxfxzc", length = 128)
private String tfjsjyxfxzc;
@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓婂眰" )
- @Column(name = "tfjsjyxfxsc", length = 128)
private String tfjsjyxfxsc;
@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓�(闂�)灞�" )
- @Column(name = "tfjsjyxfxzjc", length = 128)
private String tfjsjyxfxzjc;
@PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓嬪眰" )
- @Column(name = "tfjsjyxfxxc", length = 128)
private String tfjsjyxfxxc;
@PropertyDef(label = "閫氶浣滀笟璐熻矗浜�" )
- @Column(name = "tfzyfzr", length = 64)
private String tfzyfzr;
@PropertyDef(label = "閫氶浣滀笟浜哄憳" )
- @Column(name = "tfzyry", length = 128)
private String tfzyry;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj")
private Date zhgxsj;
}
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 b1a24ff..c1af926 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
@@ -24,9 +24,6 @@
@PropertyDef(label = "浠撴埧浠g爜" )
private String cfdm;
- @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
- private String tycfbm;
-
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鐔忚捀寮�濮嬫椂闂�" )
private Date xzkssj;
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 3b8e5e3..067ecc2 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
@@ -27,15 +27,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
- @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
- private String tycfbm;
-
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "浠撳唴鍥惧儚鏂囦欢娴�" )
private String cntxwjl;
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 b66c7e9..317ea5b 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
@@ -25,9 +25,6 @@
@PropertyDef(label = "搴撳尯浠g爜" )
private String kqdm;
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
@PropertyDef(label = "搴撳尯鍦板潃" )
private String kqdz;
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 1f3fe31..344dcd2 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
@@ -14,9 +14,6 @@
@Data
public class Nx2023Api1309 implements Serializable {
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String wgdwtybm;
-
@PropertyDef(label = "棰勮淇℃伅浠g爜" )
private String yjxxdm;
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 3c8d8c8..12721ff 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
@@ -20,9 +20,6 @@
@PropertyDef(label = "璐т綅浠g爜" )
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
-
@PropertyDef(label = "绮鍝佺浠g爜" )
private String lspzdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java
index 2ca2fe0..43994a3 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java
@@ -38,9 +38,6 @@
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅" )
private String jhxddw;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String jhxddwtybm;
-
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О" )
private String jhxddwmc;
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 b40d38a..c8b405b 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
@@ -35,9 +35,6 @@
@PropertyDef(label = "杞崲璐т綅浠g爜" )
private String lhhwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String lhhwtybm;
-
@PropertyDef(label = "杞崲鏁伴噺" )
private double lhsl;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java
index a225e13..69ed1d9 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java
@@ -16,9 +16,6 @@
@Data
public class Nx2023Api1405 implements Serializable {
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
@PropertyDef(label = "椤圭洰浠g爜" )
private String xmdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java b/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java
index 08b1e41..136c543 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/NxFinanceDto.java
@@ -11,14 +11,8 @@
@PropertyDef(label = "鍗曚綅浠g爜")
private String dwdm;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
@PropertyDef(label = "搴撳尯浠g爜")
private String kqdm;
-
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
@PropertyDef(label = "鎶ヨ〃鏈熷彿")
private String bbsj;
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java
new file mode 100644
index 0000000..65af5d3
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java
@@ -0,0 +1,984 @@
+package com.fzzy.push.nx2024;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.*;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.*;
+import com.fzzy.push.nx2024.dto.*;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+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.*;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-涓婁紶鏁版嵁鏈嶅姟绫�
+ * @Author CZT
+ * @Date 2024/7/25 16:30
+ */
+@Slf4j
+@Data
+@Service
+public class NX2024ApiRemoteService implements ApiRemoteService {
+
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1104Rep api1104Rep;
+ @Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
+ private Api1109Rep api1109Rep;
+ @Autowired
+ private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1205Rep api1205Rep;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_NX_2024.getCode();
+ }
+
+ @Override
+ public ResponseDto pushData(ApiParam param, Object data) {
+ return pushData(param, null, data);
+ }
+
+ @Override
+ public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
+ String kqdm = param.getKqdm();
+
+ try {
+ if (null == conf) {
+ conf = apiCommonService.getConf(kqdm);
+ }
+
+ //娣诲姞鏃ュ織
+ ApiLog apiLog = new ApiLog();
+ apiLog.setId(ContextUtil.getUUID());
+
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = getInteId(param.getInteId());
+ apiLog.setInteId(inteId);
+
+ if (StringUtils.isEmpty(inteId)) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ //inteId:杞崲鍓嶇殑鎺ュ彛缂栫爜
+ String jsonData = getJsonData(inteId, param.getInteId(), data);
+ log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
+ apiLog.setData(jsonData);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+
+ if (conf == null) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ //灏佽鎺ㄩ�佹暟鎹�
+ Nx2024ReqDto reqData = new Nx2024ReqDto();
+ reqData.setId(ContextUtil.getUUID());
+ //鑾峰彇韬唤ID锛屽嵆绮簱鐨勭粍缁囦唬鐮�
+ reqData.setUid(conf.getUserName());
+ //鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ String orderId = (String) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderId)) {
+ orderId = reqData.getId();
+ }
+ reqData.setOrderid(orderId);
+
+ //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(搴撳尯缂栫爜_褰撳ぉ鏃ユ湡)
+ reqData.setAccess_token(NxRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
+ reqData.setDatalength(1);
+
+ //浣跨敤鐪佸钩鍙扮殑RSA鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
+ reqData.setData(NxRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
+ //鎽樿锛屾暟鎹富浣撶殑MD5鍊�
+ reqData.setDigst(MyMD5Util.encrypt(jsonData));
+ log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
+ Nx2024RespDto responseDto = NX2024HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData));
+
+ apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ apiLog.setResult(responseDto.getResult());
+ apiLogRep.save(apiLog);
+ ResponseDto resd = new ResponseDto();
+ resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ resd.setMsg(responseDto.getResult());
+
+ return resd;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return new ResponseDto(99, e.getMessage());
+ }
+ }
+
+ /**
+ * 杞负JSON
+ *
+ * @param inteId 绯荤粺鍐呮帴鍙g紪鐮侊紝闈炶浆鍖栧悗鐨勬帴鍙g紪鐮�
+ * @param data
+ * @return
+ */
+ /**
+ * 杞负JSON
+ * 绯荤粺鍐呮帴鍙g紪鐮侊紝闈炶浆鍖栧悗鐨勬帴鍙g紪鐮�
+ *
+ * @param inteId 杞崲鍚庢帴鍙g紪鐮�
+ * @param cwinteId 璐㈠姟鎺ュ彛缂栫爜
+ * @param data
+ * @return
+ */
+ private String getJsonData(String inteId, String cwinteId, Object data) {
+ if (NX2024Constant.NX_2024_API_CODE_2441.equals(inteId)) {
+ Object object = getJsonFinanceData(cwinteId, data);
+ return JSON.toJSONString(object);
+ } else {
+ List<Object> list = new ArrayList<>();
+ Object object = getJsonApiData(inteId, data);
+
+ //闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
+ if (!NX2024Constant.NX_2024_API_CODE_2421.equals(inteId)) {
+ setZhgxsjValue(data);
+ }
+
+ list.add(object);
+ return JSON.toJSONString(list);
+ }
+
+ }
+
+ /**
+ * 甯歌鎺ュ彛灏佽
+ *
+ * @param inteId
+ * @param data
+ * @return
+ */
+ private Object getJsonApiData(String inteId, Object data) {
+ if (NX2024Constant.NX_2024_API_CODE_2401.equals(inteId)) {
+ Nx2024Api2401 apiData = new Nx2024Api2401();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2402.equals(inteId)) {
+ Nx2024Api2402 apiData = new Nx2024Api2402();
+ BeanUtils.copyProperties(data, apiData);
+ apiData.setLkxz("1");
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2403.equals(inteId)) {
+ Nx2024Api2403 apiData = new Nx2024Api2403();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2404.equals(inteId)) {
+ Nx2024Api2404 apiData = new Nx2024Api2404();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2405.equals(inteId)) {
+ Nx2024Api2405 apiData = new Nx2024Api2405();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2406.equals(inteId)) {
+ Nx2024Api2406 apiData = new Nx2024Api2406();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2407.equals(inteId)) {
+ Nx2024Api2407 apiData = new Nx2024Api2407();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2408.equals(inteId)) {
+ Nx2024Api2408 apiData = new Nx2024Api2408();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2409.equals(inteId)) {
+ Api1109 api1109 = (Api1109) data;
+ Nx2024Api2409 apiData = new Nx2024Api2409();
+ BeanUtils.copyProperties(api1109, apiData);
+
+ Map<String, String> map = new HashMap<>();
+ map.put(api1109.getWjmc(), FileUtils.fileToByteString(api1109.getWjdz()));
+ apiData.setWjl(JSON.toJSONString(map));
+
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2410.equals(inteId)) {
+ Nx2024Api2410 apiData = new Nx2024Api2410();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2411.equals(inteId)) {
+ Nx2024Api2411 apiData = new Nx2024Api2411();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ Api1102 api1102List = api1102Rep.findDataByKqdm(apiData.getKqdm());
+ apiData.setTykqbm(api1102List.getTykqbm());
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2412.equals(inteId)) {
+ Api1112 api1112 = (Api1112) data;
+ Nx2024Api2412 apiData = new Nx2024Api2412();
+ BeanUtils.copyProperties(api1112, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2413.equals(inteId)) {
+ Nx2024Api2413 apiData = new Nx2024Api2413();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2414.equals(inteId)) {
+ Api1201 api1201 = (Api1201) data;
+ Nx2024Api2414 apiData = new Nx2024Api2414();
+ BeanUtils.copyProperties(api1201, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2415.equals(inteId)) {
+ Nx2024Api2415 apiData = new Nx2024Api2415();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2416.equals(inteId)) {
+ Nx2024Api2416 apiData = new Nx2024Api2416();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2417.equals(inteId)) {
+ Nx2024Api2417 apiData = new Nx2024Api2417();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2418.equals(inteId)) {
+ Nx2024Api2418 apiData = new Nx2024Api2418();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2419.equals(inteId)) {
+ Api1206 api1206 = (Api1206) data;
+ Nx2024Api2419 apiData = new Nx2024Api2419();
+ BeanUtils.copyProperties(api1206, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1206.getKqdm().substring(0, 18));
+ apiData.setTydwbm(tydwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2420.equals(inteId)) {
+ Nx2024Api2420 apiData = new Nx2024Api2420();
+ BeanUtils.copyProperties(data, apiData);
+
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getDckqtybm())) {
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
+ apiData.setDckqtybm(dckqtybm);
+ }
+ if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
+ apiData.setDrkqtybm(drkqtybm);
+ }
+ if (StringUtils.isEmpty(apiData.getDchwtybm())) {
+ String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
+ apiData.setDchwtybm(dchwtybm);
+ }
+ if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
+ String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+ apiData.setDrhwtybm(drhwtybm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2421.equals(inteId)) {
+ Nx2024Api2421 apiData = new Nx2024Api2421();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String lqgstydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
+ apiData.setLqgstydwbm(lqgstydwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2422.equals(inteId)) {
+ Nx2024Api2422 apiData = new Nx2024Api2422();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2423.equals(inteId)) {
+ Nx2024Api2423 apiData = new Nx2024Api2423();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2424.equals(inteId)) {
+ Nx2024Api2424 apiData = new Nx2024Api2424();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2425.equals(inteId)) {
+ Nx2024Api2425 apiData = new Nx2024Api2425();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2426.equals(inteId)) {
+ Nx2024Api2426 apiData = new Nx2024Api2426();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2427.equals(inteId)) {
+ Nx2024Api2427 apiData = new Nx2024Api2427();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2428.equals(inteId)) {
+ Nx2024Api2428 apiData = new Nx2024Api2428();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2429.equals(inteId)) {
+ Nx2024Api2429 apiData = new Nx2024Api2429();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2430.equals(inteId)) {
+ Nx2024Api2430 apiData = new Nx2024Api2430();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2431.equals(inteId)) {
+ Nx2024Api2431 apiData = new Nx2024Api2431();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2432.equals(inteId)) {
+ Api1307 api1307 = (Api1307) data;
+ Nx2024Api2432 apiData = new Nx2024Api2432();
+ BeanUtils.copyProperties(api1307, apiData);
+
+ Map<String, String> map = new HashMap<>();
+ map.put(api1307.getId() + "." + api1307.getTxwjhzm(), FileUtils.fileToByteString(api1307.getWjdz()));
+ apiData.setCntxwjl(JSON.toJSONString(map));
+
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2433.equals(inteId)) {
+ Nx2024Api2433 apiData = new Nx2024Api2433();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2434.equals(inteId)) {
+ Nx2024Api2434 apiData = new Nx2024Api2434();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
+ apiData.setWgdwtybm(tydwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2435.equals(inteId)) {
+ Nx2024Api2435 apiData = new Nx2024Api2435();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2436.equals(inteId)) {
+ Nx2024Api2436 apiData = new Nx2024Api2436();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getCcqytydm())) {
+ String tydwdm = apiCommonService.getTydwbm(apiData.getCcqy());
+ apiData.setCcqytydm(tydwdm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2437.equals(inteId)) {
+ Nx2024Api2437 apiData = new Nx2024Api2437();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2438.equals(inteId)) {
+ Nx2024Api2438 apiData = new Nx2024Api2438();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getJhxddwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getJhxddw());
+ apiData.setJhxddwtybm(tydwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2439.equals(inteId)) {
+ Nx2024Api2439 apiData = new Nx2024Api2439();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(apiData.getLhhwtybm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getLhhwdm());
+ apiData.setLhhwtybm(tyhwbm);
+ }
+ return apiData;
+ }
+ if (NX2024Constant.NX_2024_API_CODE_2440.equals(inteId)) {
+ Nx2024Api2440 apiData = new Nx2024Api2440();
+ BeanUtils.copyProperties(data, apiData);
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isNotEmpty(apiData.getXmdmtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getXmdm());
+ apiData.setXmdmtybm(tydwbm);
+ }
+ return apiData;
+ }
+ return data;
+ }
+
+ /**
+ * 鑾峰彇涓婁紶鐨勬帴鍙g紪鐮�
+ *
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ switch (inteId) {
+ case "1101":
+ return NX2024Constant.NX_2024_API_CODE_2401;
+ case "1102":
+ return NX2024Constant.NX_2024_API_CODE_2402;
+ case "1103":
+ return NX2024Constant.NX_2024_API_CODE_2403;
+ case "1104":
+ return NX2024Constant.NX_2024_API_CODE_2404;
+ case "1105":
+ return NX2024Constant.NX_2024_API_CODE_2405;
+ case "1106":
+ return NX2024Constant.NX_2024_API_CODE_2406;
+ case "1107":
+ return NX2024Constant.NX_2024_API_CODE_2407;
+ case "1108":
+ return NX2024Constant.NX_2024_API_CODE_2408;
+ case "1109":
+ return NX2024Constant.NX_2024_API_CODE_2409;
+ case "1110":
+ return NX2024Constant.NX_2024_API_CODE_2410;
+ case "1111":
+ return NX2024Constant.NX_2024_API_CODE_2411;
+ case "1112":
+ return NX2024Constant.NX_2024_API_CODE_2412;
+ case "1113":
+ return NX2024Constant.NX_2024_API_CODE_2413;
+ case "1201":
+ return NX2024Constant.NX_2024_API_CODE_2414;
+ case "1202":
+ return NX2024Constant.NX_2024_API_CODE_2415;
+ case "1203":
+ return NX2024Constant.NX_2024_API_CODE_2416;
+ case "1204":
+ return NX2024Constant.NX_2024_API_CODE_2417;
+ case "1205":
+ return NX2024Constant.NX_2024_API_CODE_2418;
+ case "1206":
+ return NX2024Constant.NX_2024_API_CODE_2419;
+ case "1207":
+ return NX2024Constant.NX_2024_API_CODE_2420;
+ case "1208":
+ return NX2024Constant.NX_2024_API_CODE_2421;
+ case "1209":
+ return NX2024Constant.NX_2024_API_CODE_2422;
+ case "1210":
+ return NX2024Constant.NX_2024_API_CODE_2423;
+ case "2424":
+ return NX2024Constant.NX_2024_API_CODE_2424;
+ case "1212":
+ return NX2024Constant.NX_2024_API_CODE_2425;
+ case "1301":
+ return NX2024Constant.NX_2024_API_CODE_2426;
+ case "1302":
+ return NX2024Constant.NX_2024_API_CODE_2427;
+ case "1303":
+ return NX2024Constant.NX_2024_API_CODE_2428;
+ case "1304":
+ return NX2024Constant.NX_2024_API_CODE_2429;
+ case "1305":
+ return NX2024Constant.NX_2024_API_CODE_2430;
+ case "1306":
+ return NX2024Constant.NX_2024_API_CODE_2431;
+ case "1307":
+ return NX2024Constant.NX_2024_API_CODE_2432;
+ case "1308":
+ return NX2024Constant.NX_2024_API_CODE_2433;
+ case "1309":
+ return NX2024Constant.NX_2024_API_CODE_2434;
+ case "1310":
+ return NX2024Constant.NX_2024_API_CODE_2435;
+ case "1401":
+ return NX2024Constant.NX_2024_API_CODE_2436;
+ case "1402":
+ return NX2024Constant.NX_2024_API_CODE_2437;
+ case "1403":
+ return NX2024Constant.NX_2024_API_CODE_2438;
+ case "1404":
+ return NX2024Constant.NX_2024_API_CODE_2439;
+ case "1405":
+ return NX2024Constant.NX_2024_API_CODE_2440;
+ case "1501":
+ return NX2024Constant.NX_2024_API_CODE_2441;
+ case "1502":
+ return NX2024Constant.NX_2024_API_CODE_2441;
+ case "1503":
+ return NX2024Constant.NX_2024_API_CODE_2441;
+ default:
+ return inteId;
+ }
+ }
+
+ /**
+ * 璧嬪�兼渶鍚庢洿鏂版椂闂�
+ *
+ * @param object
+ * @return
+ */
+ private Object setZhgxsjValue(Object object) {
+ // 浣跨敤鍙嶅皠鑾峰彇灞炴�у垪琛� vo涓哄疄浣撳璞″悕
+ try {
+ Field zhgxsj = object.getClass().getDeclaredField("zhgxsj");
+ zhgxsj.setAccessible(true);
+ zhgxsj.set(object, DateUtils.addSeconds(new Date(), -10));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return object;
+ }
+
+ /**
+ * 鑾峰彇璐㈠姟鏁版嵁json
+ *
+ * @param inteId
+ * @param data
+ * @return
+ */
+ private Object getJsonFinanceData(String inteId, Object data) {
+ //璐㈠姟鎶ヨ〃鏁版嵁灏佽
+ if (NX2024Constant.NX_2024_API_CODE_2441_1501.equals(inteId)) {
+ return copyApi1501((Api1501) data);
+ } else if (NX2024Constant.NX_2024_API_CODE_2441_1502.equals(inteId)) {
+ return copyApi1502((Api1502) data);
+ } else {
+ return copyApi1503((Api1503) data);
+ }
+ }
+
+ private List<Nx2024Api2441> copyApi1503(Api1503 api1503) {
+ List<Nx2024Api2441> list = new ArrayList<>();
+ Nx2024Api2441 api2441 = new Nx2024Api2441();
+ api2441.setDwdm(api1503.getDwdm());
+ api2441.setKqdm(api1503.getKqdm());
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api2441.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api2441.getDwdm());
+ api2441.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(api2441.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api2441.getKqdm());
+ api2441.setTykqbm(tykqbm);
+ }
+
+
+ api2441.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
+ api2441.setBbm("03");
+ api2441.setCzbz(api1503.getCzbz());
+ api2441.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
+
+ paddingData(api2441, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+ paddingData(api2441, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+ paddingData(api2441, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+ paddingData(api2441, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+ paddingData(api2441, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+ paddingData(api2441, list, "5", "绠$悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+ paddingData(api2441, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+ paddingData(api2441, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+ paddingData(api2441, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+ paddingData(api2441, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+ paddingData(api2441, list, "10", "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
+ paddingData(api2441, list, "11", "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
+ paddingData(api2441, list, "12", "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
+ paddingData(api2441, list, "13", "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
+ paddingData(api2441, list, "14", "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
+ paddingData(api2441, list, "15", "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
+ paddingData(api2441, list, "16", "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
+ paddingData(api2441, list, "17", "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
+ paddingData(api2441, list, "18", "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
+ paddingData(api2441, list, "19", "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
+ paddingData(api2441, list, "20", "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
+ paddingData(api2441, list, "21", "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
+ paddingData(api2441, list, "22", "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
+ paddingData(api2441, list, "23", "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
+ paddingData(api2441, list, "24", "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
+ paddingData(api2441, list, "25", "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
+ paddingData(api2441, list, "26", "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
+ paddingData(api2441, list, "27", "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
+ paddingData(api2441, list, "28", "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
+ paddingData(api2441, list, "29", "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(api2441, list, "30", "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(api2441, list, "31", "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
+ paddingData(api2441, list, "32", "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
+ paddingData(api2441, list, "33", "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
+ paddingData(api2441, list, "34", "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
+ paddingData(api2441, list, "35", "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
+ paddingData(api2441, list, "36", "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
+
+ return list;
+ }
+
+ private List<Nx2024Api2441> copyApi1502(Api1502 api1502) {
+ List<Nx2024Api2441> list = new ArrayList<>();
+ Nx2024Api2441 api2441 = new Nx2024Api2441();
+ api2441.setDwdm(api1502.getDwdm());
+ api2441.setKqdm(api1502.getKqdm());
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api2441.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api2441.getDwdm());
+ api2441.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(api2441.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api2441.getKqdm());
+ api2441.setTykqbm(tykqbm);
+ }
+
+ api2441.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
+ api2441.setBbm("02");
+ api2441.setCzbz(api1502.getCzbz());
+ api2441.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
+
+ paddingData(api2441, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+ paddingData(api2441, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+ paddingData(api2441, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+ paddingData(api2441, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+ paddingData(api2441, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+ paddingData(api2441, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+ paddingData(api2441, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+ paddingData(api2441, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+ paddingData(api2441, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+ paddingData(api2441, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+ paddingData(api2441, list, "10", "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
+ paddingData(api2441, list, "11", "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
+ paddingData(api2441, list, "12", "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
+ paddingData(api2441, list, "13", "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
+ paddingData(api2441, list, "14", "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
+ paddingData(api2441, list, "15", "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
+ paddingData(api2441, list, "16", "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
+ paddingData(api2441, list, "17", "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(api2441, list, "18", "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
+ paddingData(api2441, list, "19", "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
+ paddingData(api2441, list, "20", "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
+ paddingData(api2441, list, "21", "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
+ paddingData(api2441, list, "22", "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
+ paddingData(api2441, list, "23", "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
+ paddingData(api2441, list, "24", "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
+ paddingData(api2441, list, "25", "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
+ paddingData(api2441, list, "26", "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
+ paddingData(api2441, list, "27", "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
+ paddingData(api2441, list, "28", "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(api2441, list, "29", "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
+ paddingData(api2441, list, "30", "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
+ paddingData(api2441, list, "31", "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
+ paddingData(api2441, list, "32", "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
+ paddingData(api2441, list, "33", "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
+ paddingData(api2441, list, "34", "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
+ paddingData(api2441, list, "35", "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
+ paddingData(api2441, list, "36", "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
+ paddingData(api2441, list, "37", "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
+ paddingData(api2441, list, "38", "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
+
+ return list;
+ }
+
+ private List<Nx2024Api2441> copyApi1501(Api1501 api1501) {
+ List<Nx2024Api2441> list = new ArrayList<>();
+ Nx2024Api2441 api2441 = new Nx2024Api2441();
+ api2441.setDwdm(api1501.getDwdm());
+ api2441.setKqdm(api1501.getKqdm());
+ //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api2441.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api2441.getDwdm());
+ api2441.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(api2441.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api2441.getKqdm());
+ api2441.setTykqbm(tykqbm);
+ }
+
+ api2441.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
+ api2441.setBbm("01");
+ api2441.setCzbz(api1501.getCzbz());
+ api2441.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
+
+ paddingData(api2441, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(api2441, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(api2441, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+ paddingData(api2441, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+ paddingData(api2441, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+ paddingData(api2441, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+ paddingData(api2441, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+ paddingData(api2441, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+ paddingData(api2441, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+ paddingData(api2441, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+ paddingData(api2441, list, "10", "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
+ paddingData(api2441, list, "11", "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
+ paddingData(api2441, list, "12", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
+ paddingData(api2441, list, "13", "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
+ paddingData(api2441, list, "14", "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(api2441, list, "15", "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(api2441, list, "16", "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
+ paddingData(api2441, list, "17", "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
+ paddingData(api2441, list, "18", "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
+ paddingData(api2441, list, "19", "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
+ paddingData(api2441, list, "20", "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
+ paddingData(api2441, list, "21", "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
+ paddingData(api2441, list, "22", "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
+ paddingData(api2441, list, "23", "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
+ paddingData(api2441, list, "24", "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
+ paddingData(api2441, list, "25", "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
+ paddingData(api2441, list, "26", "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
+ paddingData(api2441, list, "27", "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
+ paddingData(api2441, list, "28", "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
+ paddingData(api2441, list, "29", "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
+ paddingData(api2441, list, "30", "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
+ paddingData(api2441, list, "31", "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
+ paddingData(api2441, list, "32", "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
+ paddingData(api2441, list, "33", "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(api2441, list, "34", "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
+ paddingData(api2441, list, "35", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(api2441, list, "36", "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(api2441, list, "37", "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(api2441, list, "38", "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
+ paddingData(api2441, list, "39", "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
+ paddingData(api2441, list, "40", "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
+ paddingData(api2441, list, "41", "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(api2441, list, "42", "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(api2441, list, "43", "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
+ paddingData(api2441, list, "44", "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
+ paddingData(api2441, list, "45", "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(api2441, list, "46", "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
+ paddingData(api2441, list, "47", "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
+ paddingData(api2441, list, "48", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
+ paddingData(api2441, list, "49", "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
+ paddingData(api2441, list, "50", "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(api2441, list, "51", "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(api2441, list, "52", "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
+ paddingData(api2441, list, "53", "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
+ paddingData(api2441, list, "54", "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
+ paddingData(api2441, list, "55", "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
+ paddingData(api2441, list, "56", "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
+ paddingData(api2441, list, "57", "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(api2441, list, "58", "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
+ paddingData(api2441, list, "59", "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
+ paddingData(api2441, list, "60", "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
+ paddingData(api2441, list, "61", "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(api2441, list, "62", "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
+ paddingData(api2441, list, "63", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(api2441, list, "64", "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
+ paddingData(api2441, list, "65", "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
+ paddingData(api2441, list, "66", "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
+ paddingData(api2441, list, "67", "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
+ paddingData(api2441, list, "68", "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
+ paddingData(api2441, list, "69", "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
+ paddingData(api2441, list, "70", "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
+ paddingData(api2441, list, "71", "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
+ paddingData(api2441, list, "72", "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
+ paddingData(api2441, list, "73", "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
+ paddingData(api2441, list, "74", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(api2441, list, "75", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
+ return list;
+ }
+
+ private void paddingData(Nx2024Api2441 common, List<Nx2024Api2441> list, String zbxh, String zbmc, String zbz1, String zbz2) {
+ Nx2024Api2441 api2441 = new Nx2024Api2441();
+ BeanUtils.copyProperties(common, api2441);
+ api2441.setZbxh(zbxh);
+ api2441.setZbmc(zbmc);
+ api2441.setZbz1(zbz1);
+ api2441.setZbz2(zbz2);
+ list.add(api2441);
+ }
+
+ @Override
+ public ResponseDto pullData(ApiParam param, ApiConfs conf) {
+ //璇ュ崗璁棤姝ゅ疄鐜�
+ return null;
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024Constant.java b/src/main/java/com/fzzy/push/nx2024/NX2024Constant.java
new file mode 100644
index 0000000..e3c27e8
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024Constant.java
@@ -0,0 +1,180 @@
+package com.fzzy.push.nx2024;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-鎺ュ彛缂栫爜甯搁噺
+ * @Author CZT
+ * @Date 2024/7/25 15:22
+ */
+public class NX2024Constant {
+
+ /**
+ * 鎺ュ彛缂栫爜-2401 鍗曚綅淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2401 = "2401";
+ /**
+ * 鎺ュ彛缂栫爜-2402 搴撳尯淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2402 = "2402";
+ /**
+ * 鎺ュ彛缂栫爜-2403 浠撴埧淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2403 = "2403";
+ /**
+ * 鎺ュ彛缂栫爜-2404 寤掗棿淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2404 = "2404";
+ /**
+ * 鎺ュ彛缂栫爜-2405 璐т綅淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2405 = "2405";
+ /**
+ * 鎺ュ彛缂栫爜-2406 娌圭綈淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2406 = "2406";
+ /**
+ * 鎺ュ彛缂栫爜-2407 璁惧淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2407 = "2407";
+ /**
+ * 鎺ュ彛缂栫爜-2408 鑽墏淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2408 = "2408";
+ /**
+ * 鎺ュ彛缂栫爜-2409 鏂囦欢淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2409 = "2409";
+ /**
+ * 鎺ュ彛缂栫爜-2410 搴撳尯鍥句粨鎴跨偣浣嶆爣娉ㄦ暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2410 = "2410";
+ /**
+ * 鎺ュ彛缂栫爜-2411 搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉ㄦ暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2411 = "2411";
+ /**
+ * 鎺ュ彛缂栫爜-2412 浜哄憳淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2412 = "2412";
+ /**
+ * 鎺ュ彛缂栫爜-2413 浼佷笟淇$敤淇℃伅
+ */
+ public static String NX_2024_API_CODE_2413 = "2413";
+ /**
+ * 鎺ュ彛缂栫爜-2414 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2414 = "2414";
+ /**
+ * 鎺ュ彛缂栫爜-2415 绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2415 = "2415";
+ /**
+ * 鎺ュ彛缂栫爜-2416 绮鍏ュ簱妫�楠屼俊鎭暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2416 = "2416";
+ /**
+ * 鎺ュ彛缂栫爜-2417 绮鍏ュ簱缁撶畻淇℃伅鏁版嵁鍙�
+ */
+ public static String NX_2024_API_CODE_2417 = "2417";
+ /**
+ * 鎺ュ彛缂栫爜-2418 绮鍑哄簱淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2418 = "2418";
+ /**
+ * 鎺ュ彛缂栫爜-2419 绮鍑哄簱缁撶畻淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2419 = "2419";
+ /**
+ * 鎺ュ彛缂栫爜-2420 鍊掍粨鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2420 = "2420";
+ /**
+ * 鎺ュ彛缂栫爜-2421 绮搴撳瓨鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2421 = "2421";
+ /**
+ * 鎺ュ彛缂栫爜-2422 鎹熸孩鍗曟暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2422 = "2422";
+ /**
+ * 鎺ュ彛缂栫爜-2423 绮鎬ц川杞彉鍗曟暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2423 = "2423";
+ /**
+ * 鎺ュ彛缂栫爜-2424 璐﹂潰搴撳瓨鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2424 = "2424";
+ /**
+ * 鎺ュ彛缂栫爜-2425 瀹㈡埛淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2425 = "2425";
+
+ /**
+ * 鎺ュ彛缂栫爜-2426 瀹夊叏绠$悊鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2426 = "2426";
+ /**
+ * 鎺ュ彛缂栫爜-2427 娓╂箍搴︽娴嬫暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2427 = "2427";
+ /**
+ * 鎺ュ彛缂栫爜-2428 瀹宠櫕妫�娴嬫暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2428 = "2428";
+ /**
+ * 鎺ュ彛缂栫爜-2429 姘斾綋妫�娴嬫暟鎹帴鍙�
+ */
+ public static String NX_2024_API_CODE_2429 = "2429";
+ /**
+ * 鎺ュ彛缂栫爜-2430 閫氶浣滀笟鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2430 = "2430";
+ /**
+ * 鎺ュ彛缂栫爜-2431 鐔忚捀浣滀笟鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2431 = "2431";
+ /**
+ * 鎺ュ彛缂栫爜-2432 浠撳唴瑙嗛鍥惧儚鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2432 = "2432";
+ /**
+ * 鎺ュ彛缂栫爜-2433 瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅鍩烘湰淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2433 = "2433";
+ /**
+ * 鎺ュ彛缂栫爜-2434 杩濊棰勮淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2434 = "2434";
+ /**
+ * 鎺ュ彛缂栫爜-2435 璐ㄦ鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2435 = "2435";
+ /**
+ * 鎺ュ彛缂栫爜-2436 鍌ㄥ瑙勬ā
+ */
+ public static String NX_2024_API_CODE_2436 = "2436";
+ /**
+ * 鎺ュ彛缂栫爜-2437 鍌ㄥ璁″垝
+ */
+ public static String NX_2024_API_CODE_2437 = "2437";
+ /**
+ * 鎺ュ彛缂栫爜-2438 杞崲璁″垝淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2438 = "2438";
+ /**
+ * 鎺ュ彛缂栫爜-2439 杞崲璁″垝鏄庣粏淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2439 = "2439";
+ /**
+ * 鎺ュ彛缂栫爜-2440 椤圭洰淇℃伅
+ */
+ public static String NX_2024_API_CODE_2440 = "2440";
+
+ /**
+ * 鎺ュ彛缂栫爜-2441 璐㈠姟鎶ヨ〃鏁版嵁鎺ュ彛
+ */
+ public static String NX_2024_API_CODE_2441 = "2441";
+ public static String NX_2024_API_CODE_2441_1501 = "1501";
+ public static String NX_2024_API_CODE_2441_1502 = "1502";
+ public static String NX_2024_API_CODE_2441_1503 = "1503";
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024HttpClientUtil.java b/src/main/java/com/fzzy/push/nx2024/NX2024HttpClientUtil.java
new file mode 100644
index 0000000..1e3e3fd
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024HttpClientUtil.java
@@ -0,0 +1,88 @@
+package com.fzzy.push.nx2024;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.push.nx2024.dto.Nx2024RespDto;
+import lombok.extern.slf4j.Slf4j;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-涓婁紶鏁版嵁鏈嶅姟绫�
+ * @Author CZT
+ * @Date 2024/7/25 15:24
+ */
+@Slf4j
+public class NX2024HttpClientUtil {
+
+ /**
+ * post formData
+ * @param url
+ * @return
+ * @throws Exception
+ */
+ @SuppressWarnings("resource")
+ public static Nx2024RespDto postPushData(String url, String reqData) throws Exception {
+ log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + reqData +"---------");
+ BufferedReader in = null;
+ URL urls = new URL(url);
+ HttpURLConnection connection = null;
+ OutputStream outputStream = null;
+ String rs = "";
+ Nx2024RespDto responseDto;
+ try {
+
+ connection = (HttpURLConnection) urls.openConnection();
+ connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ connection.setRequestProperty("Accept-Language", "zh-CN,zh;q=0.8");
+ connection.setRequestProperty("Accept", "*/*");
+ connection.setRequestProperty("Range", "bytes=" + "");
+ connection.setConnectTimeout(20000);
+ connection.setReadTimeout(30000);
+ connection.setRequestMethod("POST");
+
+ outputStream = connection.getOutputStream();
+
+ outputStream.write(reqData.getBytes("UTF-8"));
+ try {
+ connection.connect();
+ if (connection.getResponseCode() == 200) {
+ in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+ String line = "";
+ while ((line = in.readLine()) != null) {
+ rs += line;
+ }
+ }else{
+ log.error("http鐘舵�侊細" + connection.getResponseCode());
+ log.error("http娑堟伅锛�" + connection.getResponseMessage());
+ }
+
+ } catch (Exception e) {
+ System.out.println("鍙戠敓寮傚父");
+ log.error(e.getMessage(),e);
+ rs = null;
+ return new Nx2024RespDto(99,e.getMessage());
+ }
+ log.info("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
+ responseDto = JSON.parseObject(rs,Nx2024RespDto.class);
+ if(responseDto == null ) return new Nx2024RespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
+ return responseDto;
+ } finally {
+ try {
+ outputStream.close();
+ if (in != null){
+ in.close();
+ }
+ } catch (Exception e) {
+ }
+ outputStream = null;
+ if (connection != null)
+ connection.disconnect();
+ connection = null;
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java b/src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java
new file mode 100644
index 0000000..b26d701
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java
@@ -0,0 +1,212 @@
+package com.fzzy.push.nx2024;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.utils.RedisConst;
+import com.fzzy.api.utils.RedisUtil;
+import com.fzzy.order.common.OrderCommonService;
+import com.fzzy.order.common.data.OrderCommonConstant;
+import com.fzzy.order.common.data.OrderCommonData;
+import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.impl.ComPushService12;
+import com.fzzy.push.impl.ComPushService13;
+import com.fzzy.push.impl.ComPushService14;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.text.ParseException;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-鎸囦护瑙f瀽
+ * @Author CZT
+ * @Date 2024/7/25 15:30
+ */
+@Slf4j
+@Service
+public class NX2024OrderServiceImpl implements OrderCommonService {
+
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private NX2024ApiRemoteService apiRemoteService;
+ @Autowired
+ private ComPushService11 pushService11;
+ @Autowired
+ private ComPushService12 pushService12;
+ @Autowired
+ private ComPushService13 pushService13;
+ @Autowired
+ private ComPushService14 pushService14;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_NX_2024.getCode();
+ }
+
+ @Override
+ public void execute(OrderCommonData req, String orderType, ApiConfs conf, String orderid) throws ParseException {
+
+ // 鑻ユ寚浠ょ被鍨嬩笉涓�1锛屽垯杩斿洖
+ if(!OrderCommonConstant.ORDER_TYPE_1.equals(orderType)){
+ log.error("鎸囦护绫诲瀷涓嶄负1锛屼笉杩涜鏁版嵁涓婃姤={}", req);
+ return;
+ }
+ String ids = req.getContent();
+ if(StringUtils.isEmpty(ids)){
+ log.error("鎸囦护鎺ュ彛涓虹┖锛屼笉杩涜鏁版嵁涓婃姤={}", req);
+ return;
+ }
+
+ //鎸囦护瀛樺叆缂撳瓨锛屾椂鏁�24灏忔椂
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ redisUtil.set(key, req.getOrderid(), 59 * 60 * 24);
+
+ ApiParam param = new ApiParam();
+ param.setPushProtocol(conf.getPushProtocol());
+ param.setKqdm(conf.getKqdm());
+ param.setStart(DateUtils.parseDate(req.getStarttime(), new String[]{"yyyy-MM-dd HH:mm:ss"}));
+ param.setEnd(DateUtils.parseDate(req.getEndtime(), new String[]{"yyyy-MM-dd HH:mm:ss"}));
+ param.setDeptId(conf.getDeptId());
+
+ log.info("鎺ユ敹鐨勬寚浠や腑鎺ュ彛鍐呭涓�={}", req.getContent());
+ String[] interfaces = ids.split(";");
+ for (String inteId : interfaces) {
+ log.info("鎵ц鎺ュ彛={}鐨勬暟鎹笂鎶�", inteId);
+ getDataToPush(param, inteId);
+ }
+ }
+
+ private void getDataToPush(ApiParam param, String inteId) {
+ switch (inteId) {
+ case "2401":
+ pushService11.pushData1101(apiRemoteService, param);
+ break;
+ case "2402":
+ pushService11.pushData1102(apiRemoteService, param);
+ break;
+ case "2403":
+ pushService11.pushData1103(apiRemoteService, param);
+ break;
+ case "2404":
+ pushService11.pushData1104(apiRemoteService, param);
+ break;
+ case "2405":
+ pushService11.pushData1105(apiRemoteService, param);
+ break;
+ case "2406":
+ pushService11.pushData1106(apiRemoteService, param);
+ break;
+ case "2407":
+ pushService11.pushData1107(apiRemoteService, param);
+ break;
+ case "2408":
+ pushService11.pushData1108(apiRemoteService, param);
+ break;
+ case "2409":
+ pushService12.pushData1109(apiRemoteService, param);
+ break;
+ case "2410":
+ pushService11.pushData1110(apiRemoteService, param);
+ break;
+ case "2411":
+ pushService11.pushData1111(apiRemoteService, param);
+ break;
+ case "2412":
+ pushService11.pushData1112(apiRemoteService, param);
+ break;
+ case "2413":
+ pushService11.pushData1113(apiRemoteService, param);
+ break;
+ case "2414":
+ pushService12.pushData1201(apiRemoteService, param);
+ break;
+ case "2415":
+ pushService12.pushData1202(apiRemoteService, param);
+ break;
+ case "2416":
+ pushService12.pushData1203(apiRemoteService, param);
+ break;
+ case "2417":
+ pushService12.pushData1204(apiRemoteService, param);
+ break;
+ case "2418":
+ pushService12.pushData1205(apiRemoteService, param);
+ break;
+ case "2419":
+ pushService12.pushData1206(apiRemoteService, param);
+ break;
+ case "2420":
+ pushService12.pushData1207(apiRemoteService, param);
+ break;
+ case "2421":
+ pushService12.pushData1208(apiRemoteService, param);
+ break;
+ case "2422":
+ pushService12.pushData1209(apiRemoteService, param);
+ break;
+ case "2423":
+ pushService12.pushData1210(apiRemoteService, param);
+ break;
+ case "2424":
+ pushService12.pushData1211(apiRemoteService, param);
+ break;
+ case "2425":
+ pushService12.pushData1212(apiRemoteService, param);
+ break;
+ case "2426":
+ pushService13.pushData1301(apiRemoteService, param);
+ break;
+ case "2427":
+ pushService13.pushData1302(apiRemoteService, param);
+ break;
+ case "2428":
+ pushService13.pushData1303(apiRemoteService, param);
+ break;
+ case "2429":
+ pushService13.pushData1304(apiRemoteService, param);
+ break;
+ case "2430":
+ pushService13.pushData1305(apiRemoteService, param);
+ break;
+ case "2431":
+ pushService13.pushData1306(apiRemoteService, param);
+ break;
+ case "2432":
+ pushService13.pushData1307(apiRemoteService, param);
+ break;
+ case "2433":
+ pushService13.pushData1308(apiRemoteService, param);
+ break;
+ case "2434":
+ pushService13.pushData1309(apiRemoteService, param);
+ break;
+ case "2435":
+ pushService13.pushData1310(apiRemoteService, param);
+ break;
+ case "2436":
+ pushService14.pushData1401(apiRemoteService, param);
+ break;
+ case "2437":
+ pushService14.pushData1402(apiRemoteService, param);
+ break;
+ case "2438":
+ pushService14.pushData1403(apiRemoteService, param);
+ break;
+ case "2439":
+ pushService14.pushData1404(apiRemoteService, param);
+ break;
+ case "2440":
+ pushService14.pushData1405(apiRemoteService, param);
+ break;
+ case "2441":
+ pushService11.pushData1114(apiRemoteService, param);
+ break;
+ default:
+ log.error("-----瀹佸鐪佸钩鍙�2024鐗堬細鏈尮閰嶅埌鎺ュ彛缂栫爜锛屼笉鎺ㄩ��-----");
+ break;
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java b/src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java
new file mode 100644
index 0000000..73d7511
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java
@@ -0,0 +1,77 @@
+package com.fzzy.push.nx2024;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.service.PushService11;
+import com.fzzy.push.impl.ComPushService11;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-鍩虹鏁版嵁涓婁紶
+ * @Author CZT
+ * @Date 2024/7/25 15:35
+ */
+@Slf4j
+@Component
+public class NX2024PushService11 implements PushService11 {
+ @Autowired
+ private NX2024ApiRemoteService apiRemoteService;
+ @Autowired
+ private ComPushService11 pushService11;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_NX_2024.getCode();
+ }
+
+ @Override
+ public void pushData(ApiParam param) {
+
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝鍩虹淇℃伅锛屽紑濮嬩富鍔ㄤ笂鎶�");
+
+ //2401-鍗曚綅淇℃伅
+ pushService11.pushData1101(apiRemoteService, param);
+
+ //2402-搴撳尯淇℃伅
+ pushService11.pushData1102(apiRemoteService, param);
+
+ //2403-浠撴埧淇℃伅
+ pushService11.pushData1103(apiRemoteService, param);
+
+ //2404-寤掗棿淇℃伅
+ pushService11.pushData1104(apiRemoteService, param);
+
+ //2405-璐т綅淇℃伅
+ pushService11.pushData1105(apiRemoteService, param);
+
+ //2406-娌圭綈淇℃伅
+ pushService11.pushData1106(apiRemoteService, param);
+
+ //2407-璁惧淇℃伅
+ pushService11.pushData1107(apiRemoteService, param);
+
+ //2408-鑽墏淇℃伅
+ pushService11.pushData1108(apiRemoteService, param);
+
+ //2409-鏂囦欢淇℃伅锛岃浆绉诲埌12澶х被杩涜鎺ㄩ��
+
+ //2410-搴撳尯鍥句粨鎴跨偣浣嶄俊鎭�
+ pushService11.pushData1110(apiRemoteService, param);
+
+ //2411-搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆暟鎹�
+ pushService11.pushData1111(apiRemoteService, param);
+
+ //2412-浜哄憳淇℃伅
+ pushService11.pushData1112(apiRemoteService, param);
+
+ //2413-浼佷笟淇$敤淇℃伅
+ pushService11.pushData1113(apiRemoteService, param);
+
+ //2441-璐㈠姟鎶ヨ〃鏁版嵁鎺ㄩ��
+ pushService11.pushData1114(apiRemoteService, param);
+
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝鍩虹淇℃伅锛屼笂鎶ョ粨鏉�");
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024PushService12.java b/src/main/java/com/fzzy/push/nx2024/NX2024PushService12.java
new file mode 100644
index 0000000..b96f51b
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024PushService12.java
@@ -0,0 +1,75 @@
+package com.fzzy.push.nx2024;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.service.PushService12;
+import com.fzzy.push.impl.ComPushService12;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-绮璐攢鏁版嵁涓婁紶
+ * @Author CZT
+ * @Date 2024/7/25 15:40
+ */
+@Slf4j
+@Component
+public class NX2024PushService12 implements PushService12 {
+
+ @Autowired
+ private NX2024ApiRemoteService apiRemoteService;
+ @Autowired
+ private ComPushService12 pushService12;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_NX_2024.getCode();
+ }
+
+ @Override
+ public void pushData(ApiParam param) {
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝绮璐攢淇℃伅锛屽紑濮嬩富鍔ㄤ笂鎶�");
+
+ //2425-瀹㈡埛淇℃伅
+ pushService12.pushData1212(apiRemoteService, param);
+
+ //2414-鍚堝悓
+ pushService12.pushData1201(apiRemoteService, param);
+
+ //2415-鍏ュ簱鏁版嵁
+ pushService12.pushData1202(apiRemoteService, param);
+
+ //2416-鍏ュ簱璐ㄦ
+ pushService12.pushData1203(apiRemoteService, param);
+
+ //2417-鍏ュ簱缁撶畻
+ pushService12.pushData1204(apiRemoteService, param);
+
+ //2418-鍑哄簱鏁版嵁
+ pushService12.pushData1205(apiRemoteService, param);
+
+ //2419-鍑哄簱缁撶畻
+ pushService12.pushData1206(apiRemoteService, param);
+
+ //2420-鍊掍粨
+ pushService12.pushData1207(apiRemoteService, param);
+
+ //2421-绮搴撳瓨鏁版嵁
+ pushService12.pushData1208(apiRemoteService, param);
+
+ //2422-鎹熸孩鍗�
+ pushService12.pushData1209(apiRemoteService, param);
+
+ //2423-鎬ц川杞彉
+ pushService12.pushData1210(apiRemoteService, param);
+
+ //2424-璐﹂潰搴撳瓨
+ pushService12.pushData1211(apiRemoteService, param);
+
+ //2409-鏂囦欢
+ pushService12.pushData1109(apiRemoteService, param);
+
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝绮璐攢淇℃伅锛屼笂鎶ョ粨鏉�");
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024PushService13.java b/src/main/java/com/fzzy/push/nx2024/NX2024PushService13.java
new file mode 100644
index 0000000..99b2fff
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024PushService13.java
@@ -0,0 +1,69 @@
+package com.fzzy.push.nx2024;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.service.PushService13;
+import com.fzzy.push.impl.ComPushService13;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-绮绠$悊鏁版嵁涓婁紶
+ * @Author CZT
+ * @Date 2024/7/25 15:45
+ */
+@Slf4j
+@Component
+public class NX2024PushService13 implements PushService13 {
+
+
+ @Autowired
+ private NX2024ApiRemoteService apiRemoteService;
+ @Autowired
+ private ComPushService13 pushService13;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_NX_2024.getCode();
+ }
+
+ @Override
+ public void pushData(ApiParam param) {
+
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝绮绠$悊淇℃伅锛屽紑濮嬩富鍔ㄤ笂鎶�");
+
+ //2426-瀹夊叏绠$悊
+ pushService13.pushData1301(apiRemoteService, param);
+
+ //2427-娓╂箍搴︿俊鎭�
+ pushService13.pushData1302(apiRemoteService, param);
+
+ //2428-铏
+ pushService13.pushData1303(apiRemoteService, param);
+
+ //2429-姘斾綋
+ pushService13.pushData1304(apiRemoteService, param);
+
+ //2430-閫氶
+ pushService13.pushData1305(apiRemoteService, param);
+
+ //2431-鐔忚捀
+ pushService13.pushData1306(apiRemoteService, param);
+
+ //2432-浠撳唴瑙嗛鍥惧儚
+ pushService13.pushData1307(apiRemoteService, param);
+
+ //2433-瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅淇℃伅
+ pushService13.pushData1308(apiRemoteService, param);
+
+ //2434-杩濊棰勮淇℃伅
+ pushService13.pushData1309(apiRemoteService, param);
+
+ //2435-璐ㄦ淇℃伅
+ pushService13.pushData1310(apiRemoteService, param);
+
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝绮绠$悊淇℃伅锛屼笂鎶ョ粨鏉�");
+ }
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024PushService14.java b/src/main/java/com/fzzy/push/nx2024/NX2024PushService14.java
new file mode 100644
index 0000000..331de2c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024PushService14.java
@@ -0,0 +1,53 @@
+package com.fzzy.push.nx2024;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.service.PushService14;
+import com.fzzy.push.impl.ComPushService14;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-琛屾斂绠$悊鏁版嵁涓婁紶
+ * @Author CZT
+ * @Date 2024/7/25 15:50
+ */
+@Slf4j
+@Component
+public class NX2024PushService14 implements PushService14 {
+
+ @Autowired
+ private NX2024ApiRemoteService apiRemoteService;
+ @Autowired
+ private ComPushService14 pushService14;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_NX_2024.getCode();
+ }
+
+ @Override
+ public void pushData(ApiParam param) {
+
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝琛屾斂绠$悊淇℃伅锛屽紑濮嬩富鍔ㄤ笂鎶�");
+
+ //2436-鍌ㄥ瑙勬ā
+ pushService14.pushData1401(apiRemoteService, param);
+
+ //2437-鍌ㄥ璁″垝
+ pushService14.pushData1402(apiRemoteService, param);
+
+ //2438-杞崲璁″垝
+ pushService14.pushData1403(apiRemoteService, param);
+
+ //2439-杞崲璁″垝鏄庣粏
+ pushService14.pushData1404(apiRemoteService, param);
+
+ //2440-椤圭洰淇℃伅
+ pushService14.pushData1405(apiRemoteService, param);
+
+ log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙o紝琛屾斂绠$悊淇℃伅锛屼笂鎶ョ粨鏉�");
+ }
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2401.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2401.java
new file mode 100644
index 0000000..ed52aab
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2401.java
@@ -0,0 +1,99 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鍗曚綅淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:40
+ */
+@Data
+public class Nx2024Api2401 implements Serializable {
+
+ @PropertyDef(label = "鍗曚綅浠g爜")
+ private String dwdm;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String dwmc;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "鍗曚綅绫诲瀷")
+ private String dwlx;
+
+ @PropertyDef(label = "娉ㄥ唽鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date zcrq;
+
+ @PropertyDef(label = "娉ㄥ唽璧勬湰")
+ private Double zczb;
+
+ @PropertyDef(label = "璧勪骇鎬婚")
+ private Double zcze;
+
+ @PropertyDef(label = "娉曞畾浠h〃浜�")
+ private String fddbr;
+
+ @PropertyDef(label = "娉曚汉韬唤璇佸彿")
+ private String frsfzh;
+
+ @PropertyDef(label = "娉曚汉鑱旂郴鏂瑰紡")
+ private String frlxfs;
+
+ @PropertyDef(label = "浼佷笟鑱旂郴浜�")
+ private String qylxr;
+
+ @PropertyDef(label = "鍔炲叕鐢佃瘽")
+ private String bgdh;
+
+ @PropertyDef(label = "娉ㄥ唽鍦板潃")
+ private String zcdz;
+
+ @PropertyDef(label = "鐢靛瓙閭")
+ private String dzyx;
+
+ @PropertyDef(label = "浼佷笟瀹樻柟缃戠珯鍦板潃")
+ private String qygfwzdz;
+
+ @PropertyDef(label = "浼犵湡鍙风爜")
+ private String czhm;
+
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠g爜")
+ private String xzqhdm;
+
+ @PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
+ private String sjdwmc;
+
+ @PropertyDef(label = "涓婄骇鍗曚綅浠g爜")
+ private String sjdwdm;
+
+ @PropertyDef(label = "搴撳尯鏁�")
+ private Integer kqs;
+
+ @PropertyDef(label = "浠撴埧鏁�")
+ private Integer cfs;
+
+ @PropertyDef(label = "娌圭綈鏁�")
+ private Integer ygs;
+
+ @PropertyDef(label = "缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "绾害")
+ private Double wd;
+
+ @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/nx2024/dto/Nx2024Api2402.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2402.java
new file mode 100644
index 0000000..6bc0945
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2402.java
@@ -0,0 +1,69 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-搴撳尯淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:41
+ */
+@Data
+public class Nx2024Api2402 implements Serializable {
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "鍗曚綅浠g爜")
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @PropertyDef(label = "搴撳尯鍦板潃")
+ private String kqdz;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠g爜")
+ private String xzqhdm;
+
+ @PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
+ private String kqcq;
+
+ @PropertyDef(label = "鏈夋晥浠撳")
+ private Double yxcr;
+
+ @PropertyDef(label = "鏈夋晥缃愬")
+ private Double yxgr;
+
+ @PropertyDef(label = "鍗犲湴闈㈢Н")
+ private Double zdmj;
+
+ @PropertyDef(label = "浠撴埧鏁�")
+ private Integer cfs;
+
+ @PropertyDef(label = "娌圭綈鏁�")
+ private Integer ygs;
+
+ @PropertyDef(label = "搴撳尯缁忓害")
+ private Double jd;
+
+ @PropertyDef(label = "搴撳尯绾害")
+ private Double wd;
+
+ @PropertyDef(label = "绮簱鎬ц川", description = "1:鍥芥湁,2:姘戣惀,3:鍚堣祫")
+ private String lkxz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2403.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2403.java
new file mode 100644
index 0000000..7f197ab
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2403.java
@@ -0,0 +1,190 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-浠撴埧淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:42
+ */
+@Data
+public class Nx2024Api2403 implements Serializable {
+
+
+ @PropertyDef(label = "浠撴埧浠g爜" )
+ private String cfdm;
+
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
+ @PropertyDef(label = "浠撴埧鍚嶇О" )
+ private String cfmc;
+
+ @PropertyDef(label = "搴撳尯浠g爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "浠撴埧绫诲瀷浠g爜" )
+ private String cflxdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jfsyrq;
+
+ @PropertyDef(label = "寤鸿鍗曚綅" )
+ private String jsdw;
+
+ @PropertyDef(label = "璁捐浣跨敤骞撮檺" )
+ private String sjsynx;
+
+ @PropertyDef(label = "璁捐鍗曚綅" )
+ private String sjdw;
+
+ @PropertyDef(label = "鐩戠悊鍗曚綅" )
+ private String jldw;
+
+ @PropertyDef(label = "澧欎綋缁撴瀯" )
+ private String qtjg;
+
+ @PropertyDef(label = "鎴块《缁撴瀯" )
+ private String fdjg;
+
+ @PropertyDef(label = "鎴挎灦缁撴瀯" )
+ private String fjjg;
+
+ @PropertyDef(label = "鍦伴潰缁撴瀯" )
+ private String dmjg;
+
+ @PropertyDef(label = "璁捐浠撳" )
+ private Double sjcr;
+
+ @PropertyDef(label = "浠撳闀�" )
+ private Double cwc;
+
+ @PropertyDef(label = "浠撳瀹�" )
+ private Double cwk;
+
+ @PropertyDef(label = "浠撳妾愰珮" )
+ private Double cwyg;
+
+ @PropertyDef(label = "浠撳椤堕珮" )
+ private Double cwdg;
+
+ @PropertyDef(label = "绛掍粨澶栧緞" )
+ private Double tcwj;
+
+ @PropertyDef(label = "浠撳唴闀�" )
+ private Double cnc;
+
+ @PropertyDef(label = "浠撳唴瀹�" )
+ private Double cnk;
+
+ @PropertyDef(label = "浠撳唴妾愰珮" )
+ private Double cnyg;
+
+ @PropertyDef(label = "浠撳唴瑁呯伯绾块珮" )
+ private Double cnzlxg;
+
+ @PropertyDef(label = "绛掍粨鍐呭緞" )
+ private Double tcnj;
+
+ @PropertyDef(label = "浠撳唴浣撶Н" )
+ private Double cntj;
+
+ @PropertyDef(label = "浠撻棬鏁伴噺" )
+ private Integer cmsl;
+
+ @PropertyDef(label = "浠撻棬浣嶇疆" )
+ private String cmwz;
+
+ @PropertyDef(label = "浠撻棬楂樺害" )
+ private Double cmgd;
+
+ @PropertyDef(label = "浠撻棬瀹藉害" )
+ private Double cmkd;
+
+ @PropertyDef(label = "鎸$伯闂ㄥ瀷寮�" )
+ private String dlmxs;
+
+ @PropertyDef(label = "浠撴埧鏄惁瀹屽ソ" )
+ private String cfsfwh;
+
+ @PropertyDef(label = "鍌ㄧ伯鍔熸晥" )
+ private String clgx;
+
+ @PropertyDef(label = "鑳藉惁闅旂儹淇濇俯" )
+ private String nfgrbw;
+
+ @PropertyDef(label = "闅旂儹淇濇俯鎺柦" )
+ private String grbwcs;
+
+ @PropertyDef(label = "闅旂儹鎬ц兘" )
+ private String grxn;
+
+ @PropertyDef(label = "缁撴瀯鏉愭枡" )
+ private String jgcl;
+
+ @PropertyDef(label = "姘斿瘑鎬�" )
+ private String qmx;
+
+ @PropertyDef(label = "鏄惁宸茶繘琛屼俊鎭寲鏀归��" )
+ private String sfyjxxxhgz;
+
+ @PropertyDef(label = "绮儏鎶�鏈�" )
+ private String lqjs;
+
+ @PropertyDef(label = "鑳藉惁鏁h鍌ㄥ瓨" )
+ private String nfszcc;
+
+ @PropertyDef(label = "鏈夋棤闃查紶闃查泙闃茶櫕瑁呯疆鍙婅鏂�" )
+ private String ywfsfqfczz;
+
+ @PropertyDef(label = "鏈夋棤闃茬伀闃茬垎闃茬洍璁炬柦" )
+ private String ywfhfbfdss;
+
+ @PropertyDef(label = "鏈夋棤鏈烘閫氶璁炬柦" )
+ private String ywjxtfss;
+
+ @PropertyDef(label = "閫氶绯荤粺鍨嬪紡" )
+ private String tfxtxs;
+
+ @PropertyDef(label = "閫氶鎶�鏈�" )
+ private String tfjs;
+
+ @PropertyDef(label = "鑳藉惁鐜祦鐔忚捀鏉�铏�" )
+ private String nfhlxzsc;
+
+ @PropertyDef(label = "鏉�铏妧鏈�" )
+ private String scjs;
+
+ @PropertyDef(label = "鑳藉惁瀵屾爱浣庢哀姘旇皟鍌ㄧ伯" )
+ private String nffddyqtcl;
+
+ @PropertyDef(label = "鎺ф俯鎶�鏈�" )
+ private String kwjs;
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬫柟寮�" )
+ private String hcjcfs;
+
+ @PropertyDef(label = "浠撴埧鐘舵��" )
+ private String cfzt;
+
+ @PropertyDef(label = "淇濈鍛�" )
+ private String bgr;
+
+ @PropertyDef(label = "浠撴埧缁忓害" )
+ private Double jd;
+
+ @PropertyDef(label = "浠撴埧绾害" )
+ private Double wd;
+
+ @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/nx2024/dto/Nx2024Api2404.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2404.java
new file mode 100644
index 0000000..6c63ad4
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2404.java
@@ -0,0 +1,54 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-寤掗棿淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:43
+ */
+@Data
+public class Nx2024Api2404 implements Serializable {
+
+ @PropertyDef(label = "寤掗棿浠g爜")
+ private String ajdh;
+
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
+ @PropertyDef(label = "寤掗棿鍚嶇О")
+ private String ajmc;
+
+ @PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
+ private String cfbh;
+
+ @PropertyDef(label = "寤掗棿闀垮害")
+ private Double ajcd;
+
+ @PropertyDef(label = "寤掗棿瀹藉害")
+ private Double ajkd;
+
+ @PropertyDef(label = "寤掗棿楂樺害")
+ private Double ajgd;
+
+ @PropertyDef(label = "寤掗棿璁捐浠撳")
+ private Double ajsjcr;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
+ private Date ajqyrq;
+
+ @PropertyDef(label = "寤掗棿鐘舵��")
+ private String ajzt;
+
+ @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/nx2024/dto/Nx2024Api2405.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2405.java
new file mode 100644
index 0000000..5fa9991
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2405.java
@@ -0,0 +1,49 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-璐т綅淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:44
+ */
+@Data
+public class Nx2024Api2405 implements Serializable {
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "璐т綅鍚嶇О" )
+ private String hwmc;
+
+ @PropertyDef(label = "寤掗棿浠g爜" )
+ private String ajdm;
+
+ @PropertyDef(label = "璐т綅鍚敤鏃ユ湡" )
+ @JSONField(format = "yyyy-MM-dd")
+ private Date hwqyrq;
+
+ @PropertyDef(label = "璐т綅瀹归噺" )
+ private Double hwrl;
+
+ @PropertyDef(label = "淇濈鍗曚綅" )
+ private String bgdw;
+
+ @PropertyDef(label = "淇濈鍛�" )
+ private String bgy;
+
+ @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/nx2024/dto/Nx2024Api2406.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2406.java
new file mode 100644
index 0000000..26af043
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2406.java
@@ -0,0 +1,76 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-娌圭綈淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:45
+ */
+@Data
+public class Nx2024Api2406 implements Serializable {
+
+ @PropertyDef(label = "娌圭綈浠g爜" )
+ private String ygdm;
+
+ @PropertyDef(label = "缁熶竴娌圭綈缂栫爜" )
+ private String tyygbm;
+
+ @PropertyDef(label = "娌圭綈鍚嶇О" )
+ private String ygmc;
+
+ @PropertyDef(label = "搴撳尯浠g爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "缃愬" )
+ private double gr;
+
+ @PropertyDef(label = "寤洪�犳椂闂�" )
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jzsj;
+
+ @PropertyDef(label = "娌圭綈鍙婇檮灞炶鏂芥槸鍚﹀畬濂�" )
+ private String ygjfssssfwh;
+
+ @PropertyDef(label = "鏈夋棤鍔犵儹瑁呯疆" )
+ private String ywjrzz;
+
+ @PropertyDef(label = "娌圭綈绫诲瀷" )
+ private String yglx;
+
+ @PropertyDef(label = "缃愬唴鐩村緞" )
+ private double gnzj;
+
+ @PropertyDef(label = "缃愬唴楂樺害" )
+ private double gngd;
+
+ @PropertyDef(label = "妫�瀹氭柟寮�" )
+ private String jdfs;
+
+ @PropertyDef(label = "鐒婃帴鏂瑰紡" )
+ private String hjfs;
+
+ @PropertyDef(label = "娌圭綈鐘舵��" )
+ private String ygzt;
+
+ @PropertyDef(label = "璁捐鍗曚綅" )
+ private String sjdw;
+
+ @PropertyDef(label = "寤鸿鍗曚綅" )
+ private String jsdw;
+
+ @PropertyDef(label = "鐩戠悊鍗曚綅" )
+ private String jldw;
+
+ @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/nx2024/dto/Nx2024Api2407.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2407.java
new file mode 100644
index 0000000..ad3b064
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2407.java
@@ -0,0 +1,68 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-璁惧淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:46
+ */
+@Data
+public class Nx2024Api2407 implements Serializable {
+
+ @PropertyDef(label = "璁惧缂栧彿" )
+ private String sbbh;
+
+ @PropertyDef(label = "搴撳尯浠g爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "鍗曚綅浠g爜" )
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О" )
+ private String kqmc;
+
+ @PropertyDef(label = "璁惧浠櫒鍚嶇О" )
+ private String sbyqmc;
+
+ @PropertyDef(label = "璁惧浠櫒浠g爜" )
+ private String sbyqdm;
+
+ @PropertyDef(label = "璁惧瑙勬牸鍨嬪彿" )
+ private String sbggxh;
+
+ @PropertyDef(label = "鐢熶骇鍘傚" )
+ private String sccj;
+
+ @PropertyDef(label = "鐢熶骇鏃ユ湡" )
+ @JSONField(format = "yyyy-MM-dd")
+ private Date scrq;
+
+ @PropertyDef(label = "璁惧鎻忚堪" )
+ private String sbms;
+
+ @PropertyDef(label = "璁惧鐘舵��" )
+ private String sbzt;
+
+ @PropertyDef(label = "妫�瀹氭椂闂�" )
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jdsj;
+
+ @PropertyDef(label = "妫�瀹氬崟浣�" )
+ private String jddw;
+
+ @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/nx2024/dto/Nx2024Api2408.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2408.java
new file mode 100644
index 0000000..3027e47
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2408.java
@@ -0,0 +1,80 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鑽墏淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:47
+ */
+@Data
+public class Nx2024Api2408 implements Serializable {
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "鍗曚綅浠g爜")
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @PropertyDef(label = "鑽墏缂栧彿")
+ private String yjbh;
+
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String yjmc;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鍨嬪彿瑙勬牸")
+ private String ggxh;
+
+ @PropertyDef(label = "瀹夊叏浣跨敤璇存槑涔�")
+ private String aqsysms;
+
+ @PropertyDef(label = "鐢熶骇鍘傚")
+ private String sccj;
+
+ @PropertyDef(label = "閲囪喘鏉ユ簮")
+ private String cgly;
+
+ @PropertyDef(label = "鍌ㄥ瓨鏉′欢")
+ private String cctj;
+
+ @PropertyDef(label = "鍌ㄥ瓨鍦扮偣")
+ private String ccdd;
+
+ @PropertyDef(label = "鍖呰鐗╁鐞嗘柟寮�")
+ private String bzwclfs;
+
+ @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 = "搴撳瓨鏁伴噺")
+ private Double kcsl;
+
+ @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/nx2024/dto/Nx2024Api2409.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2409.java
new file mode 100644
index 0000000..ffa94b1
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2409.java
@@ -0,0 +1,39 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鏂囦欢淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:48
+ */
+@Data
+public class Nx2024Api2409 implements Serializable {
+
+ @PropertyDef(label = "鏂囦欢鍚嶇О")
+ private String wjmc;
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "鏂囦欢绫诲瀷", description = "1锛氬簱鍖洪笩鐬板浘 2锛氬叆搴撳浘鐗� 3锛氬嚭搴撳浘鐗� 4锛氬叆搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5绉掗挓瑙嗛锛�5锛氬嚭搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5 绉掗挓瑙嗛锛�104锛氱啅钂稿妗堟帴鍙i檮浠�")
+ private String wjlx;
+
+ @PropertyDef(label = "鏂囦欢娴�")
+ private String wjl;
+
+ @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/nx2024/dto/Nx2024Api2410.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2410.java
new file mode 100644
index 0000000..e9fe457
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2410.java
@@ -0,0 +1,54 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-搴撳尯鍥句粨鎴跨偣浣嶄俊鎭�
+ * @Author CZT
+ * @Date 2024/7/25 14:49
+ */
+@Data
+public class Nx2024Api2410 implements Serializable {
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "鍗曚綅浠g爜" )
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯浠g爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О" )
+ private String dwmc;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О" )
+ private String kqmc;
+
+ @PropertyDef(label = "璐т綅鍚嶇О" )
+ private String hwmc;
+
+ @PropertyDef(label = "璐т綅鐩稿浣嶇疆" )
+ private String hwxdwz;
+
+ @PropertyDef(label = "璐т綅浣嶇疆鏍峰紡" )
+ private String hwwzys;
+
+ @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/nx2024/dto/Nx2024Api2411.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2411.java
new file mode 100644
index 0000000..4f9d4c6
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2411.java
@@ -0,0 +1,56 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
+ * @Author CZT
+ * @Date 2024/7/25 14:50
+ */
+@Data
+public class Nx2024Api2411 implements Serializable {
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О" )
+ private String dwmc;
+
+ @PropertyDef(label = "鍗曚綅浠g爜" )
+ private String dwdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О" )
+ private String kqmc;
+
+ @PropertyDef(label = "搴撳尯浠g爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧鍚嶇О" )
+ private String spjksbmc;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id" )
+ private String spjksbid;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧鐩稿浣嶇疆" )
+ private String spjksbxdwz;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧浣嶇疆鏍峰紡" )
+ private String spjksbwzys;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷" ,description = "锛�1:浠撳唴锛�2:涓氬姟锛�3:瀹夐槻锛�")
+ private String spjklx;
+
+ @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/nx2024/dto/Nx2024Api2412.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2412.java
new file mode 100644
index 0000000..5441dfb
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2412.java
@@ -0,0 +1,95 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-浜哄憳淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:51
+ */
+@Data
+public class Nx2024Api2412 implements Serializable {
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "鍗曚綅浠g爜" )
+ private String dwdm;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О" )
+ private String dwmc;
+
+ @PropertyDef(label = "闅跺睘閮ㄩ棬" )
+ private String lsbm;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠g爜" )
+ private String xzqhdm;
+
+ @PropertyDef(label = "濮撳悕" )
+ private String xm;
+
+ @PropertyDef(label = "鎬у埆" )
+ private String xb;
+
+ @PropertyDef(label = "韬唤璇佸彿鐮�" )
+ private String sfzhm;
+
+ @PropertyDef(label = "鍏ヨ亴鏃ユ湡" )
+ @JSONField(format = "yyyy-MM-dd")
+ private Date rzrq;
+
+ @PropertyDef(label = "宀椾綅鎬ц川" )
+ private String gwxz;
+
+ @PropertyDef(label = "鍦ㄥ矖鐘舵��" )
+ private String zgzt;
+
+ @PropertyDef(label = "绂昏亴鏃ユ湡" )
+ @JSONField(format = "yyyy-MM-dd")
+ private Date lzrq;
+
+ @PropertyDef(label = "搴ф満鐢佃瘽" )
+ private String zjdh;
+
+ @PropertyDef(label = "绉诲姩鐢佃瘽" )
+ private String yddh;
+
+ @PropertyDef(label = "鐢靛瓙閭" )
+ private String dzyx;
+
+ @PropertyDef(label = "姘戞棌" )
+ private String mz;
+
+ @PropertyDef(label = "鏀挎不闈㈣矊" )
+ private String zzmm;
+
+ @PropertyDef(label = "浜哄憳绫诲埆" )
+ private String rylb;
+
+ @PropertyDef(label = "涓撲笟" )
+ private String zy;
+
+ @PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿" )
+ @JSONField(format = "yyyy-MM-dd")
+ private Date qdzgzchzyzgsj;
+
+ @PropertyDef(label = "瀛﹀巻" )
+ private String xl;
+
+ @PropertyDef(label = "鑱屽姟" )
+ private String zw;
+
+ @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/nx2024/dto/Nx2024Api2413.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2413.java
new file mode 100644
index 0000000..4bfb4c2
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2413.java
@@ -0,0 +1,39 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-浼佷笟淇$敤淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:52
+ */
+@Data
+public class Nx2024Api2413 implements Serializable {
+
+
+ @PropertyDef(label = "鍗曚綅浠g爜" )
+ private String dwdm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @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/nx2024/dto/Nx2024Api2414.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2414.java
new file mode 100644
index 0000000..d92540f
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2414.java
@@ -0,0 +1,155 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.conf.NumberSerializer;
+import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-鍚堝悓淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:53
+ */
+@Data
+public class Nx2024Api2414 implements Serializable {
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "鍚堝悓鍚嶇О")
+ private String htmc;
+
+ @PropertyDef(label = "鍗曚綅浠g爜")
+ private String dwdm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "涓氬姟绫诲埆")
+ private String ywlx;
+
+ @PropertyDef(label = "瀹㈡埛绫诲瀷")
+ private String khlx;
+
+ @PropertyDef(label = "瀹㈡埛缁熶竴绀句細淇$敤浠g爜")
+ private String khtyshxydm;
+
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String khmc;
+
+ @PropertyDef(label = "娉曞畾浠h〃浜�")
+ private String fddbr;
+
+ @PropertyDef(label = "閫氳鍦板潃")
+ private String txdz;
+
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
+
+ @PropertyDef(label = "鑱旂郴浜哄鍚�")
+ private String lxrxm;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxrdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "鐢靛瓙淇$")
+ private String dzyx;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛捐鏃ユ湡")
+ private Date qdrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
+ private Date ydwcsj;
+
+ @PropertyDef(label = "绛捐鍦扮偣")
+ private String qddd;
+
+ @PropertyDef(label = "绮鍝佺浠g爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠g爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鍚堝悓鍗曚环")
+ private double htdj;
+
+ @PropertyDef(label = "绾﹀畾璐攢绮鏁伴噺")
+ private double ydgxlssl;
+
+ @JSONField(serializeUsing = NumberSerializer.class)
+ @PropertyDef(label = "鍚堝悓鎬婚噾棰�")
+ private BigDecimal htzje;
+
+ @PropertyDef(label = "灞ョ害淇濊瘉閲�")
+ private double lybzj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
+ private Date sswcsj;
+
+ @JSONField(name = "Lysl")
+ @PropertyDef(label = "灞ョ害鏁伴噺")
+ private double lysl;
+
+ @JSONField(name = "Lyl")
+ @PropertyDef(label = "灞ョ害鐜�")
+ private double lyl;
+
+ @JSONField(name = "Jsjg")
+ @PropertyDef(label = "缁撶畻浠锋牸")
+ private double jsjg;
+
+ @JSONField(name = "Jszje", serializeUsing = NumberSerializer.class)
+ @PropertyDef(label = "缁撶畻鎬婚噾棰�")
+ private BigDecimal jszje;
+
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��")
+ private String jsyhtyzx;
+
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�")
+ private String jsyhtbyzyy;
+
+ @PropertyDef(label = "瀹㈡埛鏂瑰紑鎴疯")
+ private String khfkhh;
+
+ @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+ private String khfzh;
+
+ @PropertyDef(label = "瀹㈡埛绛剧害浜�")
+ private String khqyr;
+
+ @PropertyDef(label = "鏈柟寮�鎴疯")
+ private String bfkhh;
+
+ @PropertyDef(label = "鏈柟璐﹀彿")
+ private String bfzh;
+
+ @PropertyDef(label = "鏈柟绛剧害浜�")
+ private String bfqyr;
+
+ @PropertyDef(label = "瀹℃壒浜�")
+ private String shr;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "瀹℃壒鏃堕棿")
+ private Date shsj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "瀹屾垚鏃ユ湡")
+ private Date wcrq;
+
+ @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/nx2024/dto/Nx2024Api2415.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2415.java
new file mode 100644
index 0000000..ea06d7c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2415.java
@@ -0,0 +1,205 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鍏ュ簱淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:54
+ */
+@Data
+public class Nx2024Api2415 implements Serializable {
+
+ @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
+ private String rkywdh;
+
+ @PropertyDef(label = "璐т綅浠g爜")
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
+ private String ywlx = "2";
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠g爜")
+ private String lqgsdwdm;
+
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String cyr;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "璇︾粏鍦板潃")
+ private String xxdz;
+
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String ysgj;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "杞﹁埞鍙风被鍨�")
+ private String cchlx;
+
+ @PropertyDef(label = "鎸傝溅鍙�")
+ private String gch;
+
+ @PropertyDef(label = "瑁呯伯鍦扮偣")
+ private String ldd;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date djsj;
+
+ @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕")
+ private String djmgryxm;
+
+ @PropertyDef(label = "绮鍝佺浠g爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠g爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "浜у湴浠g爜")
+ private String cddm;
+
+ @PropertyDef(label = "妫�鏂ょ被鍨�")
+ private String jjlx;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "姣涢噸鐩戠鍛�")
+ private String mzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "姣涢噸璁¢噺鏃堕棿")
+ private Date mzjlsj;
+
+ @PropertyDef(label = "姣涢噸璁¢噺鍛�")
+ private String mzjly;
+
+ @PropertyDef(label = "鍊间粨鍛�")
+ private String zcy;
+
+ @PropertyDef(label = "鐨噸(鍏枻)")
+ private double pz;
+
+ @PropertyDef(label = "鐨噸鐩戠鍛�")
+ private String pzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐨噸璁¢噺鏃堕棿")
+ private Date pzjlsj;
+
+ @PropertyDef(label = "鐨噸璁¢噺鍛�")
+ private String pzjly;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
+ private Double bzbdbz = 25.0;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
+ private Integer bzbjs;
+
+ @PropertyDef(label = "璐ㄦ鎵i噺(灏忚:鍏枻)")
+ private Double zjklxj;
+
+ @PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵i噺(鍏枻)")
+ private Double qzsfzkl;
+
+ @PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵i噺(鍏枻)")
+ private Double qzzzzkl;
+
+ @PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
+ private Double qzbwslkl;
+
+ @PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
+ private Double qzhhkl;
+
+ @PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵i噺(鍏枻)")
+ private Double qzsmlkl;
+
+ @PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
+ private Double qzzjmlkl;
+
+ @PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
+ private Double qzgwcmkl;
+
+ @PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
+ private Double qzhlmkl;
+
+ @PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
+ private Double qzqtkl;
+
+ @PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
+ private Double zlfyzkl;
+
+ @PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
+ private Double bzwkl;
+
+ @PropertyDef(label = "鍏朵粬鎵i噺(鍏枻)")
+ private Double qtkl;
+
+ @PropertyDef(label = "鎵i噺鍘熷洜")
+ private String klyy;
+
+ @PropertyDef(label = "鐜板満鎵i噺(鍏枻)")
+ private Double xckl;
+
+ @PropertyDef(label = "澧炴墸浠�(鍏枻)")
+ private Double zkj;
+
+ @PropertyDef(label = "澧炴墸浠峰師鍥�")
+ private String zkhyy;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private Double jz;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
+ private String zxzydw;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑洪棬鏃堕棿")
+ private Date cmsj;
+
+ @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕")
+ private String cmqrmgryxm;
+
+ @PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿")
+ private String rkjsdh;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @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/nx2024/dto/Nx2024Api2416.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2416.java
new file mode 100644
index 0000000..cfbb5e4
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2416.java
@@ -0,0 +1,76 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-绮鍏ュ簱妫�楠屼俊鎭�
+ * @Author CZT
+ * @Date 2024/7/25 14:55
+ */
+@Data
+public class Nx2024Api2416 implements Serializable {
+
+ @PropertyDef(label = "鍏ュ簱妫�楠屽崟鍙�")
+ private String rkjydh;
+
+ @PropertyDef(label = "璐т綅浠g爜")
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
+ private String rkywdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date qysj;
+
+ @PropertyDef(label = "鎵︽牱浜哄鍚�")
+ private String qyrxm;
+
+ @PropertyDef(label = "鎵︽牱鏂瑰紡")
+ private String qyfs;
+
+ @PropertyDef(label = "妫�楠岄」鐩�,闅斿紑")
+ private String jyxm;
+
+ @PropertyDef(label = "妫�楠屽��,闅斿紑")
+ private String jyz;
+
+ @PropertyDef(label = "澧炴墸浠�(鍏�,闅斿紑)")
+ private String zkj;
+
+ @PropertyDef(label = "澧炴墸閲�(鍏枻,闅斿紑)")
+ private String zkl;
+
+ @PropertyDef(label = "妫�楠屼汉濮撳悕")
+ private String jyrxm;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date jysj;
+
+ @PropertyDef(label = "妫�楠岀粨鏋�")
+ private String jyjg;
+
+ @PropertyDef(label = "绮鍝佺浠g爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮瀹氱瓑")
+ private String lsdd;
+
+ @PropertyDef(label = "淇濈鍛樺鏍�")
+ private String bgyfh;
+
+ @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/nx2024/dto/Nx2024Api2417.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2417.java
new file mode 100644
index 0000000..43326ee
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2417.java
@@ -0,0 +1,78 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鍏ュ簱缁撶畻
+ * @Author CZT
+ * @Date 2024/7/25 14:56
+ */
+@Data
+public class Nx2024Api2417 implements Serializable {
+
+ @PropertyDef(label = "鍏ュ簱缁撶畻鍗曞彿", description = "鐢卞簱鐐逛唬鐮�+缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
+ private String rkjsdh;
+
+ @PropertyDef(label = "璐т綅浠g爜")
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)")
+ private double jssl;
+
+ @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
+ private double jsdj;
+
+ @PropertyDef(label = "缁撶畻閲戦(鍏�)")
+ private double jsje;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "缁撶畻鏃堕棿")
+ private Date jssj;
+
+ @PropertyDef(label = "缁撶畻鏂瑰紡")
+ private String jsfs;
+
+ @PropertyDef(label = "鏀舵浜�")
+ private String skr;
+
+ @PropertyDef(label = "閾惰琛屽埆浠g爜")
+ private String yhhbdm;
+
+ @PropertyDef(label = "鏀舵浜鸿韩浠借瘉鍙�")
+ private String skrsfzh;
+
+ @PropertyDef(label = "寮�鎴疯鍙�")
+ private String khhh;
+
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
+ private String khhmc;
+
+ @PropertyDef(label = "閾惰璐﹀彿")
+ private String yhzh;
+
+ @PropertyDef(label = "鍙戠エ鍙风爜")
+ private String fphm;
+
+ @PropertyDef(label = "鍙戠エ鐘舵��")
+ private String fpzt;
+
+ @PropertyDef(label = "浠樻鍗曚綅")
+ private String fkdw;
+
+ @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/nx2024/dto/Nx2024Api2418.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2418.java
new file mode 100644
index 0000000..1755b45
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2418.java
@@ -0,0 +1,148 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-绮鍑哄簱淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:57
+ */
+@Data
+public class Nx2024Api2418 implements Serializable {
+
+ @PropertyDef(label = "鍑哄簱涓氬姟鍗曞彿")
+ private String ckywdh;
+
+ @PropertyDef(label = "璐т綅浠g爜")
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
+ private String cktzdh;
+
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "1锛氬嚭搴擄紙榛樿锛�")
+ private String ywlx = "1";
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
+ private String hth;
+
+ @PropertyDef(label = "鎵胯繍浜�")
+ private String cyr;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxdh;
+
+ @PropertyDef(label = "韬唤璇佸彿")
+ private String sfzh;
+
+ @PropertyDef(label = "杩愯緭宸ュ叿")
+ private String ysgj;
+
+ @PropertyDef(label = "鍗哥伯鍦扮偣")
+ private String xldd;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
+
+ @PropertyDef(label = "鎸傝溅鍙�")
+ private String gch;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private Date djsj;
+
+ @PropertyDef(label = "鐧昏闂ㄥ矖浜哄憳濮撳悕")
+ private String djmgryxm;
+
+ @PropertyDef(label = "绮鍝佺浠g爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠g爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠g爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "浜у湴浠g爜")
+ private String cddm;
+
+ @PropertyDef(label = "鐨噸(鍏枻)")
+ private double pz;
+
+ @PropertyDef(label = "鐨噸鐩戠鍛�")
+ private String pzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鐨噸璁¢噺鏃堕棿")
+ private Date pzjlsj;
+
+ @PropertyDef(label = "鐨噸璁¢噺鍛�")
+ private String pzjly;
+
+ @PropertyDef(label = "姣涢噸(鍏枻)")
+ private double mz;
+
+ @PropertyDef(label = "姣涢噸鐩戠鍛�")
+ private String mzjby;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "姣涢噸璁¢噺鏃堕棿")
+ private Date mzjlsj;
+
+ @PropertyDef(label = "姣涢噸璁¢噺鍛�")
+ private String mzjly;
+
+ @PropertyDef(label = "鍖呰鐗�")
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
+ private double bzbdbz;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
+ private Integer bzbjs;
+
+ @PropertyDef(label = "鍑�閲�(鍏枻)")
+ private double jz;
+
+ @PropertyDef(label = "鎵�/澧為噺(鍏枻)")
+ private double kzl;
+
+ @PropertyDef(label = "鍊间粨淇濈鍛樺鍚�")
+ private String zcbgyxm;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
+ private String zxzydw;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑洪棬鏃堕棿")
+ private Date cmsj;
+
+ @PropertyDef(label = "鍑洪棬纭闂ㄥ矖浜哄憳濮撳悕")
+ private String cmqrmgryxm;
+
+ @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
+ private String ckjsdh;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @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/nx2024/dto/Nx2024Api2419.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2419.java
new file mode 100644
index 0000000..10a4939
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2419.java
@@ -0,0 +1,73 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鍑哄簱缁撶畻
+ * @Author CZT
+ * @Date 2024/7/25 14:58
+ */
+@Data
+public class Nx2024Api2419 implements Serializable {
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿" )
+ private String ckjsdh;
+
+ @PropertyDef(label = "鍚堝悓鍙�" )
+ private String hth;
+
+ @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)" )
+ private double jssl;
+
+ @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)" )
+ private double jsdj;
+
+ @PropertyDef(label = "缁撶畻閲戦(鍏�)" )
+ private double jsje;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "缁撶畻鏃堕棿" )
+ private Date jssj;
+
+ @PropertyDef(label = "缁撶畻鏂瑰紡" )
+ private String jsfs;
+
+ @PropertyDef(label = "浠樻浜�" )
+ private String fkr;
+
+ @PropertyDef(label = "閾惰琛屽埆浠g爜" )
+ private String yhhbdm;
+
+ @PropertyDef(label = "寮�鎴疯鍙�" )
+ private String khhh;
+
+ @PropertyDef(label = "寮�鎴疯鍚嶇О" )
+ private String khhmc;
+
+ @PropertyDef(label = "閾惰璐﹀彿" )
+ private String yhzh;
+
+ @PropertyDef(label = "鍙戠エ鍙风爜" )
+ private String fphm;
+
+ @PropertyDef(label = "鍙戠エ鐘舵��" )
+ private String fpzt;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐т綅浠g爜")
+ private String hwdm;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2420.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2420.java
new file mode 100644
index 0000000..7d2b65e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2420.java
@@ -0,0 +1,79 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鍊掍粨淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 14:59
+ */
+@Data
+public class Nx2024Api2420 implements Serializable {
+
+ @PropertyDef(label = "鍊掍粨鍗曞彿" )
+ private String dcdh;
+
+ @PropertyDef(label = "鍊掍粨绫诲瀷" )
+ private String dclx;
+
+ @PropertyDef(label = "鍊掍粨璁″垝鏂囦欢缂栧彿" )
+ private String dcjhwjbh;
+
+ @PropertyDef(label = "閫氱煡鍗曞彿" )
+ private String tzdh;
+
+ @PropertyDef(label = "鍊掑嚭鍗曚綅" )
+ private String dcdw;
+
+ @PropertyDef(label = "鍊掑叆鍗曚綅" )
+ private String drdw;
+
+ @PropertyDef(label = "鍊掑嚭搴撳尯缁熶竴缂栫爜")
+ private String dckqtybm;
+
+ @PropertyDef(label = "鍊掑叆搴撳尯缁熶竴缂栫爜")
+ private String drkqtybm;
+
+ @PropertyDef(label = "绮鍝佺浠g爜" )
+ private String lspzdm;
+
+ @PropertyDef(label = "鍊掑嚭璐т綅浠g爜" )
+ private String dchwdm;
+
+ @PropertyDef(label = "鍊掑叆璐т綅浠g爜" )
+ private String drhwdm;
+
+ @PropertyDef(label = "鍊掑嚭璐т綅缁熶竴缂栫爜" )
+ private String dchwtybm;
+
+ @PropertyDef(label = "鍊掑叆璐т綅缁熶竴缂栫爜" )
+ private String drhwtybm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掍粨鏃ユ湡" )
+ private Date dcrq;
+
+ @PropertyDef(label = "鍊掍粨鏁伴噺(鍏枻)" )
+ private double dcsl;
+
+ @PropertyDef(label = "鍖呰鐗�" )
+ private String bzw;
+
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)" )
+ private Integer bzbjs;
+
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅(,闅斿紑澶氫釜)" )
+ private String zxzydw;
+
+ @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/nx2024/dto/Nx2024Api2421.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2421.java
new file mode 100644
index 0000000..1010ede
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2421.java
@@ -0,0 +1,109 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-绮搴撳瓨
+ * @Author CZT
+ * @Date 2024/7/25 15:00
+ */
+@Data
+public class Nx2024Api2421 implements Serializable {
+
+ @JSONField(serialize = false)
+ private String id;
+
+ @PropertyDef(label = "璐т綅浠g爜")
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ private String lqgstydwbm;
+
+ @PropertyDef(label = "绮鍝佺浠g爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠g爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠g爜")
+ 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 = "绮潈褰掑睘鍗曚綅浠g爜")
+ private String lqgsdwdm;
+
+ @PropertyDef(label = "绠$悊鏂瑰紡")
+ private String glfs;
+
+ @PropertyDef(label = "鏀跺偍鍦扮偣")
+ private String scdd;
+
+ @PropertyDef(label = "鍌ㄧ伯鏂瑰紡")
+ private String clfs;
+
+ @PropertyDef(label = "璐т綅(娌圭綈)鐘舵��")
+ private String hwzt;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍏ヤ粨鏃堕棿")
+ private Date rcsj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "灏佷粨鏃ユ湡")
+ private Date fcrq;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑轰粨瀹屾垚鏃堕棿")
+ private Date ccwcsj;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "娓呬粨鏃堕棿")
+ private Date qcsj;
+
+ @PropertyDef(label = "瀹為檯鏁伴噺(鍏枻)")
+ private double sjsl;
+
+ @PropertyDef(label = "璁′环鏁伴噺(鍏枻)")
+ private double jjsl;
+
+ @PropertyDef(label = "鎴愯揣浣嶅墠鎹熻��(鍏枻)")
+ private double chwqsh;
+
+ @PropertyDef(label = "鍖呭瓨绮寘鏁�(鍖�)")
+ private Integer bclbs;
+
+ @PropertyDef(label = "瀹為檯瑁呯伯绾块珮(绫�)")
+ private double sjzlxg;
+
+ @PropertyDef(label = "绮爢浣撶Н(绔嬫柟绫�)")
+ private double ldtj;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @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/nx2024/dto/Nx2024Api2422.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2422.java
new file mode 100644
index 0000000..272fb23
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2422.java
@@ -0,0 +1,104 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鎹熺泭淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:01
+ */
+@Data
+public class Nx2024Api2422 implements Serializable {
+
+ @PropertyDef(label = "鎹熸孩鍗曞彿" )
+ private String sydh;
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ private Date ywrq;
+
+ @PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)" )
+ private double rkjz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿" )
+ private Date rksj;
+
+ @PropertyDef(label = "鍏ュ簱姘村垎(%)" )
+ private double rksf;
+
+ @PropertyDef(label = "鍏ュ簱鏉傝川(%)" )
+ private double rkzz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍑哄簱鏃堕棿" )
+ private Date cksj;
+
+ @PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)" )
+ private double ckjz;
+
+ @PropertyDef(label = "鍑哄簱姘村垎(%)" )
+ private double cksf;
+
+ @PropertyDef(label = "鍑哄簱鏉傝川(%)" )
+ private double ckzz;
+
+ @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)" )
+ private double jzsysl;
+
+ @PropertyDef(label = "鍏朵腑锛氭垚璐т綅鍓嶆崯鑰�(鍏枻)")
+ private double qzchwqsh;
+
+ @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
+ private double qzszkl;
+
+ @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)" )
+ private double qzzrshde;
+
+ @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
+ private double chsl;
+
+ @PropertyDef(label = "鎹熺泭鏄惁姝e父" )
+ private String sysfzc;
+
+ @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
+ private String sylx;
+
+ @PropertyDef(label = "鎹熸孩鍘熷洜" )
+ private String syyy;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�" )
+ private String ccshr;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�" )
+ private String zjshr;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�" )
+ private String tjshr;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�" )
+ private String kjshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�" )
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞" )
+ private String bz;
+
+ @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/nx2024/dto/Nx2024Api2423.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2423.java
new file mode 100644
index 0000000..9afe127
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2423.java
@@ -0,0 +1,74 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-绮鎬ц川杞彉
+ * @Author CZT
+ * @Date 2024/7/25 15:02
+ */
+@Data
+public class Nx2024Api2423 implements Serializable {
+
+
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿")
+ private String lsxzzbdh;
+
+ @PropertyDef(label = "璐т綅浠g爜")
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "绮鏁伴噺(鍏枻)")
+ private double lssl;
+
+ @PropertyDef(label = "鍒掕浆鏁伴噺(鍏枻)")
+ private double hzsl;
+
+ @PropertyDef(label = "鎵瑰噯鏂囧彿")
+ private String bzwh;
+
+ @PropertyDef(label = "绮鍝佺浠g爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "鍒掕浆鍓嶇伯椋熸�ц川浠g爜")
+ private String hzqlsxzdm;
+
+ @PropertyDef(label = "鍒掕浆鍚庣伯椋熸�ц川浠g爜")
+ private String hzhlsxzdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍒掕浆鏃ユ湡")
+ private Date hzrq;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�" )
+ private String ccshr;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�" )
+ private String zjshr;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�" )
+ private String tjshr;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�" )
+ private String kjshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�" )
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞" )
+ private String bz;
+
+ @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/nx2024/dto/Nx2024Api2424.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2424.java
new file mode 100644
index 0000000..a61d7c7
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2424.java
@@ -0,0 +1,59 @@
+package com.fzzy.push.nx2024.dto;
+
+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;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-璐﹂潰搴撳瓨
+ * @Author CZT
+ * @Date 2024/7/25 15:03
+ */
+@Data
+public class Nx2024Api2424 implements Serializable {
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "绮鍝佺浠g爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "骞村害" )
+ private String nd;
+
+ @PropertyDef(label = "鏈堜唤" )
+ @Column(name = "yf", length = 2)
+ private String yf;
+
+ @PropertyDef(label = "鏈熷垵鏁伴噺(鍏枻)" )
+ private double qcsl;
+
+ @PropertyDef(label = "鏈湡鏀跺叆鏁伴噺(鍏枻)" )
+ private double bqsrsl;
+
+ @PropertyDef(label = "鏈湡鏀嚭鏁伴噺(鍏枻)" )
+ private double bqzcsl;
+
+ @PropertyDef(label = "鏈熸湯鏁伴噺(鍏枻)" )
+ private double qmye;
+
+ @PropertyDef(label = "鏈堢粨鏍囧織" )
+ private Integer yjbz;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ private Date ywrq;
+
+ @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/nx2024/dto/Nx2024Api2425.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2425.java
new file mode 100644
index 0000000..a10b99e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2425.java
@@ -0,0 +1,78 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-瀹㈡埛淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:04
+ */
+@Data
+public class Nx2024Api2425 implements Serializable {
+
+ @PropertyDef(label = "鍗曚綅浠g爜")
+ private String dwdm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String dwmc;
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private String kqmc;
+
+ @PropertyDef(label = "瀹㈡埛绫诲瀷")
+ private String khlx;
+
+ @PropertyDef(label = "瀹㈡埛缁熶竴绀句細淇$敤浠g爜鎴栬韩浠借瘉鍙�")
+ private String khtyshxydmhsfzh;
+
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String khmc;
+
+ @PropertyDef(label = "娉曞畾浠h〃浜�")
+ private String fddbr;
+
+ @PropertyDef(label = "閫氳鍦板潃")
+ private String txdz;
+
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
+
+ @PropertyDef(label = "鑱旂郴浜哄鍚�")
+ private String lxrxm;
+
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ private String lxrdh;
+
+ @PropertyDef(label = "鑱旂郴浜鸿韩浠借瘉鍙�")
+ private String lxrsfzh;
+
+ @PropertyDef(label = "鐢靛瓙淇$")
+ private String dzyx;
+
+ @PropertyDef(label = "瀹㈡埛鏂瑰紑鎴疯")
+ private String khfkhh;
+
+ @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+ private String khfzh;
+
+ @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/nx2024/dto/Nx2024Api2426.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2426.java
new file mode 100644
index 0000000..d2c0127
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2426.java
@@ -0,0 +1,95 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-瀹夊叏绠$悊淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:05
+ */
+@Data
+public class Nx2024Api2426 implements Serializable {
+
+ @PropertyDef(label = "椋庨櫓鐐圭紪鐮�" )
+ private String fxdbm;
+
+ @PropertyDef(label = "搴撳尯浠g爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "鍗曚綅浠g爜" )
+ private String dwdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О" )
+ private String kqmc;
+
+ @PropertyDef(label = "鍦扮偣" )
+ private String dd;
+
+ @PropertyDef(label = "璇嗗埆浜�" )
+ private String sbr;
+
+ @PropertyDef(label = "鐜妭/閮ㄤ綅" )
+ private String hjbw;
+
+ @PropertyDef(label = "椋庨櫓淇℃伅" )
+ private String fxxx;
+
+ @PropertyDef(label = "椋庨櫓绫诲瀷" )
+ private String fxlx;
+
+ @PropertyDef(label = "椋庨櫓鍒嗙骇" )
+ private String fxfj;
+
+ @PropertyDef(label = "椋庨櫓绠℃帶鎺柦" )
+ private String fxglcs;
+
+ @JSONField(name = "Yhxx")
+ @PropertyDef(label = "闅愭偅淇℃伅" )
+ private String yhxx;
+
+ @PropertyDef(label = "闅愭偅鎺掓煡淇℃伅" )
+ private String yhpcxx;
+
+ @PropertyDef(label = "闅愭偅鏁存敼淇℃伅" )
+ private String yhzgxx;
+
+ @PropertyDef(label = "闅愭偅鏁存敼楠屾敹淇℃伅" )
+ private String yhysxx;
+
+ @PropertyDef(label = "浜嬫晠鍩烘湰淇℃伅" )
+ private String sgjbxx;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鏁存敼鏃堕檺" )
+ private Date zgsx;
+
+ @PropertyDef(label = "璐d换鍗曚綅" )
+ private String zrdw;
+
+ @PropertyDef(label = "璐d换浜�" )
+ private String zrr;
+
+ @PropertyDef(label = "鏁存敼楠屾敹淇℃伅" )
+ private String zgysxx;
+
+ @PropertyDef(label = "椋庨櫓璺熻釜鐩戠璐d换浜�" )
+ private String fxgzjgzrr;
+
+ @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/nx2024/dto/Nx2024Api2427.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2427.java
new file mode 100644
index 0000000..2c1e2aa
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2427.java
@@ -0,0 +1,64 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-娓╂箍搴︿俊鎭�
+ * @Author CZT
+ * @Date 2024/7/25 15:06
+ */
+@Data
+public class Nx2024Api2427 implements Serializable {
+
+ @PropertyDef(label = "娓╂箍搴︽娴嬪崟鍙�" )
+ private String wsdjcdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�娴嬫椂闂�")
+ private Date jcsj;
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "浠撴埧澶栨俯" )
+ private double cfww;
+
+ @PropertyDef(label = "浠撴埧澶栨箍" )
+ private double cfws;
+
+ @PropertyDef(label = "浠撴埧鍐呮俯" )
+ private double cfnw;
+
+ @PropertyDef(label = "浠撴埧鍐呮箍" )
+ private double cfns;
+
+ @PropertyDef(label = "绮鏈�楂樻俯" )
+ private double lszgw;
+
+ @PropertyDef(label = "绮鏈�浣庢俯" )
+ private double lszdw;
+
+ @PropertyDef(label = "绮骞冲潎娓�" )
+ private double lspjw;
+
+ @PropertyDef(label = "绮娓╁害鍊奸泦鍚�" )
+ private String lswdzjh;
+
+ @PropertyDef(label = "绮婀垮害鍊奸泦鍚�" )
+ private String lssdzjh;
+
+ @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/nx2024/dto/Nx2024Api2428.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2428.java
new file mode 100644
index 0000000..0a79e84
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2428.java
@@ -0,0 +1,55 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-铏淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:07
+ */
+@Data
+public class Nx2024Api2428 implements Serializable {
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬪崟鍙�" ,description = "鐢辫揣浣嶄唬鐮�+妫�娴嬫棩鏈燂紙yyyyMMdd锛�+4 浣嶉『搴忓彿缁勬垚")
+ private String hcjcdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�娴嬫椂闂�" )
+ private Date jcsj;
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "妫�鏌ュ铏柟娉�" )
+ private String jchcff;
+
+ @PropertyDef(label = "鍙戠敓閮ㄤ綅" )
+ private String fsbw;
+
+ @PropertyDef(label = "瀹宠櫕绉嶇被" )
+ private String hczl;
+
+ @PropertyDef(label = "铏彛瀵嗗害鍊奸泦鍚�" )
+ private String ckmdzjh;
+
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾" )
+ private String cldjpd;
+
+ @PropertyDef(label = "瀹宠櫕鎶楄嵂鎬у垎鏋�" )
+ private String hckyxfx;
+
+ @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/nx2024/dto/Nx2024Api2429.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2429.java
new file mode 100644
index 0000000..f8aa9ec
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2429.java
@@ -0,0 +1,58 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-姘斾綋淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:08
+ */
+@Data
+public class Nx2024Api2429 implements Serializable {
+
+ @PropertyDef(label = "姘斾綋娴撳害妫�娴嬪崟鍙�" )
+ private String qtndjcdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�娴嬫椂闂�" )
+ private Date jcsj;
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "姘ф皵鍚噺鍊奸泦鍚�" )
+ private String yqhlzjh;
+
+ @PropertyDef(label = "浜屾哀鍖栫⒊鍚噺鍊奸泦鍚�" )
+ private String eyhthlzjh;
+
+ @PropertyDef(label = "纭叞姘熸祿搴﹀�奸泦鍚�" )
+ private String lxfndzjh;
+
+ @PropertyDef(label = "纾峰寲姘㈡祿搴﹀�奸泦鍚�" )
+ private String lhqndzjh;
+
+ @PropertyDef(label = "涓�姘у寲姘惈閲忓�奸泦鍚�" )
+ private String yyhdhlzjh;
+
+ @PropertyDef(label = "涓�姘у寲纰冲惈閲忓�奸泦鍚�" )
+ private String yyhthlzjh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @PropertyDef(label = "浣滀笟绫诲瀷" )
+ private String zylx;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2430.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2430.java
new file mode 100644
index 0000000..cefc223
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2430.java
@@ -0,0 +1,180 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-閫氶浣滀笟
+ * @Author CZT
+ * @Date 2024/7/25 15:09
+ */
+@Data
+public class Nx2024Api2430 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "閫氶浣滀笟鍗曞彿" )
+ private String tfzydh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "閫氶鏃ユ湡" )
+ private Date tfrq;
+
+ @PropertyDef(label = "浠撴埧浠g爜" )
+ private String cfdm;
+
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
+ @PropertyDef(label = "閫氶鐩殑" )
+ private String tfmd;
+
+ @PropertyDef(label = "绮爢瀛旈殭搴�" )
+ private Double ldkxd;
+
+ @PropertyDef(label = "閫氶绫诲瀷" )
+ private String tflx;
+
+ @PropertyDef(label = "椋庨亾鍨嬪紡" )
+ private String fdxs;
+
+ @PropertyDef(label = "椋庣綉璁剧疆鏂瑰紡" )
+ private String fwszfs;
+
+ @PropertyDef(label = "涓婚閬撴埅闈㈢Н" )
+ private Double zfdjmj;
+
+ @PropertyDef(label = "鏀閬撴埅闈㈢Н" )
+ private Double zhfdjmj;
+
+ @PropertyDef(label = "鏀閬撴�婚暱搴�" )
+ private Double zfdzcd;
+
+ @PropertyDef(label = "椋庣綉寮�瀛旂巼" )
+ private Double fwkkl;
+
+ @PropertyDef(label = "绌烘皵閫斿緞姣�" )
+ private Double kqtjb;
+
+ @PropertyDef(label = "閫氶鍙h缃釜鏁�" )
+ private Integer tfkszgs;
+
+ @PropertyDef(label = "閫氶鏈哄瀷鍙�" )
+ private String tfjxh;
+
+ @PropertyDef(label = "閫氶鏈哄彴鏁�" )
+ private Integer tfjts;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍏ㄥ帇" )
+ private Double dtfjedqy;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾椋庨噺" )
+ private Double dtfjedfl;
+
+ @PropertyDef(label = "鍗曞彴椋庢満棰濆畾鍔熺巼" )
+ private Double dtfjedgl;
+
+ @PropertyDef(label = "閫侀鏂瑰紡" )
+ private String sffs;
+
+ @PropertyDef(label = "鍗曞彴椋庢満瀹炴祴椋庨噺" )
+ private Double dtfjscfl;
+
+ @PropertyDef(label = "鍗曞彴椋庢満杞村姛鐜�" )
+ private Double dtfjzgl;
+
+ @PropertyDef(label = "鎬婚閲�" )
+ private Double zfl;
+
+ @PropertyDef(label = "鍗曚綅閫氶閲�" )
+ private Double dwtfl;
+
+ @PropertyDef(label = "瀹炴祴绯荤粺闃诲姏" )
+ private Double scxtzl;
+
+ @PropertyDef(label = "鎬昏�楃數閲�" )
+ private Double zhdl;
+
+ @PropertyDef(label = "浣滀笟鏃舵皵娓�" )
+ private Double zysqw;
+
+ @PropertyDef(label = "浣滀笟鏃舵皵婀�" )
+ private Double zysqs;
+
+ @PropertyDef(label = "閫氶鏃堕暱" )
+ private Double tfsc;
+
+ @PropertyDef(label = "浣滀笟鍓嶅钩鍧囩伯娓�" )
+ private Double zyqpjlw;
+
+ @PropertyDef(label = "缁撴潫鍚庡钩鍧囩伯娓�" )
+ private Double jshpjlw;
+
+ @PropertyDef(label = "闄嶆俯骞呭害" )
+ private Double jwfd;
+
+ @PropertyDef(label = "鍚ㄧ伯闄嶆俯鑳借��" )
+ private Double dljwnh;
+
+ @PropertyDef(label = "澶辨按鐜�" )
+ private Double ssl;
+
+ @PropertyDef(label = "淇濇按鏁堟灉璇勪环缁撴灉" )
+ private String bsxgpjjg;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇鏁翠粨" )
+ private String tfjwjyxpjzc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓婂眰" )
+ private String tfjwjyxpjsc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓�(闂�)灞�" )
+ private String tfjwjyxpjzjc;
+
+ @PropertyDef(label = "閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓嬪眰" )
+ private String tfjwjyxpjxc;
+
+ @PropertyDef(label = "浣滀笟鍓嶅钩鍧囨按鍒�" )
+ private Double zyqpjsf;
+
+ @PropertyDef(label = "缁撴潫鍚庡钩鍧囨按鍒�" )
+ private Double zyhpjsf;
+
+ @PropertyDef(label = "闄嶆按骞呭害" )
+ private Double jsfd;
+
+ @PropertyDef(label = "鍚ㄧ伯闄嶆按鑳借��" )
+ private Double dljsnh;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨" )
+ private String tfjsjyxfxzc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓婂眰" )
+ private String tfjsjyxfxsc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓�(闂�)灞�" )
+ private String tfjsjyxfxzjc;
+
+ @PropertyDef(label = "閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓嬪眰" )
+ private String tfjsjyxfxxc;
+
+ @PropertyDef(label = "閫氶浣滀笟璐熻矗浜�" )
+ private String tfzyfzr;
+
+ @PropertyDef(label = "閫氶浣滀笟浜哄憳" )
+ private String tfzyry;
+
+ @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/nx2024/dto/Nx2024Api2431.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2431.java
new file mode 100644
index 0000000..252db77
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2431.java
@@ -0,0 +1,216 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鐔忚捀浣滀笟鏁版嵁琛�
+ * @Author CZT
+ * @Date 2024/7/25 15:10
+ */
+@Data
+public class Nx2024Api2431 implements Serializable {
+
+ @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿" )
+ private String xzzydh;
+
+ @PropertyDef(label = "浠撴埧浠g爜" )
+ private String cfdm;
+
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鐔忚捀寮�濮嬫椂闂�" )
+ private Date xzkssj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鐔忚捀缁撴潫鏃堕棿" )
+ private Date xzjssj;
+
+ @PropertyDef(label = "瀹宠櫕妫�娴嬪崟鍙�" )
+ private String hcjcdh;
+
+ @PropertyDef(label = "灏佷粨鍚庣啅钂哥殑娆℃暟 绗嚑娆$啅钂�" )
+ private Integer djcxz;
+
+ @PropertyDef(label = "甯歌鐔忚捀鏂瑰紡" )
+ private String cgxzfs;
+
+ @PropertyDef(label = "鐜祦鐔忚捀鏂瑰紡" )
+ private String hlxzfs;
+
+ @PropertyDef(label = "鐜祦鐔忚捀涓庡唴鐜祦鎶�鏈粨鍚�" )
+ private String hlxzynhljsjh;
+
+ @PropertyDef(label = "鐔忚捀鏂规鍒跺畾" )
+ private String xzfazd;
+
+ @PropertyDef(label = "鐔忚捀鏂规璧疯崏浜�" )
+ private String xzfaqcr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎵瑰噯浜�" )
+ private String xzfapzr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎶ュ鎯呭喌" )
+ private String xzfabbqk;
+
+ @PropertyDef(label = "鏂借嵂浜哄憳璧勮川鎯呭喌" )
+ private String syryzzqk;
+
+ @PropertyDef(label = "鏂借嵂璧勮川瀹℃牳" )
+ private String syzzsh;
+
+ @PropertyDef(label = "鑽墏鍚嶇О" )
+ private String yjmc;
+
+ @PropertyDef(label = "鍓傚瀷" )
+ private String jx;
+
+ @PropertyDef(label = "娴撳害" )
+ private Double nd;
+
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�" )
+ private Double lddwyyl;
+
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�" )
+ private Double kjdwyyl;
+
+ @PropertyDef(label = "鎬荤敤鑽噺" )
+ private Double zyyl;
+
+ @PropertyDef(label = "鏂借嵂鏂规硶" )
+ private String syff;
+
+ @PropertyDef(label = "杈呭姪鏂借嵂鎺柦" )
+ private String fzsycs;
+
+ @PropertyDef(label = "绌烘皵鍛煎惛鍣ㄥ強瀹夊叏妫�鏌ユ儏鍐�" )
+ private String kqhqjaqjcqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡娴嬭缃皟璇曟儏鍐�" )
+ private String lhqjczztsqk;
+
+ @PropertyDef(label = "姘ф皵娣卞害妫�娴嬭缃皟璇曟儏鍐�" )
+ private String yqsdjczztsqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡姤璀︿华瀹夊叏妫�鏌�" )
+ private String lhqbjyaqjc;
+
+ @PropertyDef(label = "姘ф皵鎶ヨ浠畨鍏ㄦ鏌�" )
+ private String yqbjyaqjc;
+
+ @PropertyDef(label = "琛ヨ嵂鍓嶄粨鍐呯7鍖栨阿娴撳害" )
+ private Double byqcnlhqnd;
+
+ @PropertyDef(label = "鐩爣娴撳害" )
+ private Double mbnd;
+
+ @PropertyDef(label = "璁$畻琛ヨ嵂閲�" )
+ private Double jsbyl;
+
+ @PropertyDef(label = "瀹為檯琛ヨ嵂閲�" )
+ private Double sjbyl;
+
+ @PropertyDef(label = "琛ヨ嵂鏂规硶" )
+ private String byff;
+
+ @PropertyDef(label = "浣滀笟浜烘暟" )
+ private Integer zyrs;
+
+ @PropertyDef(label = "琛ヨ嵂浣滀笟鎵瑰噯浜�" )
+ private String byzypzr;
+
+ @PropertyDef(label = "鐜板満鎸囨尌浜�" )
+ private String xczhr;
+
+ @PropertyDef(label = "宄板�兼祿搴�" )
+ private Double fznd;
+
+ @PropertyDef(label = "鐩爣娴撳害缁存寔澶╂暟" )
+ private Integer mbndwcts;
+
+ @PropertyDef(label = "婕忔皵浣嶇疆鐩戞祴" )
+ private String lswzjc;
+
+ @PropertyDef(label = "婕忔皵閮ㄤ綅閲囧彇鐨勮ˉ鏁戞帾鏂�" )
+ private String lqbwcqdbjcs;
+
+ @PropertyDef(label = "瀵嗛棴鏃堕棿" )
+ private Integer mbsj;
+
+ @PropertyDef(label = "CT鍊�" )
+ private Double ctz;
+
+ @PropertyDef(label = "鏁f皵鍓嶇7鍖栨阿娴撳害" )
+ private Double sqqlhqnd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ private Date sqrq;
+
+ @PropertyDef(label = "鏁f皵鏂规硶" )
+ private String sqff;
+
+ @PropertyDef(label = "鏁f皵鎵瑰噯浜�" )
+ private String sqpzr;
+
+ @PropertyDef(label = "鏁f皵鎸佺画澶╂暟" )
+ private Integer sqcsts;
+
+ @PropertyDef(label = "鏁f皵缁撴潫鏃剁7鍖栨阿娴撳害" )
+ private Double sqjsslhqnd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鏃堕棿" )
+ private Date czsjzysj;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟浜烘暟" )
+ private Integer czsjzyrs;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦鏂规硶" )
+ private String czsjff;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鎵瑰噯浜�" )
+ private String czsjzypzr;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎺柦" )
+ private String czclcs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊浣滀笟浜烘暟" )
+ private Integer czclzyrs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎵瑰噯浜�" )
+ private String czclpzr;
+
+ @PropertyDef(label = "鐔忚捀鍚庢椿铏鍑烘儏鍐�" )
+ private String xzhhcjcqk;
+
+ @PropertyDef(label = "鐔忚捀鍚庤櫕鍙e瘑搴�" )
+ private Integer xzhckmd;
+
+ @PropertyDef(label = "鍩瑰吇15澶╁悗娲昏櫕鏁�" )
+ private Integer pyswthhcs;
+
+ @PropertyDef(label = "鍩瑰吇45澶╁悗娲昏櫕鏁�" )
+ private Integer pysswthhcs;
+
+ @PropertyDef(label = "鐔忚捀鏁堟灉璇勪环" )
+ private String xzxgpj;
+
+ @PropertyDef(label = "鐔忚捀璐熻矗浜�" )
+ private String xzfzr;
+
+ @PropertyDef(label = "鐔忚捀浣滀笟浜哄憳" )
+ private String xzzyry;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @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/nx2024/dto/Nx2024Api2432.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2432.java
new file mode 100644
index 0000000..d0d2262
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2432.java
@@ -0,0 +1,61 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-浠撳唴瑙嗛鍥惧儚鏁版嵁琛�
+ * @Author CZT
+ * @Date 2024/7/25 15:11
+ */
+@Data
+public class Nx2024Api2432 implements Serializable {
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id" )
+ private String spjksbid;
+
+ @PropertyDef(label = "浠撴埧浠g爜" )
+ private String cfdm;
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "浠撳唴鍥惧儚鏂囦欢娴�" )
+ private String cntxwjl;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶撴媿鏃堕棿" )
+ private Date zpsj;
+
+ @PropertyDef(label = "鍥惧儚鏂囦欢鍚庣紑鍚�")
+ private String txwjhzm;
+
+ @JSONField(name="Yzwbh")
+ @PropertyDef(label = "棰勭疆浣嶇紪鍙�" )
+ private String yzwbh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @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/nx2024/dto/Nx2024Api2433.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2433.java
new file mode 100644
index 0000000..20bfe1c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2433.java
@@ -0,0 +1,71 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅鍩烘湰淇℃伅鏁版嵁琛�
+ * @Author CZT
+ * @Date 2024/7/25 15:12
+ */
+@Data
+public class Nx2024Api2433 implements Serializable {
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鍛婅鏃堕棿" )
+ private Date gjsj;
+
+ @PropertyDef(label = "搴撳尯鍚嶇О" )
+ private String kqmc;
+
+ @PropertyDef(label = "搴撳尯浠g爜" )
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "搴撳尯鍦板潃" )
+ private String kqdz;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id" )
+ private String spjksbid;
+
+ @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷" )
+ private String azwzlx;
+
+ @PropertyDef(label = "鐩戣鍖哄煙璇存槑" )
+ private String jsqysm;
+
+ @PropertyDef(label = "寮傚父鍛婅璇存槑" )
+ private String ycgjsm;
+
+ @PropertyDef(label = "鍥惧儚缂栧彿")
+ private String txbh;
+
+ @PropertyDef(label = "瑙嗛缂栧彿")
+ private String spbh;
+
+ @PropertyDef(label = "褰撳墠澶勭疆鐘舵��")
+ private String czzt;
+
+ @PropertyDef(label = "澶勭疆鍐呭")
+ private String hxczqk;
+
+ @PropertyDef(label = "澶勭疆浜�")
+ private String hxczr;
+
+ @PropertyDef(label = "澶勭疆鏃堕棿")
+ private Date hhxczsj;
+
+ @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/nx2024/dto/Nx2024Api2434.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2434.java
new file mode 100644
index 0000000..35d1aa0
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2434.java
@@ -0,0 +1,65 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-杩濊棰勮淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:13
+ */
+@Data
+public class Nx2024Api2434 implements Serializable {
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String wgdwtybm;
+
+ @PropertyDef(label = "棰勮淇℃伅浠g爜" )
+ private String yjxxdm;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "棰勮鍙戝竷鏃堕棿" )
+ private Date fbsj;
+
+ @PropertyDef(label = "杩濊涓讳綋绫诲瀷" )
+ private String wgztlx;
+
+ @PropertyDef(label = "杩濊鍗曚綅浠g爜" )
+ private String qydm;
+
+ @PropertyDef(label = "杩濊琛屼负浜�" )
+ private String wgxwr;
+
+ @PropertyDef(label = "娑夊強搴撶偣" )
+ private String sjkd;
+
+ @PropertyDef(label = "杩濊绫诲瀷" )
+ private String wglx;
+
+ @PropertyDef(label = "杩濊璇︽儏" )
+ private String wgqk;
+
+ @PropertyDef(label = "褰撳墠澶勭疆鐘舵��" )
+ private String czzt;
+
+ @PropertyDef(label = "澶勭疆鍐呭" )
+ private String hxczqk;
+
+ @PropertyDef(label = "澶勭疆浜�" )
+ private String hxczr;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "澶勭疆鏃堕棿" )
+ private Date hxczsj;
+
+ @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/nx2024/dto/Nx2024Api2435.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2435.java
new file mode 100644
index 0000000..1c594d0
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2435.java
@@ -0,0 +1,119 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-璐ㄦ淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:14
+ */
+@Data
+public class Nx2024Api2435 implements Serializable {
+
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿" )
+ private String zjbgdh;
+
+ @PropertyDef(label = "璐т綅浠g爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "绮鍝佺浠g爜" )
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠g爜" )
+ private String lsdjdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡" )
+ private Date rkrq;
+
+ @PropertyDef(label = "妫�楠岀被鍒�" )
+ private String jylb;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�楠屾椂闂�" )
+ private Date jysj;
+
+ @PropertyDef(label = "妫�楠屽崟浣�" )
+ private String jydw;
+
+ @PropertyDef(label = "妫�楠屼汉" )
+ private String jyr;
+
+ @PropertyDef(label = "妫�楠屼緷鎹�" )
+ private String jyyj;
+
+ @PropertyDef(label = "鎸囨爣绫诲埆" )
+ private String zblb;
+
+ @PropertyDef(label = "妫�楠岄」鐩�" )
+ private String jyxm;
+
+ @PropertyDef(label = "妫�楠岄」鐩��" )
+ private String jyxmz;
+
+ @PropertyDef(label = "鎸囨爣缁撴灉鍒ゅ畾" )
+ private String zbjgpd;
+
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸" )
+ private String spaqzbsfhg;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛惧彂鏃ユ湡" )
+ private Date qfrq;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶ュ憡鍑哄叿鏃堕棿" )
+ private Date bgcjsj;
+
+ @PropertyDef(label = "瀹℃牳浜哄鍚�" )
+ private String shrxm;
+
+ @PropertyDef(label = "鎵︽牱鍗曠紪鍙�" )
+ private String qydbh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎵︽牱鏃堕棿" )
+ private Date qysj;
+
+ @PropertyDef(label = "鎵︽牱鍖哄煙" )
+ private String qyqy;
+
+ @PropertyDef(label = "鎵︽牱浜哄鍚�" )
+ private String qyrxm;
+
+ @PropertyDef(label = "鐩戠潱浜哄鍚�" )
+ private String jdrxm;
+
+ @PropertyDef(label = "鏍峰搧缂栧彿" )
+ private String ypbh;
+
+ @PropertyDef(label = "鏍峰搧鏁伴噺" )
+ private double ypsl;
+
+ @PropertyDef(label = "浠h〃鏁伴噺" )
+ private double dbsl;
+
+ @PropertyDef(label = "鏍峰搧绛夌骇" )
+ private String ypdj;
+
+ @PropertyDef(label = "鏄惁姝e父瀛樺偍骞撮檺" )
+ private String sfzcccnx;
+
+ @PropertyDef(label = "澶囨敞" )
+ private String bz;
+
+ @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/nx2024/dto/Nx2024Api2436.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2436.java
new file mode 100644
index 0000000..f192dda
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2436.java
@@ -0,0 +1,54 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鍌ㄥ瑙勬ā淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:15
+ */
+@Data
+public class Nx2024Api2436 implements Serializable {
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "骞翠唤" )
+ private String nf;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠g爜" )
+ private String xzqhdm;
+
+ @PropertyDef(label = "鎵垮偍浼佷笟" )
+ private String ccqy;
+
+ @PropertyDef(label = "鎵垮偍浼佷笟缁熶竴浠g爜" )
+ private String ccqytydm;
+
+ @PropertyDef(label = "绮鍝佺" )
+ private String ylpz;
+
+ @PropertyDef(label = "绮鎬ц川" )
+ private String ylxz;
+
+ @PropertyDef(label = "鍌ㄥ瑙勬ā璁″垝鏁伴噺" )
+ private double ylcbgmjhsl;
+
+ @PropertyDef(label = "鍌ㄥ瑙勬ā璁″垝鏂囧彿" )
+ private String cbgmjhwh;
+
+ @PropertyDef(label = "澶囨敞" )
+ private String remarks;
+
+ @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/nx2024/dto/Nx2024Api2437.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2437.java
new file mode 100644
index 0000000..79fb966
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2437.java
@@ -0,0 +1,58 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-鍌ㄥ璁″垝淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:16
+ */
+@Data
+public class Nx2024Api2437 implements Serializable {
+
+ @PropertyDef(label = "璁″垝鍗曞彿" )
+ private String jhdh;
+
+ @PropertyDef(label = "璁″垝鏂囧彿" )
+ private String jhwh;
+
+ @PropertyDef(label = "璁″垝鍚嶇О" )
+ private String jhmc;
+
+ @PropertyDef(label = "璁″垝骞村害" )
+ private String jhnd;
+
+ @PropertyDef(label = "鍒跺畾璁″垝鍗曚綅" )
+ private String jhzddw;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿" )
+ private Date jhxdsj;
+
+ @PropertyDef(label = "绮鍝佺浠g爜" )
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠g爜" )
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠g爜" )
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏁伴噺" )
+ private Double sl;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2438.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2438.java
new file mode 100644
index 0000000..f240dd3
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2438.java
@@ -0,0 +1,56 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-杞崲璁″垝淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:17
+ */
+@Data
+public class Nx2024Api2438 implements Serializable {
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿", description = "鍗曚綅缂栫爜 + 4浣嶅勾浠� + 3浣嶉『搴忓彿")
+ private String lhjhdh;
+
+ @PropertyDef(label = "璁″垝鏂囧彿" )
+ private String jhwh;
+
+ @PropertyDef(label = "璁″垝鍚嶇О" )
+ private String jhmc;
+
+ @PropertyDef(label = "璁″垝骞村害" )
+ private String jhnd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬫墽琛屾棩鏈�" )
+ private Date kszxrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鎴鎵ц鏃ユ湡" )
+ private Date jzzxrq;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鍗曚綅" )
+ private String jhxddw;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String jhxddwtybm;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О" )
+ private String jhxddwmc;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿" )
+ private Date jhxdsj;
+
+ @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/nx2024/dto/Nx2024Api2439.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2439.java
new file mode 100644
index 0000000..8fdb4d8
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2439.java
@@ -0,0 +1,54 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-杞崲璁″垝鏄庣粏淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:18
+ */
+@Data
+public class Nx2024Api2439 implements Serializable {
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿" )
+ private String jhmxdh;
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿" )
+ private String lhjhdh;
+
+ @PropertyDef(label = "绮鍝佺浠g爜" )
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠g爜" )
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠g爜" )
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害" )
+ private String shnd;
+
+ @PropertyDef(label = "杞崲璐т綅浠g爜" )
+ private String lhhwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String lhhwtybm;
+
+ @PropertyDef(label = "杞崲鏁伴噺" )
+
+ private double lhsl;
+
+ @PropertyDef(label = "杞崲绫诲瀷" )
+ private String lhlx;
+
+ @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/nx2024/dto/Nx2024Api2440.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2440.java
new file mode 100644
index 0000000..9e7dbb2
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2440.java
@@ -0,0 +1,121 @@
+package com.fzzy.push.nx2024.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 瀹佸鐪佸钩鍙�2024鐗�-椤圭洰淇℃伅
+ * @Author CZT
+ * @Date 2024/7/25 15:19
+ */
+@Data
+public class Nx2024Api2440 implements Serializable {
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String xmdmtybm;
+
+ @PropertyDef(label = "椤圭洰浠g爜" )
+ private String xmdm;
+
+ @PropertyDef(label = "椤圭洰鍚嶇О" )
+ private String xmmc;
+
+ @PropertyDef(label = "琛屾斂鍖哄垝浠g爜" )
+ private String xzqhdm;
+
+ @PropertyDef(label = "骞翠唤" )
+ private String nf;
+
+ @PropertyDef(label = "椤圭洰绫诲瀷" )
+ private String xmlx;
+
+ @PropertyDef(label = "寤鸿鍐呭鍙婅妯�" )
+ private String jsnr;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鎷熷紑宸ユ椂闂�" )
+ private Date nkgsj;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鎷熷缓鎴愭椂闂�" )
+ private Date njcsj;
+
+ @PropertyDef(label = "寤鸿鐘舵��" )
+ private String jszt;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鐢虫姤鏃ユ湡" )
+ private Date sbrq;
+
+ @PropertyDef(label = "瀹℃壒鏂囧彿" )
+ private String spwh;
+
+ @PropertyDef(label = "椤圭洰(娉曚汉)鍗曚綅" )
+ private String xmdw;
+
+ @PropertyDef(label = "娉曚汉璇佺収绫诲瀷" )
+ private String fddbrzzlx;
+
+ @PropertyDef(label = "娉曚汉璇佺収鍙风爜" )
+ private String fddbrzzhm;
+
+ @PropertyDef(label = "鑱旂郴浜�" )
+ private String lxr;
+
+ @PropertyDef(label = "鑱旂郴鏂瑰紡" )
+ private String lxfs;
+
+ @PropertyDef(label = "鐢靛瓙閭" )
+ private String dzyx;
+
+ @PropertyDef(label = "寤鸿鍦扮偣" )
+ private String jsdd;
+
+ @PropertyDef(label = "鎬绘姇璧�" )
+ private double ztz;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鎶曡祫" )
+ private double gdzctz;
+
+ @PropertyDef(label = "涓ぎ璐㈡斂璧勯噾" )
+ private double zyczzj;
+
+ @PropertyDef(label = "鐪佽储鏀胯祫閲�" )
+ private double sczzj;
+
+ @JSONField(name = "sczzj01")
+ @PropertyDef(label = "甯傝储鏀胯祫閲�" )
+ private double sczzj2;
+
+ @PropertyDef(label = "閾惰璐锋" )
+ private double yhdk;
+
+ @PropertyDef(label = "鑲$エ鍊哄埜" )
+ private double gpzq;
+
+ @PropertyDef(label = "鍏惰祫閲�" )
+ private double qtzj;
+
+ @PropertyDef(label = "椤圭洰璧勬枡" )
+ private String xmzl;
+
+ @PropertyDef(label = "椤圭洰鍦板潃缁忓害" )
+ private double xmdzjd;
+
+ @PropertyDef(label = "椤圭洰鍦板潃绾害" )
+ private double zmdzwd;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2441.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2441.java
new file mode 100644
index 0000000..a1816dc
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2441.java
@@ -0,0 +1,59 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-璐㈠姟鎶ヨ〃鏁版嵁灏佽
+ * @Author CZT
+ * @Date 2024/7/25 15:20
+ */
+@Data
+public class Nx2024Api2441 implements Serializable {
+
+ @PropertyDef(label = "鍗曚綅浠g爜")
+ private String dwdm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "搴撳尯浠g爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "鎶ヨ〃鏈熷彿")
+ private String bbsj;
+
+ @PropertyDef(label = "鎶ヨ〃鍚�")
+ private String bbm;
+
+ @PropertyDef(label = "鎸囨爣搴忓彿")
+ private String zbxh;
+
+ @PropertyDef(label = "鎸囨爣鍚嶇О")
+ private String zbmc;
+
+ @PropertyDef(label = "鎸囨爣鍊� 1")
+ private String zbz1;
+
+ @PropertyDef(label = "鎸囨爣鍊� 2")
+ private String zbz2;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private String zhgxsj;
+
+ public Nx2024Api2441() {
+ }
+
+ public Nx2024Api2441(String zbmc, String zbz1, String zbz2){
+ this.zbmc = zbmc;
+ this.zbz1 = zbz1;
+ this.zbz2 = zbz2;
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024ReqDto.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024ReqDto.java
new file mode 100644
index 0000000..4babce1
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024ReqDto.java
@@ -0,0 +1,48 @@
+package com.fzzy.push.nx2024.dto;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-鎺ㄩ�佹暟鎹皝瑁�
+ * @Author CZT
+ * @Date 2024/7/25 15:21
+ */
+@Data
+public class Nx2024ReqDto implements Serializable {
+
+ /**
+ * 鎶ユ枃鏍囪瘑id
+ */
+ private String id;
+
+ /**
+ * 韬唤id
+ */
+ private String uid;
+
+ /**
+ * 鎸囦护id
+ */
+ private String orderid;
+
+ /**
+ * 韬唤绛惧悕
+ */
+ private String access_token;
+
+ /**
+ * 鏁版嵁鎬绘潯鏁�
+ */
+ private Integer datalength;
+
+ /**
+ * 涓婁紶鏁版嵁(闆嗗悎褰㈠紡)
+ */
+ private String data;
+
+ /**
+ * 鏁版嵁鎽樿
+ */
+ private String digst;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024RespDto.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024RespDto.java
new file mode 100644
index 0000000..e9849ad
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024RespDto.java
@@ -0,0 +1,30 @@
+package com.fzzy.push.nx2024.dto;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-涓婃姤鍙嶉灏佽
+ * @Author CZT
+ * @Date 2024/7/25 15:21
+ */
+@Data
+public class Nx2024RespDto<T> implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6714158228489303453L;
+
+ private int code ;
+
+ private String result;
+
+
+ public Nx2024RespDto() {
+ }
+
+ public Nx2024RespDto(int code, String result) {
+ this.code = code;
+ this.result = result;
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/package-info.java b/src/main/java/com/fzzy/push/nx2024/package-info.java
new file mode 100644
index 0000000..62bffe3
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 瀹佸鐪佸钩鍙�2024鐗�
+ */
+package com.fzzy.push.nx2024;
\ No newline at end of file
--
Gitblit v1.9.3