From c5d51d30305bd402673745cea1abce9fd1c4b443 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 11 十一月 2024 11:52:57 +0800
Subject: [PATCH] 上海接口升级调整V3.0
---
src/main/java/com/fzzy/push/sh2023/SH2023Constant.java | 15
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 18
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java | 112 ++
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java | 52
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 14
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java | 67 +
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java | 40
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java | 101 ++
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java | 68 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java | 79 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java | 41
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1213.java | 69 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java | 52
src/main/java/com/fzzy/push/gd2023/GD2023PushService12.java | 8
src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java | 42
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 10
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java | 47
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java | 36
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 10
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java | 80 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java | 171 +++
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 10
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java | 103 ++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java | 60 +
src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java | 6
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java | 77 +
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 2
src/main/java/com/fzzy/push/impl/ComPushService90.java | 211 ++++
src/main/java/com/fzzy/api/Constant.java | 38
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 192 ++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java | 6
/dev/null | 279 ------
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java | 86 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java | 47
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java | 126 ++
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 2
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java | 77 +
src/main/java/com/fzzy/push/gd2023/GD2023PushService13.java | 6
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java | 80 +
src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java | 14
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java | 62 +
44 files changed, 2,011 insertions(+), 629 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index fd727a2..77aa42b 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -33,6 +33,14 @@
* 鎺ュ彛鍒嗙被-琛屾斂绠＄悊
*/
public static String API_CATEGORY_14 = "14";
+ /**
+ * 鎺ュ彛鍒嗙被-璐㈠姟绫�
+ */
+ public static String API_CATEGORY_15 = "15";
+ /**
+ * 鎺ュ彛鍒嗙被-鍏朵粬绫诲埆
+ */
+ public static String API_CATEGORY_90 = "90";
/**
* 鎺ュ彛缂栫爜-1101 鍗曚綅淇℃伅鏁版嵁鎺ュ彛
@@ -201,9 +209,9 @@
* 鎺ュ彛缂栫爜-1405 椤圭洰淇℃伅鏁版嵁鎺ュ彛
*/
public static String API_CODE_1405 = "1405";
-
- //璐㈠姟鎶ヨ〃鎺ュ彛
- public static String API_CODE_1114 = "1114";
+ /**
+ * 璐㈠姟绫诲埆
+ */
public static String API_CODE_1501 = "1501";
public static String API_CODE_1502 = "1502";
public static String API_CODE_1503 = "1503";
@@ -214,6 +222,30 @@
public static String API_CODE_1508 = "1508";
public static String API_CODE_1509 = "1509";
public static String API_CODE_1510 = "1510";
+
+ /*===========涓婃捣甯傚畾鍒舵帴鍙�========*/
+ //鏁版嵁鐩哥鎬ф暟鎹帴鍙�
+ public static String API_CODE_9101 = "9101";
+ //瑙嗛鐩戞帶鎺ュ彛
+ public static String API_CODE_9102 = "9102";
+ //鍊掍粨鍊掑叆鏁版嵁鎺ュ彛
+ public static String API_CODE_9103 = "9103";
+ //绮儏璁惧閰嶇疆鏁版嵁鎺ュ彛
+ public static String API_CODE_9104 = "9104";
+ //妫�鏂ゅ崟鏁版嵁鎺ュ彛
+ public static String API_CODE_9105 = "9105";
+ //甯傚偍椹宠繍鍗曚俊鎭暟鎹帴鍙�
+ public static String API_CODE_9106 = "9106";
+ //浜ゆ槗涓績鍚堝悓淇″績鏁版嵁鎺ュ彛
+ public static String API_CODE_9107 = "9107";
+ //瀹氬寲姘存楠屾帴鍙�
+ public static String API_CODE_9108 = "9108";
+
+ /*===========骞夸笢瀹氬埗鎺ュ彛========*/
+ //鐔忚捀澶囨
+ public static String API_CODE_9201 = "9201";
+
+
/**
* 鍥芥爣鍑哄叆搴撶被鍨�
*/
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 110d78c..c5b003b 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -1147,7 +1147,7 @@
return ApiCodeConstant.API_CODE_CWBBXX;
case "1503":
return ApiCodeConstant.API_CODE_CWBBXX;
- case "1023":
+ case "9201":
return ApiCodeConstant.API_CODE_XZBA;
default:
return inteId;
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java b/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java
index 8bb4718..b1fba0a 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java
@@ -4,7 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService12;
import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@
@Autowired
private ComPushService12 pushService12;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService99;
@Override
public String getProtocol() {
@@ -75,9 +75,7 @@
pushService12.pushData1109(apiRemoteService, param);
//灏佷粨纭鍗�
- pushService99.pushData2001(apiRemoteService, param);
- //鍑烘竻纭鍗�
- pushService99.pushData2002(apiRemoteService, param);
+ pushService12.pushData1213(apiRemoteService, param);
log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java b/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java
index 59d8656..b25de71 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java
@@ -4,7 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService13;
import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@
@Autowired
private ComPushService13 pushService13;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService90;
@Override
public String getProtocol() {
@@ -54,7 +54,7 @@
pushService13.pushData1310(apiRemoteService, param);
//鐔忚捀澶囨
- pushService99.pushData1023(apiRemoteService, param);
+ pushService90.pushData9201(apiRemoteService, param);
}
}
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index a4c413e..fda9c26 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -1263,7 +1263,7 @@
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_CWBBXX;
case "1503":
return com.fzzy.push.gd2023.ApiCodeConstant.API_CODE_CWBBXX;
- case "1023":
+ case "9201":
return ApiCodeConstant.API_CODE_XZBA;
default:
return inteId;
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023PushService12.java b/src/main/java/com/fzzy/push/gd2023/GD2023PushService12.java
index d670a4b..d8c0253 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023PushService12.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023PushService12.java
@@ -4,7 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService12;
import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@
@Autowired
private ComPushService12 pushService12;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService99;
@Override
public String getProtocol() {
@@ -75,9 +75,7 @@
pushService12.pushData1109(apiRemoteService, param);
//灏佷粨纭鍗�
- pushService99.pushData2001(apiRemoteService, param);
- //鍑烘竻纭鍗�
- pushService99.pushData2002(apiRemoteService, param);
+ pushService12.pushData1213(apiRemoteService, param);
log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023PushService13.java b/src/main/java/com/fzzy/push/gd2023/GD2023PushService13.java
index ba2d620..2a7f3b1 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023PushService13.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023PushService13.java
@@ -4,7 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService13;
import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@
@Autowired
private ComPushService13 pushService13;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService90;
@Override
public String getProtocol() {
@@ -54,7 +54,7 @@
pushService13.pushData1310(apiRemoteService, param);
//鐔忚捀澶囨
- pushService99.pushData1023(apiRemoteService, param);
+ pushService90.pushData9201(apiRemoteService, param);
}
}
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService90.java b/src/main/java/com/fzzy/push/impl/ComPushService90.java
new file mode 100644
index 0000000..41e9401
--- /dev/null
+++ b/src/main/java/com/fzzy/push/impl/ComPushService90.java
@@ -0,0 +1,211 @@
+package com.fzzy.push.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.push.gd2022.dto.Gd2022Api1023;
+import com.fzzy.push.sh2023.SH2023Constant;
+import com.fzzy.push.sh2023.dto.SH2023Api1115;
+import com.fzzy.push.sh2023.dto.SH2023Api1311;
+import com.fzzy.push.sh2023.dto.SH2023Api2103;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description 鍚勭渷鐪佸钩鍙板畾鍒舵帴鍙�
+ * @Author CZT
+ * @Date 2024/4/22 15:31
+ */
+@Slf4j
+@Service
+public class ComPushService90 {
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/
+ /**
+ * 9101 鏁版嵁鐩哥鎬ф帴鍙�--涓婃捣甯傚钩鍙�
+ */
+ public void pushData9101(ApiRemoteService apiRemoteService, ApiParam param) {
+ // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9101);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鏁版嵁鐩哥鎬э紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_90);
+ param.setInteId(Constant.API_CODE_9101);
+
+ SH2023Api1115 shApi1115;
+ ResponseDto responseDto;
+ for (ApiInfoData infoData : items) {
+ shApi1115 = JSONObject.parseObject(infoData.getData(), SH2023Api1115.class);
+ shApi1115.setZhgxsj(infoData.getUpdateTime());
+
+ param.setBizId(infoData.getDataId());
+ responseDto = apiRemoteService.pushData(param, shApi1115);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
+ infoData.setCzbz(Constant.CZBZ_U);
+ shApi1115.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(shApi1115));
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ }
+ }
+
+ /**
+ * 9102 瑙嗛鐩戞帶鎺ュ彛--涓婃捣甯傚钩鍙�
+ */
+ public void pushData9102(ApiRemoteService apiRemoteService, ApiParam param) {
+ // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9102);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瑙嗛鐩戞帶锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_90);
+ param.setInteId(Constant.API_CODE_9102);
+
+ SH2023Api1311 shApi1311;
+ ResponseDto responseDto;
+ for (ApiInfoData infoData : items) {
+ shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
+ shApi1311.setZhgxsj(infoData.getUpdateTime());
+
+ param.setBizId(infoData.getDataId());
+ responseDto = apiRemoteService.pushData(param, shApi1311);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
+ infoData.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ }
+ }
+
+ /**
+ * 9103 鍊掍粨鍊掑叆--涓婃捣甯傚钩鍙�
+ */
+ public void pushData9103(ApiRemoteService apiRemoteService, ApiParam param) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
+ //TODO
+
+ }
+
+ /**
+ * 9104 绮儏璁惧閰嶇疆--涓婃捣甯傚钩鍙�
+ */
+ public void pushData9104(ApiRemoteService apiRemoteService, ApiParam param) {
+
+ // 鑾峰彇绮儏璁惧閰嶇疆鏁版嵁
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9104);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮儏璁惧閰嶇疆锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_90);
+ param.setInteId(Constant.API_CODE_9104);
+
+ SH2023Api2103 shApi2103;
+ ResponseDto responseDto;
+ for (ApiInfoData infoData : items) {
+ shApi2103 = JSONObject.parseObject(infoData.getData(), SH2023Api2103.class);
+ shApi2103.setZhgxsj(infoData.getUpdateTime());
+ param.setBizId(infoData.getDataId());
+ responseDto = apiRemoteService.pushData(param, shApi2103);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
+
+ infoData.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ }
+ }
+
+ /**
+ * 9105 妫�鏂ゅ崟--涓婃捣甯傚钩鍙�
+ */
+ public void pushData9105(ApiRemoteService apiRemoteService, ApiParam param) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
+ //TODO
+
+ }
+
+ /**
+ * 9106 甯傚偍椹宠繍鍗�--涓婃捣甯傚钩鍙�
+ */
+ public void pushData9106(ApiRemoteService apiRemoteService, ApiParam param) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
+ //TODO
+
+ }
+
+ /**
+ * 9107 浜ゆ槗涓績鍚堝悓
+ */
+ public void pushData9107(ApiRemoteService apiRemoteService, ApiParam param) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
+ //TODO
+ }
+
+ /**
+ * 9108 瀹氬寲姘存楠�
+ */
+ public void pushData9108(ApiRemoteService apiRemoteService, ApiParam param) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
+ //TODO
+
+ }
+
+ /*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙� -- 缁撴潫==========*/
+
+ /*==========骞夸笢鐪佸钩鍙板畾鍒舵帴鍙� -- 寮�濮�==========*/
+ /**
+ * 9201 鐔忚捀澶囨鎺ュ彛
+ */
+ public void pushData9201(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇鐔忚捀澶囨淇℃伅
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9201);
+
+ if (null == items || items.isEmpty()) {
+ log.error("-----骞夸笢鐪佸钩鍙�2022鐗堬細鏈幏鍙栧埌鐔忚捀澶囨淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_90);
+ param.setInteId(Constant.API_CODE_9201);
+
+ Gd2022Api1023 gd2022Api1023;
+ ResponseDto responseDto;
+ for (ApiInfoData infoData : items) {
+ gd2022Api1023 = JSONObject.parseObject(infoData.getData(), Gd2022Api1023.class);
+ gd2022Api1023.setZhgxsj(infoData.getUpdateTime());
+
+ param.setBizId(infoData.getDataId());
+ responseDto = apiRemoteService.pushData(param, gd2022Api1023);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
+ infoData.setCzbz(Constant.CZBZ_U);
+ gd2022Api1023.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(gd2022Api1023));
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ }
+ }
+ /*==========骞夸笢鐪佸钩鍙板畾鍒舵帴鍙� -- 缁撴潫==========*/
+
+}
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService99.java b/src/main/java/com/fzzy/push/impl/ComPushService99.java
deleted file mode 100644
index 547ea00..0000000
--- a/src/main/java/com/fzzy/push/impl/ComPushService99.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.fzzy.push.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fzzy.api.Constant;
-import com.fzzy.api.data.ApiParam;
-import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.ApiInfoData;
-import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.push.gd2022.ApiCodeConstant;
-import com.fzzy.push.gd2022.dto.Gd2022Api1023;
-import com.fzzy.push.gd2022.dto.Gd2022Api2001;
-import com.fzzy.push.gd2022.dto.Gd2022Api2002;
-import com.fzzy.push.sh2023.SH2023Constant;
-import com.fzzy.push.sh2023.dto.SH2023Api1115;
-import com.fzzy.push.sh2023.dto.SH2023Api1311;
-import com.fzzy.push.sh2023.dto.SH2023Api2103;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description 鍚勭渷鐪佸钩鍙板畾鍒舵帴鍙�
- * @Author CZT
- * @Date 2024/4/22 15:31
- */
-@Slf4j
-@Service
-public class ComPushService99 {
- @Autowired
- private ApiInfoDataRep apiInfoDataRep;
-
- /*==========涓婃捣甯傚钩鍙板畾鍒舵帴鍙�==========*/
- /**
- * 1115 鏁版嵁鐩哥鎬ф帴鍙�--涓婃捣甯傚钩鍙�
- */
- public void pushData1115(ApiRemoteService apiRemoteService, ApiParam param) {
- // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_1115);
-
- if (null == items || items.isEmpty()) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鏁版嵁鐩哥鎬э紝涓嶆帹閫�-----");
- return;
- }
- param.setInteCategory(Constant.API_CATEGORY_11);
- param.setInteId(SH2023Constant.SH_2023_API_CODE_1115);
-
- SH2023Api1115 shApi1115;
- ResponseDto responseDto;
- for (ApiInfoData infoData : items) {
- shApi1115 = JSONObject.parseObject(infoData.getData(), SH2023Api1115.class);
- shApi1115.setZhgxsj(infoData.getUpdateTime());
-
- param.setBizId(infoData.getDataId());
- responseDto = apiRemoteService.pushData(param, shApi1115);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
- infoData.setCzbz(Constant.CZBZ_U);
- shApi1115.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(shApi1115));
- apiInfoDataRep.save(infoData);
- }
- }
- }
- }
- /**
- * 2101 妫�鏂ゅ崟--涓婃捣甯傚钩鍙�
- */
- public void pushData2101(ApiRemoteService apiRemoteService, ApiParam param) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
- //TODO
-
- }
-
- /**
- * 2102 鍊掍粨鍊掑叆--涓婃捣甯傚钩鍙�
- */
- public void pushData2102(ApiRemoteService apiRemoteService, ApiParam param) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
- //TODO
-
- }
-
- /**
- * 2104 甯傚偍椹宠繍鍗�--涓婃捣甯傚钩鍙�
- */
- public void pushData2104(ApiRemoteService apiRemoteService, ApiParam param) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
- //TODO
-
- }
-
-
- /**
- * 1311 瑙嗛鐩戞帶鎺ュ彛--涓婃捣甯傚钩鍙�
- */
- public void pushData1311(ApiRemoteService apiRemoteService, ApiParam param) {
- // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_1311);
-
- if (null == items || items.isEmpty()) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瑙嗛鐩戞帶锛屼笉鎺ㄩ��-----");
- return;
- }
- param.setInteCategory(Constant.API_CATEGORY_13);
- param.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
-
- SH2023Api1311 shApi1311;
- ResponseDto responseDto;
- for (ApiInfoData infoData : items) {
- shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
- shApi1311.setZhgxsj(infoData.getUpdateTime());
-
- param.setBizId(infoData.getDataId());
- responseDto = apiRemoteService.pushData(param, shApi1311);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
- infoData.setCzbz(Constant.CZBZ_U);
- apiInfoDataRep.save(infoData);
- }
- }
- }
- }
-
- /**
- * 2103 绮儏璁惧閰嶇疆--涓婃捣甯傚钩鍙�
- */
- public void pushData2103(ApiRemoteService apiRemoteService, ApiParam param) {
-
- // 鑾峰彇绮儏璁惧閰嶇疆鏁版嵁
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2103);
-
- if (null == items || items.isEmpty()) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮儏璁惧閰嶇疆锛屼笉鎺ㄩ��-----");
- return;
- }
- param.setInteCategory(Constant.API_CATEGORY_13);
- param.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
-
- SH2023Api2103 shApi2103;
- ResponseDto responseDto;
- for (ApiInfoData infoData : items) {
- shApi2103 = JSONObject.parseObject(infoData.getData(), SH2023Api2103.class);
- shApi2103.setZhgxsj(infoData.getUpdateTime());
- param.setBizId(infoData.getDataId());
- responseDto = apiRemoteService.pushData(param, shApi2103);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
-
- infoData.setCzbz(Constant.CZBZ_U);
- apiInfoDataRep.save(infoData);
- }
- }
- }
- }
-
- /**
- * 2203 浜ゆ槗涓績鍚堝悓
- */
- public void pushData2203(ApiRemoteService apiRemoteService, ApiParam param) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
- //TODO
- }
-
- /**
- * 2204 瀹氬寲姘存楠�
- */
- public void pushData2204(ApiRemoteService apiRemoteService, ApiParam param) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細瀹氬寲姘存楠屾殏鏈疄鐜帮紝涓嶆帹閫�-----");
- //TODO
-
- }
-
-
-
- /*==========骞夸笢鐪佸钩鍙板畾鍒舵帴鍙�==========*/
- /**
- * 1023 鐔忚捀澶囨鎺ュ彛
- */
- public void pushData1023(ApiRemoteService apiRemoteService, ApiParam param) {
- //鑾峰彇鐔忚捀澶囨淇℃伅
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(ApiCodeConstant.API_1023);
-
- if (null == items || items.isEmpty()) {
- log.error("-----骞夸笢鐪佸钩鍙�2022鐗堬細鏈幏鍙栧埌鐔忚捀澶囨淇℃伅锛屼笉鎺ㄩ��-----");
- return;
- }
- param.setInteCategory("21");
- param.setInteId(ApiCodeConstant.API_1023);
-
- Gd2022Api1023 gd2022Api1023;
- ResponseDto responseDto;
- for (ApiInfoData infoData : items) {
- gd2022Api1023 = JSONObject.parseObject(infoData.getData(), Gd2022Api1023.class);
- gd2022Api1023.setZhgxsj(infoData.getUpdateTime());
-
- param.setBizId(infoData.getDataId());
- responseDto = apiRemoteService.pushData(param, gd2022Api1023);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
- infoData.setCzbz(Constant.CZBZ_U);
- gd2022Api1023.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(gd2022Api1023));
- apiInfoDataRep.save(infoData);
- }
- }
- }
- }
-
- /**
- * 2001 灏佷粨纭鍗�
- */
- public void pushData2001(ApiRemoteService apiRemoteService, ApiParam param) {
- // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(ApiCodeConstant.API_2001);
-
- if (null == items || items.isEmpty()) {
- log.error("-----骞夸笢鐪佸钩鍙�2022鐗堬細鏈幏鍙栧埌灏佷粨纭鍗曪紝涓嶆帹閫�-----");
- return;
- }
- param.setInteCategory("21");
- param.setInteId(ApiCodeConstant.API_2001);
-
- Gd2022Api2001 gd2022Api2001;
- ResponseDto responseDto;
- for (ApiInfoData infoData : items) {
- gd2022Api2001 = JSONObject.parseObject(infoData.getData(), Gd2022Api2001.class);
- gd2022Api2001.setZhgxsj(infoData.getUpdateTime());
-
- param.setBizId(infoData.getDataId());
- responseDto = apiRemoteService.pushData(param, gd2022Api2001);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
- infoData.setCzbz(Constant.CZBZ_U);
- gd2022Api2001.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(gd2022Api2001));
- apiInfoDataRep.save(infoData);
- }
- }
- }
- }
-
- /**
- * 2002 鍑烘竻纭鍗�
- */
- public void pushData2002(ApiRemoteService apiRemoteService, ApiParam param) {
- // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
- List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(ApiCodeConstant.API_2002);
-
- if (null == items || items.isEmpty()) {
- log.error("-----骞夸笢鐪佸钩鍙�2022鐗堬細鏈幏鍙栧埌鍑烘竻纭鍗曪紝涓嶆帹閫�-----");
- return;
- }
- param.setInteCategory("21");
- param.setInteId(ApiCodeConstant.API_2002);
-
- Gd2022Api2002 gd2022Api2002;
- ResponseDto responseDto;
- for (ApiInfoData infoData : items) {
- gd2022Api2002 = JSONObject.parseObject(infoData.getData(), Gd2022Api2002.class);
- gd2022Api2002.setZhgxsj(infoData.getUpdateTime());
-
- param.setBizId(infoData.getDataId());
- responseDto = apiRemoteService.pushData(param, gd2022Api2002);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
- infoData.setCzbz(Constant.CZBZ_U);
- gd2022Api2002.setCzbz(Constant.CZBZ_U);
- infoData.setData(JSON.toJSONString(gd2022Api2002));
- apiInfoDataRep.save(infoData);
- }
- }
- }
- }
-
-}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 1dafcb8..a02c4df 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -770,16 +770,6 @@
Api1504 api1504 = (Api1504)data;
Nx2023Api1504 apiData = new Nx2023Api1504();
BeanUtils.copyProperties(api1504, apiData);
- //璁剧疆绲变竴鍗曚綅缂栫爜
- if (StringUtils.isEmpty(apiData.getXqydm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
- apiData.setXqydm(tydwbm);
- }
- //璁剧疆绲变竴搴撳尯缂栫爜
- if (StringUtils.isEmpty(apiData.getXkqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
- apiData.setXkqdm(tykqbm);
- }
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
index 6d001fc..3590d16 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -17,53 +18,69 @@
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "璐﹀鍚嶇О")
- private String cAcctName;
+ @JsonProperty("cAcctName")
+ private String cncctname;
@PropertyDef(label = "鏈綅甯�")
- private String cCurrency;
+ @JsonProperty("cCurrency")
+ private String ccurrency;
@PropertyDef(label = "浼氳涓荤")
- private String cAcctChief;
+ @JsonProperty("cAcctChief")
+ private String cacctchief;
- @JSONField(format = "yyyy-MM-dd")
+ @JSONField(format = "yyyyMM")
@PropertyDef(label = "鍚敤鏈熼棿")
- private String cPeriodStart;
+ @JsonProperty("cPeriodStart")
+ private Date cperiodstart;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍚敤鏃ユ湡")
- private String cYearBmd;
+ @JsonProperty("cYearBmd")
+ private Date cyearbmd;
@PropertyDef(label = "鏈熼棿鏁�")
- private Double nAcctPeriodNum;
+ @JsonProperty("nAcctPeriodNum")
+ private Integer nacctperiodnum;
@PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
- private String cAccClassCode;
+ @JsonProperty("cAccClassCode")
+ private String caccclasscode;
@PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
- private Double nAccGrade;
+ @JsonProperty("nAccGrade")
+ private Integer naccgrade;
@PropertyDef(label = "绉戠洰缂栫爜瑙勫垯", description = "4222XXXX:榛樿鍓嶅洓绾х骇闀胯鍒欎负4222")
- private String cAccCodeStr;
+ @JsonProperty("cAccCodeStr")
+ private String cacccodestr;
@PropertyDef(label = "鍗曚綅鍚嶇О")
- private String cCropName;
+ @JsonProperty("cCropName")
+ private String ccropname;
@PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String cOrgCode;
+ @JsonProperty("cOrgCode")
+ private String corgcode;
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String xqydm;
+ @JsonProperty("xqydm")
+ private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String xkqdm;
+ @JsonProperty("xkqdm")
+ private String tykqbm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java
index 0f1f3fa..3f38439 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1505.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -15,20 +16,29 @@
@Data
public class Nx2023Api1505 implements Serializable {
+ @PropertyDef(label = "id涓婚敭")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "骞村害")
- private String cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "绉戠洰缂栫爜")
- private String cCode;
+ @JsonProperty("cCode")
+ private String ccode;
@PropertyDef(label = "绉戠洰鍚嶇О")
- private String cName;
+ @JsonProperty("cName")
+ private String cname;
@PropertyDef(label = "绉戠洰鍏ㄧО")
- private String cAllName;
+ @JsonProperty("cAllName")
+ private String callname;
/**
* 1:璧勪骇绫�
@@ -39,41 +49,53 @@
* 6:鎹熺泭绫�
*/
@PropertyDef(label = "绉戠洰绫诲埆")
- private String nClass;
+ @JsonProperty("nClass")
+ private String nclass;
/**
* (-1)-璐锋柟锛�1-鍊熸柟
*/
@PropertyDef(label = "浣欓鏂瑰悜")
- private String cDc;
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "鏈骇绉戠洰")
- private String bL;
+ @JsonProperty("bL")
+ private Integer bl;
@PropertyDef(label = "绉戠洰绾ф")
- private Double nGrade;
+ @JsonProperty("nGrade")
+ private Integer ngrade;
@PropertyDef(label = "鏁伴噺绉戠洰")
- private String bQ;
+ @JsonProperty("bQ")
+ private Integer bq;
@PropertyDef(label = "鏁伴噺鍗曚綅")
- private String cQUnit;
+ @JsonProperty("cQUnit")
+ private Integer cqunit;
@PropertyDef(label = "鐜伴噾绫荤鐩�")
- private String bCash;
+ @JsonProperty("bCash")
+ private Integer bcash;
@PropertyDef(label = "閾惰绫荤鐩�")
- private String bBank;
+ @JsonProperty("bBank")
+ private Integer bbank;
@PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
- private String bXjll;
+ @JsonProperty("bXjll")
+ private Integer bxjll;
@PropertyDef(label = "鍐荤粨")
- private String bF;
+ @JsonProperty("bF")
+ private Integer bf;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java
index 5bded04..cb292d8 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1506.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -15,61 +16,88 @@
@Data
public class Nx2023Api1506 implements Serializable {
+
+ @PropertyDef(label = "ID_")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鏈熼棿")
- private String cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "骞村害")
- private String nNo;
+ @JsonProperty("nNo")
+ private Integer nno;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @JsonProperty("cCode")
+ private String ccode;
@PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
- private Double bM;
+ @JsonProperty("bM")
+ private Double bm;
@PropertyDef(label = "鏈熸湯鏈綅甯佷綑棰�")
- private Double eM;
+ @JsonProperty("eM")
+ private Double em;
@PropertyDef(label = "鏈熷垵鏁伴噺")
- private Double bQty;
+ @JsonProperty("bQty")
+ private Double bqty;
@PropertyDef(label = "鏈熸湯鏁伴噺")
- private Double eQty;
+ @JsonProperty("eQty")
+ private Double eqty;
/**
* 1:鍊熸柟
* -1:璐锋柟
*/
@PropertyDef(label = "浣欓鏂瑰悜")
- private String cDc;
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
- private Double dM;
+ @JsonProperty("dM")
+ private Double dm;
@PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
- private Double cM;
+ @JsonProperty("cM")
+ private Double cm;
@PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
- private Double dQ;
+ @JsonProperty("dQ")
+ private Double dq;
@PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
- private Double cQ;
+ @JsonProperty("cQ")
+ private Double cq;
@PropertyDef(label = "鏈熷垵澶栧竵浣欓")
- private Double bFm;
+ @JsonProperty("bFm")
+ private Double bfm;
@PropertyDef(label = "鏈熸湯澶栧竵浣欓")
- private Double eFm;
+ @JsonProperty("eFm")
+ private Double efm;
@PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
- private Double dFm;
+ @JsonProperty("dFm")
+ private Double dfm;
@PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
- private Double cFm;
+ @JsonProperty("cFm")
+ private Double cfm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java
index 8d005d2..0eaae8a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1507.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -15,89 +16,111 @@
@Data
public class Nx2023Api1507 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍑瘉绫诲瀷")
- private String cVKind;
+ @JsonProperty("cVKind")
+ private String cvkind;
@PropertyDef(label = "鏈熼棿")
- private Double cMon;
+ @JsonProperty("cMon")
+ private Integer cmon;
@PropertyDef(label = "骞村害")
- private Double cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "鍑瘉鍙�")
- private Double nVNo;
+ @JsonProperty("nVNo")
+ private Integer nvno;
@PropertyDef(label = "鍒嗗綍搴忓彿")
- private Double nNo;
-
- @PropertyDef(label = "鍑瘉鍒嗙被")
- private Double bTmp;
+ @JsonProperty("nNo")
+ private Integer nno;
@PropertyDef(label = "鎽樿")
- private String Digest;
+ @JsonProperty("Digest")
+ private String digest;
@PropertyDef(label = "绉戠洰缂栫爜")
- private Double cCode;
+ @JsonProperty("cCode")
+ private String ccode;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍑瘉鏃ユ湡")
- private String cVSmallDatetime;
+ @JsonProperty("cVSmallDatetime")
+ private Date ccsmalldatetime;
@PropertyDef(label = "鍒跺崟浜�")
- private String cMaker;
+ @JsonProperty("cMaker")
+ private String cmaker;
/**
* 1:鍊熸柟
* -1:璐锋柟
*/
@PropertyDef(label = "鏂瑰悜")
- private String cDc;
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "瀹℃牳浜�")
- private String cCkEr;
+ @JsonProperty("cCkEr")
+ private String ccker;
@PropertyDef(label = "璁拌处浜�")
- private String cPtEr;
+ @JsonProperty("cPtEr")
+ private String cpter;
/**
* 0:鍚�
* 1:鏄�
*/
@PropertyDef(label = "璁拌处鏍囧織")
- private Double bPt;
+ @JsonProperty("bPt")
+ private Integer bpt;
@PropertyDef(label = "闄勪欢寮犳暟")
- private Double nANum;
+ @JsonProperty("nANum")
+ private Integer nanum;
@PropertyDef(label = "閲戦")
- private Double nM;
+ @JsonProperty("nM")
+ private Double nm;
@PropertyDef(label = "鏁伴噺")
- private Double nQty;
+ @JsonProperty("nQty")
+ private Double nqty;
@PropertyDef(label = "鍗曚环")
- private Double nPrice;
-
- @PropertyDef(label = "缁撶畻鍙�")
- private String cSettleNo;
+ @JsonProperty("nPrice")
+ private Double nprice;
@PropertyDef(label = "鍑虹撼")
- private String cCashier;
+ @JsonProperty("cCashier")
+ private String ccashier;
@PropertyDef(label = "姹囩巼")
+ @JsonProperty("rate")
private Double rate;
@PropertyDef(label = "澶栧竵閲戦")
- private Double nFm;
+ @JsonProperty("nFm")
+ private Double nfm;
@PropertyDef(label = "璁￠噺鍗曚綅",description = "璁￠噺鍗曚綅姹夊瓧")
- private String meterUnitId;
+ @JsonProperty("meterUnitId")
+ private String meterunitid;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java
index 8da3701..c81ffb1 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1508.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -16,48 +17,64 @@
public class Nx2023Api1508 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍑瘉绫诲瀷")
- private String cVKind;
+ @JsonProperty("cVKind")
+ private String cvkind;
@PropertyDef(label = "鏈熼棿")
- private Double cMon;
+ @JsonProperty("cMon")
+ private Integer cmon;
@PropertyDef(label = "骞村害")
- private Double cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "鍑瘉鍙�")
- private Double nVNo;
+ @JsonProperty("nVNo")
+ private Integer nvno;
@PropertyDef(label = "绉戠洰缂栫爜")
- private String cCode;
+ @JsonProperty("cCode")
+ private String ccode;
@PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
- private String cDFCode;
+ @JsonProperty("cDFCode")
+ private String cdfcode;
@PropertyDef(label = "鐜伴噾娴侀噺椤圭洰浠ｇ爜")
- private String cCashCode;
+ @JsonProperty("cCashCode")
+ private String ccashcode;
@PropertyDef(label = "鍒嗗綍搴忓彿")
- private Double nNo;
+ @JsonProperty("nNo")
+ private Integer nrowno;
@PropertyDef(label = "閲戦")
- private Double nM;
+ @JsonProperty("nM")
+ private Double nm;
/**
* 1:娴佸叆
* -1:娴佸嚭
*/
@PropertyDef(label = "鏂瑰悜")
- private String cDc;
-
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java
index 25fe5db..d9de48a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1509.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -15,29 +16,42 @@
@Data
public class Nx2023Api1509 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
- private String fixAssetCode;
+ @JsonProperty("fixAssetCode")
+ private String fixassetcode;
@PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
- private String origFixAssetCode;
+ @JsonProperty("origFixAssetCode")
+ private String origfixassetcode;
@PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
- private String groupCode;
+ @JsonProperty("groupCode")
+ private String groupcode;
@PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
- private String fixAssetName;
+ @JsonProperty("fixAssetName")
+ private String fixassetname;
@PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
- private String unitName;
+ @JsonProperty("unitName")
+ private String unitname;
@PropertyDef(label = "鍘熷��")
- private Double valueOrg;
+ @JsonProperty("valueOrg")
+ private Double valueorg;
@PropertyDef(label = "褰撳墠鍘熷��")
- private Double dresentValueOrg;
+ @JsonProperty("dresentValueOrg")
+ private Double dresentvalueorg;
+
/**
* 1:涓嶆彁鎶樻棫娉�
* 2:骞冲潎骞撮檺娉�
@@ -47,10 +61,9 @@
* 6:鍙屽�嶄綑棰濋�掑噺娉�
*/
@PropertyDef(label = "鎶樻棫鏂规硶")
- private Double deprMethodId;
+ @JsonProperty("deprMethodId")
+ private Integer deprmethodid;
- @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
- private Double sourceid;
/**
* 1:鎶曡祫
* 2:鑷缓
@@ -61,59 +74,74 @@
* 7:鎹愯禒
* 8:鎹㈠叆
*/
- @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
- private String cDFCode;
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ @JsonProperty("sourceid")
+ private Integer sourceid;
@PropertyDef(label = "鍨嬪彿")
+ @JsonProperty("model")
private String model;
@PropertyDef(label = "瑙勬牸")
+ @JsonProperty("specs")
private String specs;
@PropertyDef(label = "鍒堕�犲晢")
+ @JsonProperty("manufacturer")
private String manufacturer;
@PropertyDef(label = "浜у湴")
- private String makingPlace;
+ @JsonProperty("makingPlace")
+ private String makingplace;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "杩涘崟浣嶆棩鏈�")
- private String enterDay;
+ @JsonProperty("enterDay")
+ private Date enterday;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
- private String beginUseDay;
+ @JsonProperty("beginUseDay")
+ private Date beginuseday;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寤哄崱鏃ユ湡")
- private String makinDay;
+ @JsonProperty("makinDay")
+ private Date makinday;
@PropertyDef(label = "绠＄悊浜�")
+ @JsonProperty("keeper")
private String keeper;
@PropertyDef(label = "寤哄崱浜�")
+ @JsonProperty("maker")
private String maker;
@PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
- private Double usingPeriods;
+ @JsonProperty("usingPeriods")
+ private Integer usingperiods;
@PropertyDef(label = "棰勮鍑�娈嬪��")
- private Double expecRemain;
+ @JsonProperty("expecRemain")
+ private Double expecremain;
@PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
- private String assetAcctCode;
+ @JsonProperty("assetAcctCode")
+ private String assetacctcode;
@PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
- private String deprAcctCode;
-
+ @JsonProperty("deprAcctCode")
+ private String depracctcode;
@PropertyDef(label = "绱鎶樻棫")
- private Double accumulateDepr;
+ @JsonProperty("accumulateDepr")
+ private Double accumulatedepr;
/**
* 0:鍚�
* 1:鏄�
*/
@PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
+ @JsonProperty("abadoned")
private String abadoned;
/**
@@ -125,15 +153,19 @@
* 6:鐩樹簭
*/
@PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
- private String presentStatus;
+ @JsonProperty("presentStatus")
+ private String presentstatus;
@PropertyDef(label = "澶囨敞")
+ @JsonProperty("notes")
private String notes;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java
index ce0da1a..40fa85b 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1510.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -15,70 +16,96 @@
@Data
public class Nx2023Api1510 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
- private String fixAssetCode;
+ @JsonProperty("fixAssetCode")
+ private String fixassetcode;
@PropertyDef(label = "鏈熼棿")
- private Double period;
+ @JsonProperty("period")
+ private Integer period;
@PropertyDef(label = "骞村害")
- private Double AcctYear;
+ @JsonProperty("AcctYear")
+ private Integer acctyear;
@PropertyDef(label = "鏈熷垵鍘熷��")
- private Double bValueOrg;
+ @JsonProperty("bValueOrg")
+ private Double bvalueorg;
@PropertyDef(label = "绱鎶樻棫")
- private Double bAccumDepr;
+ @JsonProperty("bAccumDepr")
+ private Double baccumdepr;
@PropertyDef(label = "鏈湡璁℃彁鎶樻棫")
- private Double deprAmmount;
+ @JsonProperty("deprAmmount")
+ private Double deprammount;
@PropertyDef(label = "鏈勾绱璁℃彁鎶樻棫")
- private Double yAccumDepr;
+ @JsonProperty("yAccumDepr")
+ private Double yaccumdepr;
@PropertyDef(label = "鏈湡鏁伴噺澧炲姞")
- private Double qtyAdd;
+ @JsonProperty("qtyAdd")
+ private Double qtyadd;
@PropertyDef(label = "鏈湡鏁伴噺鍑忓皯")
- private Double qtyDecrease;
+ @JsonProperty("qtyDecrease")
+ private Double qtydecrease;
@PropertyDef(label = "鏈湡鍘熷�煎鍔�")
- private Double valueOrgAdd;
+ @JsonProperty("valueOrgAdd")
+ private Double valueorgadd;
@PropertyDef(label = "鏈湡鍘熷�煎噺灏�")
- private Double valueOrgDerease;
+ @JsonProperty("valueOrgDerease")
+ private Double valueorgderease;
@PropertyDef(label = "鏈湡绱鎶樻棫璋冨")
- private Double accuDeprAdjustAdd;
+ @JsonProperty("accuDeprAdjustAdd")
+ private Double accudepradjustadd;
@PropertyDef(label = "鏈湡绱鎶樻棫璋冨噺")
- private Double accuDeprAdjustDec;
+ @JsonProperty("accuDeprAdjustDec")
+ private Double accudepradjustdec;
@PropertyDef(label = "鏈勾绱鏁伴噺澧炲姞")
- private Double yQtyIncrease;
+ @JsonProperty("yQtyIncrease")
+ private Double yqtyIncrease;
@PropertyDef(label = "鏈勾绱鏁伴噺鍑忓皯")
- private Double yQtyDecrease;
+ @JsonProperty("yQtyDecrease")
+ private Double yqtydecrease;
@PropertyDef(label = "鏈勾鍘熷�肩疮璁″鍔�")
- private Double yValueIncrease;
+ @JsonProperty("yValueIncrease")
+ private Double yvalueincrease;
@PropertyDef(label = "鏈勾鍘熷�肩疮璁″噺灏�")
- private Double yValueDecrease;
+ @JsonProperty("yValueDecrease")
+ private Double yvaluedecrease;
@PropertyDef(label = "鏈勾绱鎶樻棫璋冨")
- private Double yAccuDeprIncrease;
+ @JsonProperty("yAccuDeprIncrease")
+ private Double yaccudeprincrease;
@PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
- private Double YAccuDeprDecrease;
+ @JsonProperty("YAccuDeprDecrease")
+ private Double yaccudeprdecrease;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index def56d2..b981440 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -11,7 +11,10 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
+import com.fzzy.push.nx2023.NX2023Constant;
import com.fzzy.push.sh2023.dto.*;
+import com.fzzy.push.sx2024.SX2024Constant;
+import com.fzzy.push.sx2024.data.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -61,6 +64,8 @@
@Autowired
private Api1205Rep api1205Rep;
@Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
private Api1403Rep api1403Rep;
@Autowired
private Api1404Rep api1404Rep;
@@ -77,7 +82,7 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- String inteId = param.getInteId();
+
String kqdm = param.getKqdm();
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
@@ -89,23 +94,18 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
-
- //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (Constant.API_CODE_1501.equals(param.getInteId())
- || Constant.API_CODE_1502.equals(param.getInteId())
- || Constant.API_CODE_1503.equals(param.getInteId())) {
- inteId = Constant.API_CODE_1114;
- }
- apiLog.setInteId(inteId);
-
- if (StringUtils.isEmpty(inteId)) {
+ if (StringUtils.isEmpty(param.getInteId())) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
apiLogRep.save(apiLog);
return responseDto;
}
+ apiLog.setInteId(param.getInteId());
+ //鑾峰彇鎺ュ彛缂栫爜
+ String inteId = this.getInteId(param.getInteId());
+ //鑾峰彇JSON鎶ユ枃
String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
@@ -481,6 +481,13 @@
if(StringUtils.isEmpty(api1201.getKhtyshxydm())){
api1201.setGxfs("3");
}
+ //浠樻鏂瑰紡
+ if(StringUtils.isEmpty(api1201.getFkfs())){
+ api1201.setFkfs("4");
+ }
+ if(StringUtils.isEmpty(api1201.getYsfs())){
+ api1201.setYsfs("鎸夊皝浠撴暟閲忚繘琛岄獙鏀�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1201);
return api1201;
@@ -494,6 +501,11 @@
if(StringUtils.isEmpty(api1202.getTyhwbm())){
String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
api1202.setTyhwbm(tyhwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1202.getLqgsdwtybm())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0,18));
+ api1202.setLqgsdwtybm(tydwbm);
}
api1202.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1202.getCddm())) {
@@ -527,6 +539,13 @@
}
//绮鎬ц川
api1202.setLsxzdm("200");
+ //鍞伯浜轰俊鎭�
+ if(StringUtils.isEmpty(api1202.getSlr())){
+ api1202.setSlr("鍞伯浜�");
+ }
+ if(StringUtils.isEmpty(api1202.getSlrdz())){
+ api1202.setSlrdz("鍞伯浜哄湴鍧�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
@@ -640,7 +659,18 @@
if (null != api1208List && api1208List.size() > 0) {
api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //璐ㄦ鍗曞彿
+ List<Api1310> api1310List = api1310Rep.getDataByHwdm(api1205.getHwdm(), "02");
+ if (null != api1310List && api1310List.size() > 0) {
+ api1205.setZjbgdh(apiData.getHwdm() + api1310List.get(0).getZjbgdh());
+ }
+ //鐢熸垚鏂瑰紡
+ if(null == api1205.getScfs()){
+ api1205.setScfs(1);
+ }
+ if(StringUtils.isEmpty(api1205.getSdblyy())){
+ api1205.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�");
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -759,6 +789,16 @@
//绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
api1209.setLsxzdm("122");
+ //鎹熺泭鐜妭锛岄粯璁ゅ嚭搴撴崯鑰�
+ if(StringUtils.isEmpty(api1209.getSyhj())){
+ api1209.setSyhj("2");
+ }
+ //鑾峰彇涓婃捣瑙勮寖鎹熺泭绫诲瀷
+ api1209.setSylx(getShSylxByGb(api1209.getSylx()));
+ //鍏ュ簱鏁伴噺
+ if(api1209.getRksl() < api1209.getRkjz()){
+ api1209.setRksl(api1209.getRkjz());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
return api1209;
@@ -846,6 +886,17 @@
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1212);
return api1212;
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1213.equals(inteId)) {
+ Api1213 api1213 = (Api1213) data;
+ SH2023Api1213 apiData = new SH2023Api1213();
+ BeanUtils.copyProperties(api1213, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1213.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ return apiData;
}
if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
SH2023Api1301 api1301 = new SH2023Api1301();
@@ -1210,6 +1261,42 @@
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(data);
return data;
+ }
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ Api1504 api1504 = (Api1504)data;
+ SH2023Api1504 apiData = new SH2023Api1504();
+ BeanUtils.copyProperties(api1504, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ SH2023Api1505 apiData = new SH2023Api1505();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ SH2023Api1506 apiData = new SH2023Api1506();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ SH2023Api1507 apiData = new SH2023Api1507();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ SH2023Api1508 apiData = new SH2023Api1508();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ SH2023Api1509 apiData = new SH2023Api1509();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ SH2023Api1510 apiData = new SH2023Api1510();
+ BeanUtils.copyProperties(data, apiData);
+ return apiData;
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(data);
@@ -1652,4 +1739,85 @@
return object;
}
+ private String getShSylxByGb(String gbSylx){
+ if("1".equals(gbSylx)){
+ return "2";
+ }
+ if("2".equals(gbSylx)){
+ return "1";
+ }
+ return gbSylx;
+ }
+
+ /**
+ * 鏍规嵁鎺ュ彛缂栫爜鑾峰彇瀵瑰簲鐨勬帴鍙ｆ暟鎹簱琛ㄥ悕
+ *
+ * @param inteId
+ * @return
+ */
+ private String getInteId(String inteId) {
+ //鏁版嵁鐩哥鎬�
+ if (Constant.API_CODE_9101.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1115;
+ }
+ //瑙嗛鐩戞帶鎺ュ彛
+ if (Constant.API_CODE_9102.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1311;
+ }
+ //鍊掍粨鍊掑叆鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9103.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2102;
+ }
+ //绮儏璁惧閰嶇疆鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9104.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2103;
+ }
+ //妫�鏂ゅ崟鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9105.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2101;
+ }
+ //甯傚偍椹宠繍鍗曚俊鎭暟鎹帴鍙�
+ if (Constant.API_CODE_9106.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2104;
+ }
+ //浜ゆ槗涓績鍚堝悓淇″績鏁版嵁鎺ュ彛
+ if (Constant.API_CODE_9107.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2203;
+ }
+ //瀹氬寲姘存楠屾帴鍙�
+ if (Constant.API_CODE_9108.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_2204;
+ }
+ if (Constant.API_CODE_1501.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1502.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1503.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1114;
+ }
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1116;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1117;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1118;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1119;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1120;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1121;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ return SH2023Constant.SH_2023_API_CODE_1122;
+ }
+ return inteId;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java b/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
index e476395..70ca851 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
@@ -69,6 +69,17 @@
* 鎺ュ彛缂栫爜-1115 鏁版嵁鐩哥鎬ф暟鎹帴鍙�
*/
public static String SH_2023_API_CODE_1115 = "1115";
+
+ /**
+ * 鎺ュ彛缂栫爜-璐㈠姟7涓帴鍙�
+ */
+ public static String SH_2023_API_CODE_1116 = "1116";
+ public static String SH_2023_API_CODE_1117 = "1117";
+ public static String SH_2023_API_CODE_1118 = "1118";
+ public static String SH_2023_API_CODE_1119 = "1119";
+ public static String SH_2023_API_CODE_1120 = "1120";
+ public static String SH_2023_API_CODE_1121 = "1121";
+ public static String SH_2023_API_CODE_1122 = "1122";
/**
* 鎺ュ彛缂栫爜-1201 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
*/
@@ -117,6 +128,10 @@
* 鎺ュ彛缂栫爜-1212 瀹㈡埛淇℃伅鏁版嵁鎺ュ彛
*/
public static String SH_2023_API_CODE_1212 = "1212";
+ /**
+ * 鎺ュ彛缂栫爜-1213 灏佷粨纭鍗�
+ */
+ public static String SH_2023_API_CODE_1213 = "1213";
/**
* 鎺ュ彛缂栫爜-1301 瀹夊叏绠＄悊鏁版嵁鎺ュ彛
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
index a6913f1..ed06ff9 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
@@ -42,7 +42,7 @@
@Autowired
private ComPushService15 pushService15;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService90;
@Override
public String getProtocol() {
@@ -130,7 +130,28 @@
pushService15.pushData1500(apiRemoteService, param);
break;
case "1115":
- pushService99.pushData1115(apiRemoteService, param);
+ pushService90.pushData9101(apiRemoteService, param);
+ break;
+ case "1116":
+ pushService15.pushData1504(apiRemoteService, param);
+ break;
+ case "1117":
+ pushService15.pushData1505(apiRemoteService, param);
+ break;
+ case "1118":
+ pushService15.pushData1506(apiRemoteService, param);
+ break;
+ case "1119":
+ pushService15.pushData1507(apiRemoteService, param);
+ break;
+ case "1120":
+ pushService15.pushData1508(apiRemoteService, param);
+ break;
+ case "1121":
+ pushService15.pushData1509(apiRemoteService, param);
+ break;
+ case "1122":
+ pushService15.pushData1510(apiRemoteService, param);
break;
case "1201":
pushService12.pushData1201(apiRemoteService, param);
@@ -168,14 +189,17 @@
case "1212":
pushService12.pushData1212(apiRemoteService, param);
break;
+ case "1213":
+ pushService12.pushData1213(apiRemoteService, param);
+ break;
case "2101":
- pushService99.pushData2101(apiRemoteService, param);
+ pushService90.pushData9105(apiRemoteService, param);
break;
case "2102":
- pushService99.pushData2102(apiRemoteService, param);
+ pushService90.pushData9103(apiRemoteService, param);
break;
case "2104":
- pushService99.pushData2104(apiRemoteService, param);
+ pushService90.pushData9106(apiRemoteService, param);
break;
case "1301":
pushService13.pushData1301(apiRemoteService, param);
@@ -208,10 +232,10 @@
pushService13.pushData1310(apiRemoteService, param);
break;
case "1311":
- pushService99.pushData1311(apiRemoteService, param);
+ pushService90.pushData9102(apiRemoteService, param);
break;
case "2103":
- pushService99.pushData2103(apiRemoteService, param);
+ pushService90.pushData9104(apiRemoteService, param);
break;
case "1401":
pushService14.pushData1401(apiRemoteService, param);
@@ -229,10 +253,10 @@
pushService14.pushData1405(apiRemoteService, param);
break;
case "2203":
- pushService99.pushData2203(apiRemoteService, param);
+ pushService90.pushData9107(apiRemoteService, param);
break;
case "2204":
- pushService99.pushData2204(apiRemoteService, param);
+ pushService90.pushData9108(apiRemoteService, param);
break;
default:
log.error("-----涓婃捣甯傚钩鍙帮細鏈尮閰嶅埌鎺ュ彛缂栫爜锛屼笉鎺ㄩ��-----");
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
index 62728eb..09a8bbe 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
@@ -5,7 +5,7 @@
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.impl.ComPushService15;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -27,7 +27,7 @@
@Autowired
private ComPushService15 pushService15;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService99;
@Override
public String getProtocol() {
return PushProtocol.SB_SH_2023.getCode();
@@ -69,7 +69,7 @@
//璐㈠姟鎶ヨ〃鏁版嵁鎺ㄩ��
pushService15.pushData1500(apiRemoteService, param);
//鏁版嵁鐩哥鎬�
- pushService99.pushData1115(apiRemoteService, param);
+ pushService99.pushData9101(apiRemoteService, param);
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index 0855589..9d33825 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -4,7 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService12;
import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@
@Autowired
private ComPushService12 pushService12;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService99;
@Override
public String getProtocol() {
return PushProtocol.SB_SH_2023.getCode();
@@ -74,9 +74,9 @@
//鏂囦欢
pushService12.pushData1109(apiRemoteService, param);
- pushService99.pushData2101(apiRemoteService, param);
- pushService99.pushData2102(apiRemoteService, param);
- pushService99.pushData2104(apiRemoteService, param);
+ pushService99.pushData9105(apiRemoteService, param);
+ pushService99.pushData9103(apiRemoteService, param);
+ pushService99.pushData9106(apiRemoteService, param);
log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index 78c8073..62f779b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -4,7 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService13;
import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@
@Autowired
private ComPushService13 pushService13;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService90;
@Override
@@ -62,8 +62,8 @@
//璐ㄦ
pushService13.pushData1310(apiRemoteService, param);
- pushService99.pushData1311(apiRemoteService, param);
- pushService99.pushData2103(apiRemoteService, param);
+ pushService90.pushData9102(apiRemoteService, param);
+ pushService90.pushData9104(apiRemoteService, param);
log.info("------->>>>绮簱绠＄悊 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
index 2beb8aa..c8b0cb3 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -4,7 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService14;
import com.fzzy.push.impl.ComPushService14;
-import com.fzzy.push.impl.ComPushService99;
+import com.fzzy.push.impl.ComPushService90;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@
@Autowired
private ComPushService14 pushService14;
@Autowired
- private ComPushService99 pushService99;
+ private ComPushService90 pushService99;
@Override
public String getProtocol() {
@@ -47,8 +47,8 @@
pushService14.pushData1405(apiRemoteService, param);
//鍏朵粬鎺ュ彛
- pushService99.pushData2203(apiRemoteService, param);
- pushService99.pushData2204(apiRemoteService, param);
+ pushService99.pushData9107(apiRemoteService, param);
+ pushService99.pushData9108(apiRemoteService, param);
log.info("------->>>>琛屾斂绠＄悊 鎺ュ彛妯″潡涓婃姤缁撴潫");
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
index 9252212..919997b 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
@@ -31,7 +31,7 @@
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
private String tydwbm;
- @PropertyDef(label = "涓氬姟绫诲埆")
+ @PropertyDef(label = "涓氬姟绫诲埆",description = "1:閿�鍞悎鍚�,2:閲囪喘鍚堝悓,3锛氬鎵樻敹鍌ㄥ悎鍚�,4锛氬鎵樻敹璐悎鍚�")
private String ywlx;
@PropertyDef(label = "璐攢鏂瑰紡")
@@ -74,6 +74,9 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
private Date ydwcsj;
+
+ @PropertyDef(label = "楠屾敹鏂瑰紡")
+ private String ysfs;
@PropertyDef(label = "绛捐鍦扮偣")
private String qddd;
@@ -119,6 +122,15 @@
@PropertyDef(label = "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�")
private String jsyhtbyzyy;
+ /**
+ * 1锛氬叏棰濆厛娆惧悗璐�
+ * 2锛氭寜鍒版杩涘害閫愭壒鍙戣揣
+ * 3锛氳揣鍒板苟纭鍚庝竴娆℃�т粯娆�
+ * 4锛氭寜鍒拌揣鎵规閫愭壒纭銆侀�愭壒浠樻
+ */
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ private String fkfs;
+
@PropertyDef(label = "瀹㈡埛鏂瑰紑鎴疯")
private String khfkhh;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
index 1e6dc9a..89f9148 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -43,6 +43,9 @@
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ private String lqgsdwtybm;
+
@PropertyDef(label = "鎵胯繍浜�")
private String cyr;
@@ -70,6 +73,21 @@
@PropertyDef(label = "瑁呯伯鍦扮偣")
private String ldd;
+ @PropertyDef(label = "鍞伯浜�")
+ private String slr;
+
+ @PropertyDef(label = "鍞伯浜鸿仈绯绘柟寮�")
+ private String slrlxfs;
+
+ @PropertyDef(label = "鍞伯浜鸿韩浠借瘉鍙�")
+ private String slrsfzh;
+
+ @PropertyDef(label = "鍞伯浜鸿处鍙凤紙閾惰鍗℃垨璐︽埛锛�")
+ private String slrzh;
+
+ @PropertyDef(label = "鍞伯浜哄湴鍧�")
+ private String slrdz;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鐧昏鏃堕棿")
private Date djsj;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
index 06a2f24..6d1e32d 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -5,11 +5,6 @@
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -48,6 +43,9 @@
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
+
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
+ private String zjbgdh;
@PropertyDef(label = "鎵胯繍浜�")
private String cyr;
@@ -152,6 +150,12 @@
@PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
private String ckjsdh;
+ @PropertyDef(label = "鐢熸垚鏂瑰紡")
+ private Integer scfs;
+
+ @PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
+ private String sdblyy;
+
@PropertyDef(label = "澶囨敞")
private String bz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
index aa51358..612ae51 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import java.io.Serializable;
import java.util.Date;
@@ -29,11 +28,24 @@
private String tyhwbm;
@JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ private Date ywrq;
+
+ @PropertyDef(label = "鎹熸孩绫诲瀷", description = "1锛氭崯鑰楋紱2锛氭崯澶憋紱3锛氭孩浣欙紱4锛氬叾浠�")
+ private String sylx;
+
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
+ private String syhj;
+
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁拌处鏃ユ湡")
private Date jzrq;
@PropertyDef(label = "鍏ュ簱鍑�閲�")
private Double rkjz;
+
+ @PropertyDef(label = "鍏ュ簱鏁伴噺(鍏枻)")
+ private double rksl;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍏ュ簱鏃堕棿")
@@ -58,7 +70,10 @@
@PropertyDef(label = "鍑哄簱鏉傝川")
private Double ckzz;
- @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�")
+ @PropertyDef(label = "鍌ㄥ鏃堕暱")
+ private Integer ccsc;
+
+ @PropertyDef(label = "瀹為檯鎹熸孩鏁伴噺")
private Double jzsysl;
@PropertyDef(label = "姘存潅鍑忛噺")
@@ -67,17 +82,24 @@
@PropertyDef(label = "鑷劧鎹熻�楀畾棰�")
private Double zrshde;
+ @PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
+ private Integer sfch;
+
@PropertyDef(label = "瓒呰�楁暟閲�")
private Double chsl;
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
private String sysfzc;
- @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
- private String sylx;
-
@PropertyDef(label = "鎹熸孩鍘熷洜")
private String syyy;
+
+ @PropertyDef(label = "鍑烘竻纭鏍囪瘑",description = "0锛氭湭瀹屾垚鍑烘竻纭锛�1锛氬凡瀹屾垚鍑烘竻纭")
+ private Integer cqqrbs;
+
+ @PropertyDef(label = "鍑烘竻纭鏃堕棿")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date cqqrsj;
@PropertyDef(label = "浠撳偍瀹℃牳浜�")
private String ccshr;
@@ -116,7 +138,5 @@
@PropertyDef(label = "绮鎬ц川浠ｇ爜")
private String lsxzdm;
- @JSONField(format = "yyyy-MM-dd")
- @PropertyDef(label = "涓氬姟鏃ユ湡" )
- private Date ywrq;
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1213.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1213.java
new file mode 100644
index 0000000..7dc75cf
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1213.java
@@ -0,0 +1,69 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author CZT
+ * @Date 2024/11/11 10:53
+ */
+@Data
+public class SH2023Api1213 implements Serializable {
+
+ @PropertyDef(label = "灏佷粨纭鍗曞彿", description = "2浣嶄笟鍔＄紪鐮�(21浠ｈ〃灏佷粨)+yyMMdd+4浣嶉『搴忕爜锛�212405040001")
+ private String fcqrdh;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
+
+ @PropertyDef(label = "灏佷粨鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date fcrq;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "鍥藉埆")
+ private String gb;
+
+ @PropertyDef(label = "浜у湴")
+ private String cd;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgy;
+
+ @PropertyDef(label = "灏佷粨鏁伴噺")
+ private Double fcsl;
+
+ @PropertyDef(label = "灏佷粨鐢宠浜�")
+ private String fcsqr;
+
+ @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
+ private String bmshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
new file mode 100644
index 0000000..4041977
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
@@ -0,0 +1,86 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 璐﹀淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:15
+ */
+@Data
+public class SH2023Api1504 implements Serializable {
+
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @JsonProperty("nAcctId")
+ private String nacctid;
+
+ @PropertyDef(label = "璐﹀鍚嶇О")
+ @JsonProperty("cAcctName")
+ private String cncctname;
+
+ @PropertyDef(label = "鏈綅甯�")
+ @JsonProperty("cCurrency")
+ private String ccurrency;
+
+ @PropertyDef(label = "浼氳涓荤")
+ @JsonProperty("cAcctChief")
+ private String cacctchief;
+
+ @JSONField(format = "yyyyMM")
+ @PropertyDef(label = "鍚敤鏈熼棿")
+ @JsonProperty("cPeriodStart")
+ private Date cperiodstart;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏃ユ湡")
+ @JsonProperty("cYearBmd")
+ private Date cyearbmd;
+
+ @PropertyDef(label = "鏈熼棿鏁�")
+ @JsonProperty("nAcctPeriodNum")
+ private Integer nacctperiodnum;
+
+ @PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
+ @JsonProperty("cAccClassCode")
+ private String caccclasscode;
+
+ @PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
+ @JsonProperty("nAccGrade")
+ private Integer naccgrade;
+
+ @PropertyDef(label = "绉戠洰缂栫爜瑙勫垯", description = "4222XXXX:榛樿鍓嶅洓绾х骇闀胯鍒欎负4222")
+ @JsonProperty("cAccCodeStr")
+ private String cacccodestr;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ @JsonProperty("cCropName")
+ private String ccropname;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ @JsonProperty("cOrgCode")
+ private String corgcode;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ @JsonProperty("xqydm")
+ private String tydwbm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ @JsonProperty("xkqdm")
+ private String tykqbm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java
new file mode 100644
index 0000000..f7b7b2f
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1505.java
@@ -0,0 +1,101 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绉戠洰淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:20
+ */
+@Data
+public class SH2023Api1505 implements Serializable {
+
+ @PropertyDef(label = "id涓婚敭")
+ @JSONField(serialize = false)
+ private String id;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @JsonProperty("nAcctId")
+ private String nacctid;
+
+ @PropertyDef(label = "骞村害")
+ @JsonProperty("cYear")
+ private Integer cyear;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @JsonProperty("cCode")
+ private String ccode;
+
+ @PropertyDef(label = "绉戠洰鍚嶇О")
+ @JsonProperty("cName")
+ private String cname;
+
+ @PropertyDef(label = "绉戠洰鍏ㄧО")
+ @JsonProperty("cAllName")
+ private String callname;
+
+ /**
+ * 1:璧勪骇绫�
+ * 2:璐熷�虹被
+ * 3:鍏卞悓绫�
+ * 4:鎵�鏈夎�呮潈鐩婄被
+ * 5:鎴愭湰璐圭敤绫�
+ * 6:鎹熺泭绫�
+ */
+ @PropertyDef(label = "绉戠洰绫诲埆")
+ @JsonProperty("nClass")
+ private String nclass;
+ /**
+ * (-1)-璐锋柟锛�1-鍊熸柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ @JsonProperty("cDc")
+ private Integer cdc;
+
+ @PropertyDef(label = "鏈骇绉戠洰")
+ @JsonProperty("bL")
+ private Integer bl;
+
+ @PropertyDef(label = "绉戠洰绾ф")
+ @JsonProperty("nGrade")
+ private Integer ngrade;
+
+ @PropertyDef(label = "鏁伴噺绉戠洰")
+ @JsonProperty("bQ")
+ private Integer bq;
+
+ @PropertyDef(label = "鏁伴噺鍗曚綅")
+ @JsonProperty("cQUnit")
+ private Integer cqunit;
+
+ @PropertyDef(label = "鐜伴噾绫荤鐩�")
+ @JsonProperty("bCash")
+ private Integer bcash;
+
+ @PropertyDef(label = "閾惰绫荤鐩�")
+ @JsonProperty("bBank")
+ private Integer bbank;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
+ @JsonProperty("bXjll")
+ private Integer bxjll;
+
+ @PropertyDef(label = "鍐荤粨")
+ @JsonProperty("bF")
+ private Integer bf;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java
new file mode 100644
index 0000000..41f6a6a
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1506.java
@@ -0,0 +1,103 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绉戠洰浣欓淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:25
+ */
+@Data
+public class SH2023Api1506 implements Serializable {
+
+
+ @PropertyDef(label = "ID_")
+ @JSONField(serialize = false)
+ private String id;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @JsonProperty("nAcctId")
+ private String nacctid;
+
+ @PropertyDef(label = "鏈熼棿")
+ @JsonProperty("cYear")
+ private Integer cyear;
+
+ @PropertyDef(label = "骞村害")
+ @JsonProperty("nNo")
+ private Integer nno;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @JsonProperty("cCode")
+ private String ccode;
+
+ @PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
+ @JsonProperty("bM")
+ private Double bm;
+
+ @PropertyDef(label = "鏈熸湯鏈綅甯佷綑棰�")
+ @JsonProperty("eM")
+ private Double em;
+
+ @PropertyDef(label = "鏈熷垵鏁伴噺")
+ @JsonProperty("bQty")
+ private Double bqty;
+
+ @PropertyDef(label = "鏈熸湯鏁伴噺")
+ @JsonProperty("eQty")
+ private Double eqty;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ @JsonProperty("cDc")
+ private Integer cdc;
+
+ @PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
+ @JsonProperty("dM")
+ private Double dm;
+
+ @PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
+ @JsonProperty("cM")
+ private Double cm;
+
+ @PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
+ @JsonProperty("dQ")
+ private Double dq;
+
+ @PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
+ @JsonProperty("cQ")
+ private Double cq;
+
+ @PropertyDef(label = "鏈熷垵澶栧竵浣欓")
+ @JsonProperty("bFm")
+ private Double bfm;
+
+ @PropertyDef(label = "鏈熸湯澶栧竵浣欓")
+ @JsonProperty("eFm")
+ private Double efm;
+
+ @PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
+ @JsonProperty("dFm")
+ private Double dfm;
+
+ @PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
+ @JsonProperty("cFm")
+ private Double cfm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java
new file mode 100644
index 0000000..7c14bf7
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1507.java
@@ -0,0 +1,126 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 浼氳鍑瘉淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:30
+ */
+@Data
+public class SH2023Api1507 implements Serializable {
+
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @JsonProperty("nAcctId")
+ private String nacctid;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @JsonProperty("cVKind")
+ private String cvkind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @JsonProperty("cMon")
+ private Integer cmon;
+
+ @PropertyDef(label = "骞村害")
+ @JsonProperty("cYear")
+ private Integer cyear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @JsonProperty("nVNo")
+ private Integer nvno;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ @JsonProperty("nNo")
+ private Integer nno;
+
+ @PropertyDef(label = "鎽樿")
+ @JsonProperty("Digest")
+ private String digest;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @JsonProperty("cCode")
+ private String ccode;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍑瘉鏃ユ湡")
+ @JsonProperty("cVSmallDatetime")
+ private Date ccsmalldatetime;
+
+ @PropertyDef(label = "鍒跺崟浜�")
+ @JsonProperty("cMaker")
+ private String cmaker;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @JsonProperty("cDc")
+ private Integer cdc;
+
+ @PropertyDef(label = "瀹℃牳浜�")
+ @JsonProperty("cCkEr")
+ private String ccker;
+
+ @PropertyDef(label = "璁拌处浜�")
+ @JsonProperty("cPtEr")
+ private String cpter;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "璁拌处鏍囧織")
+ @JsonProperty("bPt")
+ private Integer bpt;
+
+ @PropertyDef(label = "闄勪欢寮犳暟")
+ @JsonProperty("nANum")
+ private Integer nanum;
+
+ @PropertyDef(label = "閲戦")
+ @JsonProperty("nM")
+ private Double nm;
+
+ @PropertyDef(label = "鏁伴噺")
+ @JsonProperty("nQty")
+ private Double nqty;
+
+ @PropertyDef(label = "鍗曚环")
+ @JsonProperty("nPrice")
+ private Double nprice;
+
+ @PropertyDef(label = "鍑虹撼")
+ @JsonProperty("cCashier")
+ private String ccashier;
+
+ @PropertyDef(label = "姹囩巼")
+ @JsonProperty("rate")
+ private Double rate;
+
+ @PropertyDef(label = "澶栧竵閲戦")
+ @JsonProperty("nFm")
+ private Double nfm;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅",description = "璁￠噺鍗曚綅姹夊瓧")
+ @JsonProperty("meterUnitId")
+ private String meterunitid;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java
new file mode 100644
index 0000000..2eb700c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1508.java
@@ -0,0 +1,79 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:35
+ */
+@Data
+public class SH2023Api1508 implements Serializable {
+
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @JsonProperty("nAcctId")
+ private String nacctid;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @JsonProperty("cVKind")
+ private String cvkind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @JsonProperty("cMon")
+ private Integer cmon;
+
+ @PropertyDef(label = "骞村害")
+ @JsonProperty("cYear")
+ private Integer cyear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @JsonProperty("nVNo")
+ private Integer nvno;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @JsonProperty("cCode")
+ private String ccode;
+
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ @JsonProperty("cDFCode")
+ private String cdfcode;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺椤圭洰浠ｇ爜")
+ @JsonProperty("cCashCode")
+ private String ccashcode;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ @JsonProperty("nNo")
+ private Integer nrowno;
+
+ @PropertyDef(label = "閲戦")
+ @JsonProperty("nM")
+ private Double nm;
+
+ /**
+ * 1:娴佸叆
+ * -1:娴佸嚭
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @JsonProperty("cDc")
+ private Integer cdc;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java
new file mode 100644
index 0000000..bffd330
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1509.java
@@ -0,0 +1,171 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:35
+ */
+@Data
+public class SH2023Api1509 implements Serializable {
+
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @JsonProperty("nAcctId")
+ private String nacctid;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ @JsonProperty("fixAssetCode")
+ private String fixassetcode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
+ @JsonProperty("origFixAssetCode")
+ private String origfixassetcode;
+
+ @PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
+ @JsonProperty("groupCode")
+ private String groupcode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
+ @JsonProperty("fixAssetName")
+ private String fixassetname;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
+ @JsonProperty("unitName")
+ private String unitname;
+
+ @PropertyDef(label = "鍘熷��")
+ @JsonProperty("valueOrg")
+ private Double valueorg;
+
+ @PropertyDef(label = "褰撳墠鍘熷��")
+ @JsonProperty("dresentValueOrg")
+ private Double dresentvalueorg;
+
+ /**
+ * 1:涓嶆彁鎶樻棫娉�
+ * 2:骞冲潎骞撮檺娉�
+ * 3:鍔ㄦ�佸钩鍧囧勾闄愭硶
+ * 4:宸ヤ綔閲忔硶
+ * 5:骞存暟鎬诲拰娉�
+ * 6:鍙屽�嶄綑棰濋�掑噺娉�
+ */
+ @PropertyDef(label = "鎶樻棫鏂规硶")
+ @JsonProperty("deprMethodId")
+ private Integer deprmethodid;
+
+ /**
+ * 1:鎶曡祫
+ * 2:鑷缓
+ * 3:璐拱
+ * 4:铻嶈祫绉熻祦
+ * 5:缁忚惀绉熷叆
+ * 6:鏃犲伩璋冨叆
+ * 7:鎹愯禒
+ * 8:鎹㈠叆
+ */
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ @JsonProperty("sourceid")
+ private Integer sourceid;
+
+ @PropertyDef(label = "鍨嬪彿")
+ @JsonProperty("model")
+ private String model;
+
+ @PropertyDef(label = "瑙勬牸")
+ @JsonProperty("specs")
+ private String specs;
+
+ @PropertyDef(label = "鍒堕�犲晢")
+ @JsonProperty("manufacturer")
+ private String manufacturer;
+
+ @PropertyDef(label = "浜у湴")
+ @JsonProperty("makingPlace")
+ private String makingplace;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "杩涘崟浣嶆棩鏈�")
+ @JsonProperty("enterDay")
+ private Date enterday;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
+ @JsonProperty("beginUseDay")
+ private Date beginuseday;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤哄崱鏃ユ湡")
+ @JsonProperty("makinDay")
+ private Date makinday;
+
+ @PropertyDef(label = "绠＄悊浜�")
+ @JsonProperty("keeper")
+ private String keeper;
+
+ @PropertyDef(label = "寤哄崱浜�")
+ @JsonProperty("maker")
+ private String maker;
+
+ @PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
+ @JsonProperty("usingPeriods")
+ private Integer usingperiods;
+
+ @PropertyDef(label = "棰勮鍑�娈嬪��")
+ @JsonProperty("expecRemain")
+ private Double expecremain;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
+ @JsonProperty("assetAcctCode")
+ private String assetacctcode;
+
+ @PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
+ @JsonProperty("deprAcctCode")
+ private String depracctcode;
+
+ @PropertyDef(label = "绱鎶樻棫")
+ @JsonProperty("accumulateDepr")
+ private Double accumulatedepr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
+ @JsonProperty("abadoned")
+ private String abadoned;
+
+ /**
+ * 1:鍦ㄤ娇鐢�
+ * 2:鏈娇鐢�
+ * 3:鍋滅敤
+ * 4:鍑哄敭
+ * 5:鎶ユ崯
+ * 6:鐩樹簭
+ */
+ @PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
+ @JsonProperty("presentStatus")
+ private String presentstatus;
+
+ @PropertyDef(label = "澶囨敞")
+ @JsonProperty("notes")
+ private String notes;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java
new file mode 100644
index 0000000..a2da307
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1510.java
@@ -0,0 +1,112 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 璧勪骇鎶樻棫淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:40
+ */
+@Data
+public class SH2023Api1510 implements Serializable {
+
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @JsonProperty("nAcctId")
+ private String nacctid;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ @JsonProperty("fixAssetCode")
+ private String fixassetcode;
+
+ @PropertyDef(label = "鏈熼棿")
+ @JsonProperty("period")
+ private Integer period;
+
+ @PropertyDef(label = "骞村害")
+ @JsonProperty("AcctYear")
+ private Integer acctyear;
+
+ @PropertyDef(label = "鏈熷垵鍘熷��")
+ @JsonProperty("bValueOrg")
+ private Double bvalueorg;
+
+ @PropertyDef(label = "绱鎶樻棫")
+ @JsonProperty("bAccumDepr")
+ private Double baccumdepr;
+
+ @PropertyDef(label = "鏈湡璁℃彁鎶樻棫")
+ @JsonProperty("deprAmmount")
+ private Double deprammount;
+
+ @PropertyDef(label = "鏈勾绱璁℃彁鎶樻棫")
+ @JsonProperty("yAccumDepr")
+ private Double yaccumdepr;
+
+ @PropertyDef(label = "鏈湡鏁伴噺澧炲姞")
+ @JsonProperty("qtyAdd")
+ private Double qtyadd;
+
+ @PropertyDef(label = "鏈湡鏁伴噺鍑忓皯")
+ @JsonProperty("qtyDecrease")
+ private Double qtydecrease;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎鍔�")
+ @JsonProperty("valueOrgAdd")
+ private Double valueorgadd;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎噺灏�")
+ @JsonProperty("valueOrgDerease")
+ private Double valueorgderease;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨")
+ @JsonProperty("accuDeprAdjustAdd")
+ private Double accudepradjustadd;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨噺")
+ @JsonProperty("accuDeprAdjustDec")
+ private Double accudepradjustdec;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺澧炲姞")
+ @JsonProperty("yQtyIncrease")
+ private Double yqtyIncrease;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺鍑忓皯")
+ @JsonProperty("yQtyDecrease")
+ private Double yqtydecrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″鍔�")
+ @JsonProperty("yValueIncrease")
+ private Double yvalueincrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″噺灏�")
+ @JsonProperty("yValueDecrease")
+ private Double yvaluedecrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨")
+ @JsonProperty("yAccuDeprIncrease")
+ private Double yaccudeprincrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
+ @JsonProperty("YAccuDeprDecrease")
+ private Double yaccudeprdecrease;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index ac7743c..7c2bbd2 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -853,16 +853,6 @@
Api1504 api1504 = (Api1504)data;
SX2024Api1504 apiData = new SX2024Api1504();
BeanUtils.copyProperties(api1504, apiData);
- //璁剧疆绲变竴鍗曚綅缂栫爜
- if (StringUtils.isEmpty(apiData.getXqydm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
- apiData.setXqydm(tydwbm);
- }
- //璁剧疆绲变竴搴撳尯缂栫爜
- if (StringUtils.isEmpty(apiData.getXkqdm())) {
- String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
- apiData.setXkqdm(tykqbm);
- }
return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
index dfac64d..292fd5d 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -16,53 +17,69 @@
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "璐﹀鍚嶇О")
- private String cAcctName;
+ @JsonProperty("cAcctName")
+ private String cncctname;
@PropertyDef(label = "鏈綅甯�")
- private String cCurrency;
+ @JsonProperty("cCurrency")
+ private String ccurrency;
@PropertyDef(label = "浼氳涓荤")
- private String cAcctChief;
+ @JsonProperty("cAcctChief")
+ private String cacctchief;
- @JSONField(format = "yyyy-MM-dd")
+ @JSONField(format = "yyyyMM")
@PropertyDef(label = "鍚敤鏈熼棿")
- private String cPeriodStart;
+ @JsonProperty("cPeriodStart")
+ private Date cperiodstart;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍚敤鏃ユ湡")
- private String cYearBmd;
+ @JsonProperty("cYearBmd")
+ private Date cyearbmd;
@PropertyDef(label = "鏈熼棿鏁�")
- private Double nAcctPeriodNum;
+ @JsonProperty("nAcctPeriodNum")
+ private Integer nacctperiodnum;
@PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
- private String cAccClassCode;
+ @JsonProperty("cAccClassCode")
+ private String caccclasscode;
@PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
- private Double nAccGrade;
+ @JsonProperty("nAccGrade")
+ private Integer naccgrade;
@PropertyDef(label = "绉戠洰缂栫爜瑙勫垯", description = "4222XXXX:榛樿鍓嶅洓绾х骇闀胯鍒欎负4222")
- private String cAccCodeStr;
+ @JsonProperty("cAccCodeStr")
+ private String cacccodestr;
@PropertyDef(label = "鍗曚綅鍚嶇О")
- private String cCropName;
+ @JsonProperty("cCropName")
+ private String ccropname;
@PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String cOrgCode;
+ @JsonProperty("cOrgCode")
+ private String corgcode;
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String xqydm;
+ @JsonProperty("xqydm")
+ private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String xkqdm;
+ @JsonProperty("xkqdm")
+ private String tykqbm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
index b77788e..c4ddb3a 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -14,20 +15,29 @@
@Data
public class SX2024Api1505 implements Serializable {
+ @PropertyDef(label = "id涓婚敭")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "骞村害")
- private String cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "绉戠洰缂栫爜")
- private String cCode;
+ @JsonProperty("cCode")
+ private String ccode;
@PropertyDef(label = "绉戠洰鍚嶇О")
- private String cName;
+ @JsonProperty("cName")
+ private String cname;
@PropertyDef(label = "绉戠洰鍏ㄧО")
- private String cAllName;
+ @JsonProperty("cAllName")
+ private String callname;
/**
* 1:璧勪骇绫�
@@ -38,41 +48,53 @@
* 6:鎹熺泭绫�
*/
@PropertyDef(label = "绉戠洰绫诲埆")
- private String nClass;
+ @JsonProperty("nClass")
+ private String nclass;
/**
* (-1)-璐锋柟锛�1-鍊熸柟
*/
@PropertyDef(label = "浣欓鏂瑰悜")
- private String cDc;
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "鏈骇绉戠洰")
- private String bL;
+ @JsonProperty("bL")
+ private Integer bl;
@PropertyDef(label = "绉戠洰绾ф")
- private Double nGrade;
+ @JsonProperty("nGrade")
+ private Integer ngrade;
@PropertyDef(label = "鏁伴噺绉戠洰")
- private String bQ;
+ @JsonProperty("bQ")
+ private Integer bq;
@PropertyDef(label = "鏁伴噺鍗曚綅")
- private String cQUnit;
+ @JsonProperty("cQUnit")
+ private Integer cqunit;
@PropertyDef(label = "鐜伴噾绫荤鐩�")
- private String bCash;
+ @JsonProperty("bCash")
+ private Integer bcash;
@PropertyDef(label = "閾惰绫荤鐩�")
- private String bBank;
+ @JsonProperty("bBank")
+ private Integer bbank;
@PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
- private String bXjll;
+ @JsonProperty("bXjll")
+ private Integer bxjll;
@PropertyDef(label = "鍐荤粨")
- private String bF;
+ @JsonProperty("bF")
+ private Integer bf;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java
index fc2125e..000ea0a 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java
@@ -2,7 +2,10 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
+
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -14,61 +17,88 @@
@Data
public class SX2024Api1506 implements Serializable {
+
+ @PropertyDef(label = "ID_")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鏈熼棿")
- private String cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "骞村害")
- private String nNo;
+ @JsonProperty("nNo")
+ private Integer nno;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @JsonProperty("cCode")
+ private String ccode;
@PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
- private Double bM;
+ @JsonProperty("bM")
+ private Double bm;
@PropertyDef(label = "鏈熸湯鏈綅甯佷綑棰�")
- private Double eM;
+ @JsonProperty("eM")
+ private Double em;
@PropertyDef(label = "鏈熷垵鏁伴噺")
- private Double bQty;
+ @JsonProperty("bQty")
+ private Double bqty;
@PropertyDef(label = "鏈熸湯鏁伴噺")
- private Double eQty;
+ @JsonProperty("eQty")
+ private Double eqty;
/**
* 1:鍊熸柟
* -1:璐锋柟
*/
@PropertyDef(label = "浣欓鏂瑰悜")
- private String cDc;
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
- private Double dM;
+ @JsonProperty("dM")
+ private Double dm;
@PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
- private Double cM;
+ @JsonProperty("cM")
+ private Double cm;
@PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
- private Double dQ;
+ @JsonProperty("dQ")
+ private Double dq;
@PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
- private Double cQ;
+ @JsonProperty("cQ")
+ private Double cq;
@PropertyDef(label = "鏈熷垵澶栧竵浣欓")
- private Double bFm;
+ @JsonProperty("bFm")
+ private Double bfm;
@PropertyDef(label = "鏈熸湯澶栧竵浣欓")
- private Double eFm;
+ @JsonProperty("eFm")
+ private Double efm;
@PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
- private Double dFm;
+ @JsonProperty("dFm")
+ private Double dfm;
@PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
- private Double cFm;
+ @JsonProperty("cFm")
+ private Double cfm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java
index d729a28..f7e7182 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -14,89 +15,111 @@
@Data
public class SX2024Api1507 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍑瘉绫诲瀷")
- private String cVKind;
+ @JsonProperty("cVKind")
+ private String cvkind;
@PropertyDef(label = "鏈熼棿")
- private Double cMon;
+ @JsonProperty("cMon")
+ private Integer cmon;
@PropertyDef(label = "骞村害")
- private Double cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "鍑瘉鍙�")
- private Double nVNo;
+ @JsonProperty("nVNo")
+ private Integer nvno;
@PropertyDef(label = "鍒嗗綍搴忓彿")
- private Double nNo;
-
- @PropertyDef(label = "鍑瘉鍒嗙被")
- private Double bTmp;
+ @JsonProperty("nNo")
+ private Integer nno;
@PropertyDef(label = "鎽樿")
- private String Digest;
+ @JsonProperty("Digest")
+ private String digest;
@PropertyDef(label = "绉戠洰缂栫爜")
- private Double cCode;
+ @JsonProperty("cCode")
+ private String ccode;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍑瘉鏃ユ湡")
- private String cVSmallDatetime;
+ @JsonProperty("cVSmallDatetime")
+ private Date ccsmalldatetime;
@PropertyDef(label = "鍒跺崟浜�")
- private String cMaker;
+ @JsonProperty("cMaker")
+ private String cmaker;
/**
* 1:鍊熸柟
* -1:璐锋柟
*/
@PropertyDef(label = "鏂瑰悜")
- private String cDc;
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "瀹℃牳浜�")
- private String cCkEr;
+ @JsonProperty("cCkEr")
+ private String ccker;
@PropertyDef(label = "璁拌处浜�")
- private String cPtEr;
+ @JsonProperty("cPtEr")
+ private String cpter;
/**
* 0:鍚�
* 1:鏄�
*/
@PropertyDef(label = "璁拌处鏍囧織")
- private Double bPt;
+ @JsonProperty("bPt")
+ private Integer bpt;
@PropertyDef(label = "闄勪欢寮犳暟")
- private Double nANum;
+ @JsonProperty("nANum")
+ private Integer nanum;
@PropertyDef(label = "閲戦")
- private Double nM;
+ @JsonProperty("nM")
+ private Double nm;
@PropertyDef(label = "鏁伴噺")
- private Double nQty;
+ @JsonProperty("nQty")
+ private Double nqty;
@PropertyDef(label = "鍗曚环")
- private Double nPrice;
-
- @PropertyDef(label = "缁撶畻鍙�")
- private String cSettleNo;
+ @JsonProperty("nPrice")
+ private Double nprice;
@PropertyDef(label = "鍑虹撼")
- private String cCashier;
+ @JsonProperty("cCashier")
+ private String ccashier;
@PropertyDef(label = "姹囩巼")
+ @JsonProperty("rate")
private Double rate;
@PropertyDef(label = "澶栧竵閲戦")
- private Double nFm;
+ @JsonProperty("nFm")
+ private Double nfm;
@PropertyDef(label = "璁￠噺鍗曚綅",description = "璁￠噺鍗曚綅姹夊瓧")
- private String meterUnitId;
+ @JsonProperty("meterUnitId")
+ private String meterunitid;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java
index 184b480..d35d3ca 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -14,49 +15,64 @@
@Data
public class SX2024Api1508 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍑瘉绫诲瀷")
- private String cVKind;
+ @JsonProperty("cVKind")
+ private String cvkind;
@PropertyDef(label = "鏈熼棿")
- private Double cMon;
+ @JsonProperty("cMon")
+ private Integer cmon;
@PropertyDef(label = "骞村害")
- private Double cYear;
+ @JsonProperty("cYear")
+ private Integer cyear;
@PropertyDef(label = "鍑瘉鍙�")
- private Double nVNo;
+ @JsonProperty("nVNo")
+ private Integer nvno;
@PropertyDef(label = "绉戠洰缂栫爜")
- private String cCode;
+ @JsonProperty("cCode")
+ private String ccode;
@PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
- private String cDFCode;
+ @JsonProperty("cDFCode")
+ private String cdfcode;
@PropertyDef(label = "鐜伴噾娴侀噺椤圭洰浠ｇ爜")
- private String cCashCode;
+ @JsonProperty("cCashCode")
+ private String ccashcode;
@PropertyDef(label = "鍒嗗綍搴忓彿")
- private Double nNo;
+ @JsonProperty("nNo")
+ private Integer nrowno;
@PropertyDef(label = "閲戦")
- private Double nM;
+ @JsonProperty("nM")
+ private Double nm;
/**
* 1:娴佸叆
* -1:娴佸嚭
*/
@PropertyDef(label = "鏂瑰悜")
- private String cDc;
-
+ @JsonProperty("cDc")
+ private Integer cdc;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java
index 2615a76..6f80b67 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -14,29 +15,42 @@
@Data
public class SX2024Api1509 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
- private String fixAssetCode;
+ @JsonProperty("fixAssetCode")
+ private String fixassetcode;
@PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
- private String origFixAssetCode;
+ @JsonProperty("origFixAssetCode")
+ private String origfixassetcode;
@PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
- private String groupCode;
+ @JsonProperty("groupCode")
+ private String groupcode;
@PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
- private String fixAssetName;
+ @JsonProperty("fixAssetName")
+ private String fixassetname;
@PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
- private String unitName;
+ @JsonProperty("unitName")
+ private String unitname;
@PropertyDef(label = "鍘熷��")
- private Double valueOrg;
+ @JsonProperty("valueOrg")
+ private Double valueorg;
@PropertyDef(label = "褰撳墠鍘熷��")
- private Double dresentValueOrg;
+ @JsonProperty("dresentValueOrg")
+ private Double dresentvalueorg;
+
/**
* 1:涓嶆彁鎶樻棫娉�
* 2:骞冲潎骞撮檺娉�
@@ -46,10 +60,9 @@
* 6:鍙屽�嶄綑棰濋�掑噺娉�
*/
@PropertyDef(label = "鎶樻棫鏂规硶")
- private Double deprMethodId;
+ @JsonProperty("deprMethodId")
+ private Integer deprmethodid;
- @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
- private Double sourceid;
/**
* 1:鎶曡祫
* 2:鑷缓
@@ -60,59 +73,74 @@
* 7:鎹愯禒
* 8:鎹㈠叆
*/
- @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
- private String cDFCode;
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ @JsonProperty("sourceid")
+ private Integer sourceid;
@PropertyDef(label = "鍨嬪彿")
+ @JsonProperty("model")
private String model;
@PropertyDef(label = "瑙勬牸")
+ @JsonProperty("specs")
private String specs;
@PropertyDef(label = "鍒堕�犲晢")
+ @JsonProperty("manufacturer")
private String manufacturer;
@PropertyDef(label = "浜у湴")
- private String makingPlace;
+ @JsonProperty("makingPlace")
+ private String makingplace;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "杩涘崟浣嶆棩鏈�")
- private String enterDay;
+ @JsonProperty("enterDay")
+ private Date enterday;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
- private String beginUseDay;
+ @JsonProperty("beginUseDay")
+ private Date beginuseday;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寤哄崱鏃ユ湡")
- private String makinDay;
+ @JsonProperty("makinDay")
+ private Date makinday;
@PropertyDef(label = "绠＄悊浜�")
+ @JsonProperty("keeper")
private String keeper;
@PropertyDef(label = "寤哄崱浜�")
+ @JsonProperty("maker")
private String maker;
@PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
- private Double usingPeriods;
+ @JsonProperty("usingPeriods")
+ private Integer usingperiods;
@PropertyDef(label = "棰勮鍑�娈嬪��")
- private Double expecRemain;
+ @JsonProperty("expecRemain")
+ private Double expecremain;
@PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
- private String assetAcctCode;
+ @JsonProperty("assetAcctCode")
+ private String assetacctcode;
@PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
- private String deprAcctCode;
-
+ @JsonProperty("deprAcctCode")
+ private String depracctcode;
@PropertyDef(label = "绱鎶樻棫")
- private Double accumulateDepr;
+ @JsonProperty("accumulateDepr")
+ private Double accumulatedepr;
/**
* 0:鍚�
* 1:鏄�
*/
@PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
+ @JsonProperty("abadoned")
private String abadoned;
/**
@@ -124,15 +152,19 @@
* 6:鐩樹簭
*/
@PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
- private String presentStatus;
+ @JsonProperty("presentStatus")
+ private String presentstatus;
@PropertyDef(label = "澶囨敞")
+ @JsonProperty("notes")
private String notes;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
index ef080cc..9b0c8c5 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -14,70 +15,97 @@
@Data
public class SX2024Api1510 implements Serializable {
+ @PropertyDef(label = "id")
+ @JSONField(serialize = false)
+ private String id;
+
@PropertyDef(label = "璐﹀鍙�")
- private Double nAcctId;
+ @JsonProperty("nAcctId")
+ private String nacctid;
@PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
- private String fixAssetCode;
+ @JsonProperty("fixAssetCode")
+ private String fixassetcode;
@PropertyDef(label = "鏈熼棿")
- private Double period;
+ @JsonProperty("period")
+ private Integer period;
@PropertyDef(label = "骞村害")
- private Double AcctYear;
+ @JsonProperty("AcctYear")
+ private Integer acctyear;
@PropertyDef(label = "鏈熷垵鍘熷��")
- private Double bValueOrg;
+ @JsonProperty("bValueOrg")
+ private Double bvalueorg;
@PropertyDef(label = "绱鎶樻棫")
- private Double bAccumDepr;
+ @JsonProperty("bAccumDepr")
+ private Double baccumdepr;
@PropertyDef(label = "鏈湡璁℃彁鎶樻棫")
- private Double deprAmmount;
+ @JsonProperty("deprAmmount")
+ private Double deprammount;
@PropertyDef(label = "鏈勾绱璁℃彁鎶樻棫")
- private Double yAccumDepr;
+ @JsonProperty("yAccumDepr")
+ private Double yaccumdepr;
@PropertyDef(label = "鏈湡鏁伴噺澧炲姞")
- private Double qtyAdd;
+ @JsonProperty("qtyAdd")
+ private Double qtyadd;
@PropertyDef(label = "鏈湡鏁伴噺鍑忓皯")
- private Double qtyDecrease;
+ @JsonProperty("qtyDecrease")
+ private Double qtydecrease;
@PropertyDef(label = "鏈湡鍘熷�煎鍔�")
- private Double valueOrgAdd;
+ @JsonProperty("valueOrgAdd")
+ private Double valueorgadd;
@PropertyDef(label = "鏈湡鍘熷�煎噺灏�")
- private Double valueOrgDerease;
+ @JsonProperty("valueOrgDerease")
+ private Double valueorgderease;
@PropertyDef(label = "鏈湡绱鎶樻棫璋冨")
- private Double accuDeprAdjustAdd;
+ @JsonProperty("accuDeprAdjustAdd")
+ private Double accudepradjustadd;
@PropertyDef(label = "鏈湡绱鎶樻棫璋冨噺")
- private Double accuDeprAdjustDec;
+ @JsonProperty("accuDeprAdjustDec")
+ private Double accudepradjustdec;
@PropertyDef(label = "鏈勾绱鏁伴噺澧炲姞")
- private Double yQtyIncrease;
+ @JsonProperty("yQtyIncrease")
+ private Double yqtyIncrease;
@PropertyDef(label = "鏈勾绱鏁伴噺鍑忓皯")
- private Double yQtyDecrease;
+ @JsonProperty("yQtyDecrease")
+ private Double yqtydecrease;
@PropertyDef(label = "鏈勾鍘熷�肩疮璁″鍔�")
- private Double yValueIncrease;
+ @JsonProperty("yValueIncrease")
+ private Double yvalueincrease;
@PropertyDef(label = "鏈勾鍘熷�肩疮璁″噺灏�")
- private Double yValueDecrease;
+ @JsonProperty("yValueDecrease")
+ private Double yvaluedecrease;
@PropertyDef(label = "鏈勾绱鎶樻棫璋冨")
- private Double yAccuDeprIncrease;
+ @JsonProperty("yAccuDeprIncrease")
+ private Double yaccudeprincrease;
@PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
- private Double YAccuDeprDecrease;
+ @JsonProperty("YAccuDeprDecrease")
+ private Double yaccudeprdecrease;
@PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("czbz")
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JsonProperty("zhgxsj")
private Date zhgxsj;
+
}
--
Gitblit v1.9.3