From 11af6525c78f401f8e7ca1100417adf90415586e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 06 十一月 2024 17:27:45 +0800
Subject: [PATCH] 陕西2024版接口-测试调整
---
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1210.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java | 78 +
src/main/java/com/fzzy/api/view/Api1211.view.xml | 204 ++--
src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java | 5
src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java | 31
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1108.java | 2
src/main/java/com/fzzy/push/impl/ComPushService11.java | 99 --
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1308.java | 2
src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java | 10
src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java | 9
src/main/java/com/fzzy/api/view/repository/Api1404Rep.java | 3
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1213.java | 107 ++
src/main/resources/templates/home/home.html | 51
src/main/java/com/fzzy/push/sx2024/SX2024OrderServiceImpl.java | 31
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 936 +++++++++++--------
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java | 68 +
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java | 2
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 1
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1209.java | 2
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 39
src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java | 4
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1206.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1201.java | 2
src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java | 5
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1204.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1207.java | 11
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 12
src/main/java/com/fzzy/push/gd2023/GD2023PushService11.java | 31
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 6
src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java | 6
src/main/java/com/fzzy/api/view/pr/Api1501PR.java | 4
src/main/java/com/fzzy/api/view/Api1111.view.xml | 27
src/main/java/com/fzzy/api/entity/Api1306.java | 19
src/main/java/com/fzzy/api/view/pr/Api1503PR.java | 4
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java | 2
src/main/java/com/fzzy/api/view/pr/Api1213PR.java | 4
src/main/java/com/fzzy/push/sx2024/SX2024Constant.java | 33
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1111.java | 4
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java | 138 +++
src/main/java/com/fzzy/api/view/pr/Api1211PR.java | 3
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java | 74 +
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1306.java | 4
src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java | 10
src/main/java/com/fzzy/push/gd2023/GD2023OrderServiceImpl.java | 9
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java | 9
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1308.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java | 62 +
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java | 83 +
src/main/java/com/fzzy/api/entity/Api1213.java | 4
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java | 1
src/main/java/com/fzzy/api/entity/Api1305.java | 22
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1210.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1310.java | 4
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1204.java | 2
src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java | 4
src/main/java/com/fzzy/api/view/Api1213.view.xml | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java | 5
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1108.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1301.java | 4
src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java | 12
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1101.java | 5
src/main/java/com/fzzy/push/impl/ComPushService15.java | 178 +++
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java | 102 ++
src/main/java/com/fzzy/push/sx2023/data/SX2023Api1111.java | 4
src/main/java/com/fzzy/api/Constant.java | 13
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1110.java | 4
src/main/java/com/fzzy/api/view/Api1209.view.xml | 2
src/main/java/com/fzzy/api/view/pr/Api1502PR.java | 4
/dev/null | 52 -
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1403.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java | 14
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 12
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java | 3
src/main/java/com/fzzy/api/entity/Api1209.java | 2
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java | 9
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1206.java | 2
77 files changed, 1,923 insertions(+), 809 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index ddd5a1f..fd727a2 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -204,9 +204,16 @@
//璐㈠姟鎶ヨ〃鎺ュ彛
public static String API_CODE_1114 = "1114";
- public static String API_CODE_1114_1501 = "1501";
- public static String API_CODE_1114_1502 = "1502";
- public static String API_CODE_1114_1503 = "1503";
+ public static String API_CODE_1501 = "1501";
+ public static String API_CODE_1502 = "1502";
+ public static String API_CODE_1503 = "1503";
+ public static String API_CODE_1504 = "1504";
+ public static String API_CODE_1505 = "1505";
+ public static String API_CODE_1506 = "1506";
+ public static String API_CODE_1507 = "1507";
+ public static String API_CODE_1508 = "1508";
+ public static String API_CODE_1509 = "1509";
+ public static String API_CODE_1510 = "1510";
/**
* 鍥芥爣鍑哄叆搴撶被鍨�
*/
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 96abc16..2110988 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -99,7 +99,7 @@
@PropertyDef(label = "鍌ㄥ鏃堕暱")
@Column(name = "ccsc",precision = 3)
- private BigDecimal ccsc;
+ private Integer ccsc;
@PropertyDef(label = "瀹為檯鎹熸孩鏁伴噺(鍏枻)")
@Column(name = "jzsysl", precision = 20, scale = 6)
diff --git a/src/main/java/com/fzzy/api/entity/Api1213.java b/src/main/java/com/fzzy/api/entity/Api1213.java
index 69469d3..754ffe1 100644
--- a/src/main/java/com/fzzy/api/entity/Api1213.java
+++ b/src/main/java/com/fzzy/api/entity/Api1213.java
@@ -73,8 +73,8 @@
private Double fcsl;
@PropertyDef(label = "灏佷粨鐢宠浜�")
- @Column(name = "fcsrq", length = 40)
- private String fcsrq;
+ @Column(name = "fcsqr", length = 40)
+ private String fcsqr;
@PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
@Column(name = "bmshr", length = 40)
diff --git a/src/main/java/com/fzzy/api/entity/Api1305.java b/src/main/java/com/fzzy/api/entity/Api1305.java
index 9f0d0db..ff71b88 100644
--- a/src/main/java/com/fzzy/api/entity/Api1305.java
+++ b/src/main/java/com/fzzy/api/entity/Api1305.java
@@ -21,7 +21,7 @@
@Entity
@Table(name = "API_1305")
@EqualsAndHashCode(callSuper=false)
-public class Api1305 extends ApiParent implements Serializable {
+public class Api1305 implements Serializable {
/**
*
@@ -239,4 +239,24 @@
@Column(name = "zhgxsj")
private Date zhgxsj;
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1306.java b/src/main/java/com/fzzy/api/entity/Api1306.java
index 6059592..2df8317 100644
--- a/src/main/java/com/fzzy/api/entity/Api1306.java
+++ b/src/main/java/com/fzzy/api/entity/Api1306.java
@@ -21,7 +21,7 @@
@Entity
@Table(name = "API_1306")
@EqualsAndHashCode(callSuper=false)
-public class Api1306 extends ApiParent implements Serializable {
+public class Api1306 implements Serializable {
/**
*
@@ -298,10 +298,25 @@
@Column(name = "zhgxsj")
private Date zhgxsj;
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
+
/*---------绯荤粺鍐呬娇鐢�:鍥芥爣鍜屽箍涓滅啅钂稿崟鍙凤細浠撴埧浠ｇ爜+yyyyMMdd+3浣嶉『搴忓彿锛涗笂娴风啅钂稿崟鍙凤細璐т綅浠ｇ爜+yyyyMMdd+3浣嶉『搴忓彿----------*/
@JSONField(serialize = false)
@PropertyDef(label = "璐т綅浠ｇ爜" )
@Column(name = "hwdm", length = 30)
private String hwdm;
-
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 6dc7075..afdcf4f 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -193,6 +193,7 @@
list.add(new ApiTrigger(PushProtocol.SB_NX_2023.getCode(), PushProtocol.SB_NX_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_NX_2024.getCode(), PushProtocol.SB_NX_2024.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SX_2023.getCode(), PushProtocol.SB_SX_2023.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_SX_2024.getCode(), PushProtocol.SB_SX_2024.getName()));
return list;
}
diff --git a/src/main/java/com/fzzy/api/view/Api1111.view.xml b/src/main/java/com/fzzy/api/view/Api1111.view.xml
index db28d48..f456307 100644
--- a/src/main/java/com/fzzy/api/view/Api1111.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1111.view.xml
@@ -70,6 +70,26 @@
<PropertyDef name="spjklx">
<Property></Property>
<Property name="label">瑙嗛鐩戞帶绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-浠撳唴</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-涓氬姟绫�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-瀹夐槻绫�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
</PropertyDef>
<PropertyDef name="spdwlx">
<Property></Property>
@@ -205,7 +225,12 @@
<DataColumn name="spjksbmc">
<Property name="property">spjksbmc</Property>
<Property name="align">center</Property>
- <Property name="width">500</Property>
+ <Property name="width">250</Property>
+ </DataColumn>
+ <DataColumn name="spjklx">
+ <Property name="property">spjklx</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="spjksbid">
<Property name="property">spjksbid</Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1209.view.xml b/src/main/java/com/fzzy/api/view/Api1209.view.xml
index f6173a8..fd57985 100644
--- a/src/main/java/com/fzzy/api/view/Api1209.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1209.view.xml
@@ -190,7 +190,7 @@
<Property name="label">鍚屾鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="ccsc">
- <Property/>
+ <Property name="dataType">Integer</Property>
<Property name="label">鍌ㄥ鏃堕暱</Property>
</PropertyDef>
<PropertyDef name="sfch">
diff --git a/src/main/java/com/fzzy/api/view/Api1211.view.xml b/src/main/java/com/fzzy/api/view/Api1211.view.xml
index 1b3531d..0e7f768 100644
--- a/src/main/java/com/fzzy/api/view/Api1211.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1211.view.xml
@@ -318,7 +318,7 @@
</ToolBar>
<Dialog id="dialogMain">
<Property name="width">1000</Property>
- <Property name="caption">鍒颁粨淇℃伅</Property>
+ <Property name="caption">璐﹂潰搴撳瓨</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="closeable">false</Property>
<Buttons>
@@ -341,100 +341,114 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tykqbm</Property>
- <Property name="property">tykqbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lspzdm</Property>
- <Property name="property">lspzdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nd</Property>
- <Property name="property">nd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwdm</Property>
- <Property name="property">hwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lsxzdm</Property>
- <Property name="property">lsxzdm</Property>
- <Editor/>
- </AutoFormElement>
- <Label>
- <Property name="text">璇存槑锛氫笂娴蜂娇鐢�(璐т綅浠ｇ爜銆佺伯椋熸�ц川浠ｇ爜)</Property>
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- </Label>
- <AutoFormElement>
- <Property name="name">yf</Property>
- <Property name="property">yf</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qcsl</Property>
- <Property name="property">qcsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bqsrsl</Property>
- <Property name="property">bqsrsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bqzcsl</Property>
- <Property name="property">bqzcsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qmye</Property>
- <Property name="property">qmye</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yjbz</Property>
- <Property name="property">yjbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ywrq</Property>
- <Property name="property">ywrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tykqbm</Property>
+ <Property name="property">tykqbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzdm</Property>
+ <Property name="property">lspzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">nd</Property>
+ <Property name="property">nd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yf</Property>
+ <Property name="property">yf</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qcsl</Property>
+ <Property name="property">qcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bqsrsl</Property>
+ <Property name="property">bqsrsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bqzcsl</Property>
+ <Property name="property">bqzcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qmye</Property>
+ <Property name="property">qmye</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yjbz</Property>
+ <Property name="property">yjbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywrq</Property>
+ <Property name="property">ywrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lsxzdm</Property>
+ <Property name="property">lsxzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/Api1213.view.xml b/src/main/java/com/fzzy/api/view/Api1213.view.xml
index a680c1c..2df6078 100644
--- a/src/main/java/com/fzzy/api/view/Api1213.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1213.view.xml
@@ -73,7 +73,7 @@
<Property></Property>
<Property name="label">灏佷粨鏁伴噺(kg)</Property>
</PropertyDef>
- <PropertyDef name="fcsrq">
+ <PropertyDef name="fcsqr">
<Property></Property>
<Property name="label">灏佷粨鐢宠浜�</Property>
</PropertyDef>
@@ -429,8 +429,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">fcsrq</Property>
- <Property name="property">fcsrq</Property>
+ <Property name="name">fcsqr</Property>
+ <Property name="property">fcsqr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1211PR.java b/src/main/java/com/fzzy/api/view/pr/Api1211PR.java
index 63f4776..287af4d 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1211PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1211PR.java
@@ -119,6 +119,9 @@
Api1211 data = new Api1211();
BeanUtils.copyProperties(entity, data);
+ if(StringUtils.isEmpty(data.getId())){
+ data.setId(ContextUtil.getUUID());
+ }
apiRepository.save(data);
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1213PR.java b/src/main/java/com/fzzy/api/view/pr/Api1213PR.java
index 3acca1c..c79463a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1213PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1213PR.java
@@ -189,7 +189,7 @@
String result = "";
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1213);
Api1213 d;
for (Api1213 data : items) {
d = new Api1213();
@@ -217,7 +217,7 @@
private String pushDataList(List<Api1213> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1212);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1213);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
index 9d2b532..abee848 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
@@ -124,7 +124,7 @@
String result = "";
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1501);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);
Api1501 d;
for (Api1501 data : items) {
d = new Api1501();
@@ -153,7 +153,7 @@
private String pushDataList(List<Api1501> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1501);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1502PR.java b/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
index 618d014..bec9159 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
@@ -122,7 +122,7 @@
String result = "";
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1502);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1502);
Api1502 d;
for (Api1502 data : items) {
d = new Api1502();
@@ -151,7 +151,7 @@
private String pushDataList(List<Api1502> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1502);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1502);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1503PR.java b/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
index 61bdf1f..5e55498 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
@@ -120,7 +120,7 @@
String result = "";
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1503);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1503);
Api1503 d;
for (Api1503 data : items) {
d = new Api1503();
@@ -149,7 +149,7 @@
private String pushDataList(List<Api1503> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1114_1503);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1503);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
index 3bf7ab3..36ea69f 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
@@ -37,4 +37,7 @@
*/
@Query("from Api1404 where bizId =:bizId and kqdm =:kqdm")
List<Api1404> getDataByBizIdAndKqdm(@Param("bizId") String bizId, @Param("kqdm") String kqdm);
+
+ @Query("from Api1404 where jhmxdh=:jhmxdh ")
+ Api1404 getOneDataByJhmxdh(@Param("jhmxdh") String jhmxdh);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
index c07d3d1..7bf8219 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
@@ -80,7 +80,7 @@
@Column(name = "ccsc")
@PropertyDef(label = "鍌ㄥ瓨鏃堕暱")
- private BigDecimal ccsc;
+ private Integer ccsc;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍏ュ簱鏃堕棿")
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
index 1b47e7e..159b4f1 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
@@ -95,6 +95,7 @@
api1305.setZhgxsj(new Date());
api1305.setKqdm(kqdm);
+ api1305.setHwdm(api1105.getHwdm());
api1305.setBizId(fzAreationData.getId());
api1305List = api1305Rep.getDataById(api1305.getTfzydh());
if (null == api1305List || api1305List.isEmpty()) {
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 6453c50..110d78c 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -70,9 +70,9 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())
- || Constant.API_CODE_1114_1502.equals(param.getInteId())
- || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ if (Constant.API_CODE_1501.equals(param.getInteId())
+ || Constant.API_CODE_1502.equals(param.getInteId())
+ || Constant.API_CODE_1503.equals(param.getInteId())) {
return pushFinanceData(param, conf, data);
}
@@ -193,11 +193,11 @@
}
List<GDFinanceDto> list = null;
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())) {
+ if (Constant.API_CODE_1501.equals(param.getInteId())) {
list = copyApi1501((Api1501) data);
- } else if (Constant.API_CODE_1114_1502.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1502.equals(param.getInteId())) {
list = copyApi1502((Api1502) data);
- } else if (Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1503.equals(param.getInteId())) {
list = copyApi1503((Api1503) data);
}
GD2022ResponseDto responseDto;
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java b/src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java
index 14c6232..a0b7099 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022OrderServiceImpl.java
@@ -6,10 +6,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
-import com.fzzy.push.impl.ComPushService11;
-import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService14;
+import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -38,7 +35,8 @@
private ComPushService13 pushService13;
@Autowired
private ComPushService14 pushService14;
-
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
return PushProtocol.SB_GD_2022.getCode();
@@ -118,7 +116,7 @@
pushService11.pushData1113(apiRemoteService, param);
break;
case "1114":
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
break;
case "1201":
pushService12.pushData1201(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java b/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
index 64d4352..0209b81 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -21,7 +22,9 @@
private GD2022ApiRemoteService2022 apiRemoteService;
@Autowired
- private ComPushService11 pushService;
+ private ComPushService11 pushService11;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -32,34 +35,34 @@
public void pushData(ApiParam param) {
//鍗曚綅淇℃伅
- pushService.pushData1101(apiRemoteService, param);
+ pushService11.pushData1101(apiRemoteService, param);
//搴撳尯淇℃伅
- pushService.pushData1102(apiRemoteService, param);
+ pushService11.pushData1102(apiRemoteService, param);
//浠撴埧淇℃伅
- pushService.pushData1103(apiRemoteService, param);
+ pushService11.pushData1103(apiRemoteService, param);
//寤掗棿淇℃伅
- pushService.pushData1104(apiRemoteService, param);
+ pushService11.pushData1104(apiRemoteService, param);
//璐т綅淇℃伅
- pushService.pushData1105(apiRemoteService, param);
+ pushService11.pushData1105(apiRemoteService, param);
//娌圭綈淇℃伅
- pushService.pushData1106(apiRemoteService, param);
+ pushService11.pushData1106(apiRemoteService, param);
//璁惧淇℃伅
- pushService.pushData1107(apiRemoteService, param);
+ pushService11.pushData1107(apiRemoteService, param);
//鑽墏淇℃伅
- pushService.pushData1108(apiRemoteService, param);
+ pushService11.pushData1108(apiRemoteService, param);
//搴撳尯鍥句粨鎴跨偣浣嶄俊鎭�
- pushService.pushData1110(apiRemoteService, param);
+ pushService11.pushData1110(apiRemoteService, param);
//搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆暟鎹�
- pushService.pushData1111(apiRemoteService, param);
+ pushService11.pushData1111(apiRemoteService, param);
//浜哄憳淇℃伅
- pushService.pushData1112(apiRemoteService, param);
+ pushService11.pushData1112(apiRemoteService, param);
//浼佷笟淇＄敤淇℃伅
- pushService.pushData1113(apiRemoteService, param);
+ pushService11.pushData1113(apiRemoteService, param);
//鏂囦欢淇℃伅鎺ㄩ�侊紝杞Щ鍒�12澶х被杩涜鎺ㄩ��
//璐㈠姟鎶ヨ〃鏁版嵁鎺ㄩ��
- pushService.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(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 bf9945d..a4c413e 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -69,9 +69,9 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())
- || Constant.API_CODE_1114_1502.equals(param.getInteId())
- || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ if (Constant.API_CODE_1501.equals(param.getInteId())
+ || Constant.API_CODE_1502.equals(param.getInteId())
+ || Constant.API_CODE_1503.equals(param.getInteId())) {
return pushFinanceData(param, conf, data);
}
@@ -192,11 +192,11 @@
}
List<GDFinanceDto> list = null;
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())) {
+ if (Constant.API_CODE_1501.equals(param.getInteId())) {
list = copyApi1501((Api1501) data);
- } else if (Constant.API_CODE_1114_1502.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1502.equals(param.getInteId())) {
list = copyApi1502((Api1502) data);
- } else if (Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ } else if (Constant.API_CODE_1503.equals(param.getInteId())) {
list = copyApi1503((Api1503) data);
}
GD2023ResponseDto responseDto;
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/gd2023/GD2023OrderServiceImpl.java
index 9efaaec..d21e445 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023OrderServiceImpl.java
@@ -6,10 +6,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
-import com.fzzy.push.impl.ComPushService11;
-import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService14;
+import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -38,6 +35,8 @@
private ComPushService13 pushService13;
@Autowired
private ComPushService14 pushService14;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -118,7 +117,7 @@
pushService11.pushData1113(apiRemoteService, param);
break;
case "1114":
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
break;
case "1201":
pushService12.pushData1201(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023PushService11.java b/src/main/java/com/fzzy/push/gd2023/GD2023PushService11.java
index 075604a..8fcfda0 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023PushService11.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023PushService11.java
@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -21,7 +22,9 @@
private GD2023ApiRemoteService2023 apiRemoteService;
@Autowired
- private ComPushService11 pushService;
+ private ComPushService11 pushService11;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -32,34 +35,34 @@
public void pushData(ApiParam param) {
//鍗曚綅淇℃伅
- pushService.pushData1101(apiRemoteService, param);
+ pushService11.pushData1101(apiRemoteService, param);
//搴撳尯淇℃伅
- pushService.pushData1102(apiRemoteService, param);
+ pushService11.pushData1102(apiRemoteService, param);
//浠撴埧淇℃伅
- pushService.pushData1103(apiRemoteService, param);
+ pushService11.pushData1103(apiRemoteService, param);
//寤掗棿淇℃伅
- pushService.pushData1104(apiRemoteService, param);
+ pushService11.pushData1104(apiRemoteService, param);
//璐т綅淇℃伅
- pushService.pushData1105(apiRemoteService, param);
+ pushService11.pushData1105(apiRemoteService, param);
//娌圭綈淇℃伅
- pushService.pushData1106(apiRemoteService, param);
+ pushService11.pushData1106(apiRemoteService, param);
//璁惧淇℃伅
- pushService.pushData1107(apiRemoteService, param);
+ pushService11.pushData1107(apiRemoteService, param);
//鑽墏淇℃伅
- pushService.pushData1108(apiRemoteService, param);
+ pushService11.pushData1108(apiRemoteService, param);
//搴撳尯鍥句粨鎴跨偣浣嶄俊鎭�
- pushService.pushData1110(apiRemoteService, param);
+ pushService11.pushData1110(apiRemoteService, param);
//搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆暟鎹�
- pushService.pushData1111(apiRemoteService, param);
+ pushService11.pushData1111(apiRemoteService, param);
//浜哄憳淇℃伅
- pushService.pushData1112(apiRemoteService, param);
+ pushService11.pushData1112(apiRemoteService, param);
//浼佷笟淇＄敤淇℃伅
- pushService.pushData1113(apiRemoteService, param);
+ pushService11.pushData1113(apiRemoteService, param);
//鏂囦欢淇℃伅鎺ㄩ�侊紝杞Щ鍒�12澶х被杩涜鎺ㄩ��
//璐㈠姟鎶ヨ〃鏁版嵁鎺ㄩ��
- pushService.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
}
}
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
index 1663263..586f394 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
@@ -73,7 +73,7 @@
private Double ckzz;
@PropertyDef(label = "鍌ㄥ瓨鏃堕暱" )
- private BigDecimal ccsc;
+ private Integer ccsc;
@PropertyDef(label = "瀹為檯鎹熺泭鏁伴噺" )
private Double jzsysl;
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService11.java b/src/main/java/com/fzzy/push/impl/ComPushService11.java
index 5139444..08593b3 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService11.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService11.java
@@ -45,12 +45,7 @@
private Api1112Rep api1112Rep;
@Autowired
private Api1113Rep api1113Rep;
- @Autowired
- private Api1501Rep api1501Rep;
- @Autowired
- private Api1502Rep api1502Rep;
- @Autowired
- private Api1503Rep api1503Rep;
+
/**
* 1101 鍗曚綅淇℃伅
*/
@@ -379,96 +374,4 @@
}
}
- /**
- * 璐㈠姟鎶ヨ〃
- * @param apiRemoteService
- * @param param
- */
- public void pushData1114(ApiRemoteService apiRemoteService, ApiParam param) {
- this.pushData1501(apiRemoteService, param);
- this.pushData1502(apiRemoteService, param);
- this.pushData1503(apiRemoteService, param);
-
- }
- /**
- * 1501 璐㈠姟鎶ヨ〃-璧勪骇璐熷��--鍗曟潯涓婁紶
- */
- public void pushData1501(ApiRemoteService apiRemoteService, ApiParam param) {
- //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
- List<Api1501> list = api1501Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
-
- if (null == list || list.isEmpty()) {
- log.error("-----鏈幏鍙栧埌璧勪骇璐熷�轰俊鎭紝涓嶆帹閫�-----");
- return;
- }
- param.setInteCategory(Constant.API_CATEGORY_11);
- param.setInteId(Constant.API_CODE_1114_1501);
- ResponseDto responseDto;
- for (Api1501 data : list) {
- responseDto = apiRemoteService.pushData(param, data);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
- data.setCzbz(Constant.CZBZ_U);
- //鏇存柊鐘舵��
- api1501Rep.save(data);
- }
- }
- }
- }
-
- /**
- * 1502 璐㈠姟鎶ヨ〃-鐜伴噾娴�
- */
- public void pushData1502(ApiRemoteService apiRemoteService, ApiParam param) {
- //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
- List<Api1502> list = api1502Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
-
- if (null == list || list.isEmpty()) {
- log.error("-----鏈幏鍙栧埌鐜伴噾娴佷俊鎭紝涓嶆帹閫�-----");
- return;
- }
- param.setInteCategory(Constant.API_CATEGORY_11);
- param.setInteId(Constant.API_CODE_1114_1502);
- ResponseDto responseDto;
- for (Api1502 data : list) {
- responseDto = apiRemoteService.pushData(param, data);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
- data.setCzbz(Constant.CZBZ_U);
- //鏇存柊鐘舵��
- api1502Rep.save(data);
- }
- }
- }
- }
-
- /**
- * 1503 璐㈠姟鎶ヨ〃-鍒╂鼎淇℃伅
- */
- public void pushData1503(ApiRemoteService apiRemoteService, ApiParam param) {
- //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
- List<Api1503> list = api1503Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
-
- if (null == list || list.isEmpty()) {
- log.error("-----鏈幏鍙栧埌鍒╂鼎淇℃伅锛屼笉鎺ㄩ��-----");
- return;
- }
- param.setInteCategory(Constant.API_CATEGORY_11);
- param.setInteId(Constant.API_CODE_1114_1503);
- ResponseDto responseDto;
- Api1503 d;
- for (Api1503 data : list) {
- responseDto = apiRemoteService.pushData(param, data);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
- data.setCzbz(Constant.CZBZ_U);
- //鏇存柊鐘舵��
- api1503Rep.save(data);
- }
- }
- }
- }
}
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService15.java b/src/main/java/com/fzzy/push/impl/ComPushService15.java
new file mode 100644
index 0000000..206fdf2
--- /dev/null
+++ b/src/main/java/com/fzzy/push/impl/ComPushService15.java
@@ -0,0 +1,178 @@
+package com.fzzy.push.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.Api1501;
+import com.fzzy.api.entity.Api1502;
+import com.fzzy.api.entity.Api1503;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.view.repository.Api1501Rep;
+import com.fzzy.api.view.repository.Api1502Rep;
+import com.fzzy.api.view.repository.Api1503Rep;
+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/11/6 15:53
+ */
+@Slf4j
+@Service
+public class ComPushService15 {
+
+ @Autowired
+ private Api1501Rep api1501Rep;
+ @Autowired
+ private Api1502Rep api1502Rep;
+ @Autowired
+ private Api1503Rep api1503Rep;
+
+ /**
+ * 璐㈠姟鎶ヨ〃
+ * @param apiRemoteService
+ * @param param
+ */
+ public void pushData1500(ApiRemoteService apiRemoteService, ApiParam param) {
+ this.pushData1501(apiRemoteService, param);
+ this.pushData1502(apiRemoteService, param);
+ this.pushData1503(apiRemoteService, param);
+
+ }
+ /**
+ * 1501 璐㈠姟鎶ヨ〃-璧勪骇璐熷��--鍗曟潯涓婁紶
+ */
+ public void pushData1501(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1501> list = api1501Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌璧勪骇璐熷�轰俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_11);
+ param.setInteId(Constant.API_CODE_1501);
+ ResponseDto responseDto;
+ for (Api1501 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1501Rep.save(data);
+ }
+ }
+ }
+ }
+
+ /**
+ * 1502 璐㈠姟鎶ヨ〃-鐜伴噾娴�
+ */
+ public void pushData1502(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1502> list = api1502Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌鐜伴噾娴佷俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_11);
+ param.setInteId(Constant.API_CODE_1502);
+ ResponseDto responseDto;
+ for (Api1502 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1502Rep.save(data);
+ }
+ }
+ }
+ }
+
+ /**
+ * 1503 璐㈠姟鎶ヨ〃-鍒╂鼎淇℃伅
+ */
+ public void pushData1503(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1503> list = api1503Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌鍒╂鼎淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_11);
+ param.setInteId(Constant.API_CODE_1503);
+ ResponseDto responseDto;
+ Api1503 d;
+ for (Api1503 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1503Rep.save(data);
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 1504 璐﹀淇℃伅
+ */
+ public void pushData1504(ApiRemoteService apiRemoteService, ApiParam param) {
+ //TODO
+
+ }
+ /**
+ * 1505 绉戠洰淇℃伅
+ */
+ public void pushData1505(ApiRemoteService apiRemoteService, ApiParam param) {
+ //TODO
+
+ }
+ /**
+ * 1506 绉戠洰浣欓淇℃伅
+ */
+ public void pushData1506(ApiRemoteService apiRemoteService, ApiParam param) {
+ //TODO
+
+ }
+ /**
+ * 1507 浼氳鍑瘉淇℃伅
+ */
+ public void pushData1507(ApiRemoteService apiRemoteService, ApiParam param) {
+ //TODO
+
+ }
+ /**
+ * 1508 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ */
+ public void pushData1508(ApiRemoteService apiRemoteService, ApiParam param) {
+ //TODO
+
+ }
+ /**
+ * 1509 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ */
+ public void pushData1509(ApiRemoteService apiRemoteService, ApiParam param) {
+ //TODO
+
+ }
+ /**
+ * 1510 璧勪骇鎶樻棫淇℃伅
+ */
+ public void pushData1510(ApiRemoteService apiRemoteService, ApiParam param) {
+ //TODO
+
+ }
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index c4d1ade..ef89135 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -181,18 +181,51 @@
*/
private Object getJsonApiData(String inteId, Object data) {
if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {
+ Api1101 apiData = (Api1101)data;
Nx2023Api1101 api1101 = new Nx2023Api1101();
- BeanUtils.copyProperties(data, api1101);
+ BeanUtils.copyProperties(apiData, api1101);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1101.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1101.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1101.getSjdwtybm()) && StringUtils.isNotEmpty(apiData.getSjdwdm())) {
+ String sjdwtybm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1101.setSjdwtybm(sjdwtybm);
+ }
return api1101;
}
if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
+ Api1102 apiData = (Api1102)data;
Nx2023Api1102 api1102 = new Nx2023Api1102();
- BeanUtils.copyProperties(data, api1102);
+ BeanUtils.copyProperties(apiData, api1102);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1102.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1102.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1102.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1102.setTydwbm(tydwbm);
+ }
return api1102;
}
if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {
+ Api1103 apiData = (Api1103)data;
Nx2023Api1103 api1103 = new Nx2023Api1103();
- BeanUtils.copyProperties(data, api1103);
+ BeanUtils.copyProperties(apiData, api1103);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1103.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1103.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if (StringUtils.isEmpty(api1103.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
+ api1103.setTycfbm(tycfbm);
+ }
return api1103;
}
if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
index e75c4ac..0900c48 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
@@ -8,10 +8,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
-import com.fzzy.push.impl.ComPushService11;
-import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService14;
+import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -41,6 +38,8 @@
private ComPushService13 pushService13;
@Autowired
private ComPushService14 pushService14;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -121,7 +120,7 @@
pushService11.pushData1112(apiRemoteService, param);
break;
case "1114":
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
break;
case "1201":
pushService12.pushData1201(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java b/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java
index b9e9821..e47b713 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java
@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -22,6 +23,8 @@
private NX2023ApiRemoteService apiRemoteService;
@Autowired
private ComPushService11 pushService11;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -62,7 +65,7 @@
//鏂囦欢淇℃伅鎺ㄩ�侊紝杞Щ鍒�12澶х被杩涜鎺ㄩ��
//璐㈠姟鎶ヨ〃鏁版嵁鎺ㄩ��
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
index cebe49e..cf90825 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
@@ -15,6 +15,9 @@
@Data
public class Nx2023Api1101 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
@@ -70,6 +73,9 @@
@PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
private String sjdwmc;
+ @PropertyDef(label = "涓婄骇鍗曚綅缁熶竴缂栫爜")
+ private String sjdwtybm;
+
@PropertyDef(label = "涓婄骇鍗曚綅浠ｇ爜")
private String sjdwdm;
@@ -88,6 +94,9 @@
@PropertyDef(label = "绾害")
private Double wd;
+ @PropertyDef(label = "鍗曚綅鐘舵��")
+ private String dwzt;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
index 6c8e91e..1beb96a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
@@ -12,6 +12,12 @@
@Data
public class Nx2023Api1102 implements Serializable {
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@@ -51,6 +57,9 @@
@PropertyDef(label = "搴撳尯绾害")
private Double wd;
+ @PropertyDef(label = "搴撳尯鐘舵��")
+ private String kqzt;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
index b13c472..9fe2ccf 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
@@ -14,6 +14,8 @@
@Data
public class Nx2023Api1103 implements Serializable {
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
@PropertyDef(label = "浠撴埧浠ｇ爜" )
private String cfdm;
@@ -21,6 +23,9 @@
@PropertyDef(label = "浠撴埧鍚嶇О" )
private String cfmc;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
index a5dc4d4..58f1a05 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1104 implements Serializable {
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdh;
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java b/src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java
index b26d701..27883bb 100644
--- a/src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024OrderServiceImpl.java
@@ -8,10 +8,7 @@
import com.fzzy.order.common.OrderCommonService;
import com.fzzy.order.common.data.OrderCommonConstant;
import com.fzzy.order.common.data.OrderCommonData;
-import com.fzzy.push.impl.ComPushService11;
-import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService14;
+import com.fzzy.push.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -40,7 +37,8 @@
private ComPushService13 pushService13;
@Autowired
private ComPushService14 pushService14;
-
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
return PushProtocol.SB_NX_2024.getCode();
@@ -202,7 +200,7 @@
pushService14.pushData1405(apiRemoteService, param);
break;
case "2441":
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
break;
default:
log.error("-----瀹佸鐪佸钩鍙�2024鐗堬細鏈尮閰嶅埌鎺ュ彛缂栫爜锛屼笉鎺ㄩ��-----");
diff --git a/src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java b/src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java
index 73d7511..635014c 100644
--- a/src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java
+++ b/src/main/java/com/fzzy/push/nx2024/NX2024PushService11.java
@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
+import com.fzzy.push.impl.ComPushService15;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -20,6 +21,8 @@
private NX2024ApiRemoteService apiRemoteService;
@Autowired
private ComPushService11 pushService11;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -70,7 +73,7 @@
pushService11.pushData1113(apiRemoteService, param);
//2441-璐㈠姟鎶ヨ〃鏁版嵁鎺ㄩ��
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
log.info("------->>>>瀹佸鐪佸钩鍙�2024鐗堟帴鍙ｏ紝鍩虹淇℃伅锛屼笂鎶ョ粨鏉�");
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 6606340..def56d2 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -91,9 +91,9 @@
apiLog.setId(ContextUtil.getUUID());
//鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (Constant.API_CODE_1114_1501.equals(param.getInteId())
- || Constant.API_CODE_1114_1502.equals(param.getInteId())
- || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
+ 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);
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
index 2cbff55..a6913f1 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
@@ -40,6 +40,8 @@
@Autowired
private ComPushService14 pushService14;
@Autowired
+ private ComPushService15 pushService15;
+ @Autowired
private ComPushService99 pushService99;
@Override
@@ -125,7 +127,7 @@
pushService11.pushData1113(apiRemoteService, param);
break;
case "1114":
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
break;
case "1115":
pushService99.pushData1115(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
index 811faaf..62728eb 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
@@ -4,6 +4,7 @@
import com.fzzy.api.data.PushProtocol;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,8 @@
private SH2023ApiRemoteService apiRemoteService;
@Autowired
private ComPushService11 pushService11;
+ @Autowired
+ private ComPushService15 pushService15;
@Autowired
private ComPushService99 pushService99;
@Override
@@ -64,7 +67,8 @@
//鏂囦欢淇℃伅鎺ㄩ�侊紝杞Щ鍒�12澶х被杩涜鎺ㄩ��
//璐㈠姟鎶ヨ〃鏁版嵁鎺ㄩ��
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
+ //鏁版嵁鐩哥鎬�
pushService99.pushData1115(apiRemoteService, param);
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
index 454826d..30e14fc 100644
--- a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
@@ -106,7 +106,7 @@
//鎶ユ枃鏍囪瘑
reqData.setID(orderId);
//鐗堟湰鍙�
- reqData.setVER("1.0");
+ reqData.setVER("2022");
//鍗曚綅缂栫爜锛�11浣�
reqData.setOrgNo(conf.getUserName());
//鍗曚綅鍚嶇О
@@ -185,9 +185,9 @@
Map<String, Object> map = new HashMap<>();
String inteIdUrl = getInteId(inteId);
//鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (Constant.API_CODE_1114_1501.equals(inteId)
- || Constant.API_CODE_1114_1502.equals(inteId)
- || Constant.API_CODE_1114_1503.equals(inteId)) {
+ if (Constant.API_CODE_1501.equals(inteId)
+ || Constant.API_CODE_1502.equals(inteId)
+ || Constant.API_CODE_1503.equals(inteId)) {
List<SXFinanceDto> list = getFinanceData(inteId, data);
map.put(inteIdUrl, list);
} else {
@@ -437,9 +437,9 @@
*/
private List<SXFinanceDto> getFinanceData(String inteId, Object data) {
//璐㈠姟鎶ヨ〃鏁版嵁灏佽
- if (Constant.API_CODE_1114_1501.equals(inteId)) {
+ if (Constant.API_CODE_1501.equals(inteId)) {
return copyApi1501((Api1501) data);
- } else if (Constant.API_CODE_1114_1502.equals(inteId)) {
+ } else if (Constant.API_CODE_1502.equals(inteId)) {
return copyApi1502((Api1502) data);
} else {
return copyApi1503((Api1503) data);
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java
index 1973466..7cf9341 100644
--- a/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java
@@ -38,6 +38,8 @@
private ComPushService13 pushService13;
@Autowired
private ComPushService14 pushService14;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -117,7 +119,7 @@
pushService11.pushData1112(apiRemoteService, param);
break;
case "ODS_UP_CWBBXXJK":
- pushService11.pushData1114(apiRemoteService, param);
+ pushService15.pushData1500(apiRemoteService, param);
break;
case "ODS_UP_HTXXJK":
pushService12.pushData1201(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1108.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1108.java
index c448087..7930549 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1108.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1108.java
@@ -46,7 +46,7 @@
private String bzw;
@PropertyDef(label = "鍨嬪彿瑙勬牸")
- @JsonProperty("BZW")
+ @JsonProperty("GGXH")
private String ggxh;
@PropertyDef(label = "瀹夊叏浣跨敤璇存槑涔�")
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1111.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1111.java
index 292b3e6..c026e8b 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1111.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1111.java
@@ -32,10 +32,6 @@
@JsonProperty("SPJKSBID")
private String spjksbid;
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- @JsonProperty("DWDM")
- private String dwmc;
-
@PropertyDef(label = "瑙嗛鐩戞帶璁惧鐩稿浣嶇疆")
@JsonProperty("SPJKSBXDWZ")
private String spjksbxdwz;
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1204.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1204.java
index e23e9ac..b7ddb81 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1204.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1204.java
@@ -33,7 +33,7 @@
private double jssl;
@PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
- @JsonProperty("JSSL")
+ @JsonProperty("JSDJ")
private double jsdj;
@PropertyDef(label = "缁撶畻閲戦(鍏�)")
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1206.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1206.java
index 643106a..e565b00 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1206.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1206.java
@@ -29,7 +29,7 @@
private double jssl;
@PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
- @JsonProperty("JSSL")
+ @JsonProperty("JSDJ")
private double jsdj;
@PropertyDef(label = "缁撶畻閲戦(鍏�)")
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1209.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1209.java
index 99873b2..6f6d3f2 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1209.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1209.java
@@ -60,7 +60,7 @@
private Double cksf;
@PropertyDef(label = "鍑哄簱鏉傝川(%)")
- @JsonProperty("CKSF")
+ @JsonProperty("CKZZ")
private Double ckzz;
@PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)")
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1210.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1210.java
index 6ed5782..0e6af9a 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1210.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1210.java
@@ -50,7 +50,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍒掕浆鏃ユ湡")
- @JsonProperty("HZHLSXZDM")
+ @JsonProperty("HZRQ")
private Date hzrq;
@PropertyDef(label = "浠撳偍瀹℃牳浜�")
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java
index 1bba24e..5ce5c9e 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1306.java
@@ -200,7 +200,7 @@
private Date sqrq;
@PropertyDef(label = "鏁ｆ皵鏂规硶")
- @JsonProperty("SQRQ")
+ @JsonProperty("SQFF")
private String sqff;
@PropertyDef(label = "鏁ｆ皵鎵瑰噯浜�")
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1308.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1308.java
index 0b2aca8..898afd8 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1308.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023Api1308.java
@@ -50,7 +50,7 @@
private String ycgjsm;
@PropertyDef(label = "瑙嗛鏂囦欢娴�")
- @JsonProperty("YCGJSM")
+ @JsonProperty("SPWJL")
private String spwjl;
@PropertyDef(label = "瑙嗛鏂囦欢鍚庣紑鍚�")
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index 0e9fe07..c93a2c7 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -11,6 +11,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.sx2024.data.*;
@@ -44,6 +45,8 @@
private ApiTriggerService apiTriggerService;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Override
public String getProtocol() {
@@ -107,7 +110,7 @@
//鎶ユ枃鏍囪瘑
reqData.setID(orderId);
//鐗堟湰鍙�
- reqData.setVER("1.0");
+ reqData.setVER("2024");
//鍗曚綅缂栫爜锛�11浣�
reqData.setOrgNo(conf.getUserName());
//鍗曚綅鍚嶇О
@@ -185,22 +188,16 @@
List<Map<String, Object>> result = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
String inteIdUrl = getInteId(inteId);
- //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
- if (Constant.API_CODE_1114_1501.equals(inteId)
- || Constant.API_CODE_1114_1502.equals(inteId)
- || Constant.API_CODE_1114_1503.equals(inteId)) {
- List<SXFinanceDto> list = getFinanceData(inteId, data);
- map.put(inteIdUrl, list);
- } else {
- List<Object> list = new ArrayList<>();
- Object object = getApiData(inteId, data, conf);
- //闄ゅ簱瀛樻帴鍙ｅ锛屽叾浠栨帴鍙ｄ笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
- if (!Constant.API_CODE_1208.equals(inteId)) {
- setZhgxsjValue(data);
- }
- list.add(object);
- map.put(inteIdUrl, list);
+
+ List<Object> list = new ArrayList<>();
+ Object object = getApiData(inteId, data, conf);
+ //闄ゅ簱瀛樻帴鍙ｅ锛屽叾浠栨帴鍙ｄ笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
+ if (!Constant.API_CODE_1208.equals(inteId)) {
+ setZhgxsjValue(data);
}
+ list.add(object);
+ map.put(inteIdUrl, list);
+
result.add(map);
return JSON.toJSONString(result);
}
@@ -216,324 +213,678 @@
if (Constant.API_CODE_1101.equals(inteId)) {
SX2024Api1101 apiData = new SX2024Api1101();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //缁熶竴鍗曚綅鍚嶇О璧嬪��
+ apiData.setTydwmc(apiData.getDwmc());
return apiData;
}
if (Constant.API_CODE_1102.equals(inteId)) {
SX2024Api1102 apiData = new SX2024Api1102();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //缁熶竴搴撳尯鍚嶇О璧嬪��
+ apiData.setTykqmc(apiData.getKqmc());
return apiData;
}
if (Constant.API_CODE_1103.equals(inteId)) {
SX2024Api1103 apiData = new SX2024Api1103();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //璁剧疆绲变竴浠撴埧鍚嶇О
+ apiData.setTycfmc(apiData.getCfmc());
return apiData;
}
if (Constant.API_CODE_1104.equals(inteId)) {
SX2024Api1104 apiData = new SX2024Api1104();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tyajbm = apiCommonService.getTyajbm(apiData.getAjdh());
- apiData.setTyajbm(tyajbm);
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
- apiData.setTycfbm(tycfbm);
+ //璁剧疆绲变竴浠撴埧缂栫爜
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
+ apiData.setTycfbm(tycfbm);
+ }
+ //璁剧疆绲变竴寤掗棿鍚嶇О
+ apiData.setTyajmc(apiData.getAjmc());
return apiData;
}
if (Constant.API_CODE_1105.equals(inteId)) {
SX2024Api1105 apiData = new SX2024Api1105();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
- apiData.setTyajbm(tyajbm);
- //璁剧疆绲变竴缂栫爜
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyajbm(tyhwbm);
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+ apiData.setTyajbm(tyajbm);
+ }
+ //璁剧疆绲变竴璐т綅鍚嶇О
+ apiData.setTyhwmc(apiData.getHwmc());
return apiData;
}
if (Constant.API_CODE_1106.equals(inteId)) {
SX2024Api1106 apiData = new SX2024Api1106();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tyygbm = apiCommonService.getTyygbm(apiData.getYgdm());
- apiData.setTyygbm(tyygbm);
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //璁剧疆绲变竴娌圭綈鍚嶇О
+ apiData.setTyygmc(apiData.getYgmc());
return apiData;
}
if (Constant.API_CODE_1107.equals(inteId)) {
SX2024Api1107 apiData = new SX2024Api1107();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //璁剧疆绲变竴搴撳尯鍚嶇О
+ apiData.setTykqmc(apiData.getKqmc());
return apiData;
}
if (Constant.API_CODE_1108.equals(inteId)) {
SX2024Api1108 apiData = new SX2024Api1108();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //璁剧疆绲变竴搴撳尯鍚嶇О
+ apiData.setTykqmc(apiData.getKqmc());
+ //璁剧疆鑽墏缂栫爜锛氱粺涓�搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (apiData.getYjbh().startsWith(apiData.getKqdm())) {
+ apiData.setYjbh(apiData.getYjbh().replace(apiData.getKqdm(), apiData.getTykqbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1109.equals(inteId)) {
Api1109 api1109 = (Api1109) data;
SX2024Api1109 apiData = new SX2024Api1109();
BeanUtils.copyProperties(api1109, apiData);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
//璁剧疆鏂囦欢娴�
apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
- //TODO WJLJ鏂囦欢璺緞
+ //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (apiData.getWjmc().startsWith(apiData.getKqdm())) {
+ apiData.setWjmc(apiData.getWjmc().replace(apiData.getKqdm(), apiData.getTykqbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1110.equals(inteId)) {
SX2024Api1110 apiData = new SX2024Api1110();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
return apiData;
}
if (Constant.API_CODE_1111.equals(inteId)) {
SX2024Api1111 apiData = new SX2024Api1111();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
return apiData;
}
if (Constant.API_CODE_1112.equals(inteId)) {
SX2024Api1112 apiData = new SX2024Api1112();
BeanUtils.copyProperties(data, apiData);
- //璁剧疆绲变竴缂栫爜
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //缁熶竴鍗曚綅鍚嶇О璧嬪��
+ apiData.setTydwmc(apiData.getDwmc());
return apiData;
}
if (Constant.API_CODE_1201.equals(inteId)) {
+ Api1201 api1201 = (Api1201) data;
SX2024Api1201 apiData = new SX2024Api1201();
- BeanUtils.copyProperties(data, apiData);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ BeanUtils.copyProperties(api1201, apiData);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ if (StringUtils.isEmpty(apiData.getHtzl())) {
+ apiData.setHtzl(api1201.getYwlx());
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (apiData.getHth().startsWith(apiData.getDwdm())) {
+ apiData.setHth(apiData.getHth().replace(apiData.getDwdm(), apiData.getTydwbm()));
+ }
+ if (StringUtils.isEmpty(apiData.getYsfs())) {
+ apiData.setYsfs("鏍规嵁鍒拌揣鏁伴噺杩涜楠屾敹");
+ }
+ if (StringUtils.isEmpty(apiData.getFKFS())) {
+ apiData.setFKFS("4");
+ }
return apiData;
}
if (Constant.API_CODE_1202.equals(inteId)) {
+ Api1202 api1202 = (Api1202) data;
SX2024Api1202 apiData = new SX2024Api1202();
- BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
- String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm().substring(0,18));
- apiData.setLqgsdwtybm(tydwbm);
+ BeanUtils.copyProperties(api1202, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆绮潈鍗曚綅绲变竴缂栫爜
+ if (StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1202.getKqdm().substring(0, 18));
+ apiData.setLqgsdwtybm(tydwbm);
+ }
+ //鍒ゆ柇璁″垝鏄庣粏鍙凤紝涓嶄负绌�
+ if (StringUtils.isNotEmpty(apiData.getJhmxh())) {
+ Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(apiData.getJhmxh());
+ //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+ if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
+ apiData.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + apiData.getTyhwbm().substring(0, 22)));
+ }
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
+ apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+ }
return apiData;
}
if (Constant.API_CODE_1203.equals(inteId)) {
SX2024Api1203 apiData = new SX2024Api1203();
BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
return apiData;
}
if (Constant.API_CODE_1204.equals(inteId)) {
+ Api1204 api1204 = (Api1204) data;
SX2024Api1204 apiData = new SX2024Api1204();
- BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
+ BeanUtils.copyProperties(api1204, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getRkjsdh().startsWith(api1204.getKqdm())) {
+ apiData.setRkjsdh(apiData.getRkjsdh().replace(api1204.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (apiData.getHth().startsWith(api1204.getKqdm().substring(0, 18))) {
+ apiData.setHth(apiData.getHth().replace(api1204.getKqdm().substring(0, 18), apiData.getTyhwbm().substring(0, 20)));
+ }
return apiData;
}
if (Constant.API_CODE_1205.equals(inteId)) {
SX2024Api1205 apiData = new SX2024Api1205();
BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //鍒ゆ柇璁″垝鏄庣粏鍙凤紝涓嶄负绌�
+ if (StringUtils.isNotEmpty(apiData.getJhmxh())) {
+ Api1404 api1404 = api1404Rep.getOneDataByJhmxdh(apiData.getJhmxh());
+ //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+ if (api1404.getJhmxdh().startsWith(api1404.getLhjhdh() + api1404.getKqdm())) {
+ apiData.setJhmxh(api1404.getJhmxdh().replace(api1404.getLhjhdh() + api1404.getKqdm(), api1404.getLhjhdh() + apiData.getTyhwbm().substring(0, 22)));
+ }
+ }
+ //璁剧疆鍚堝悓鍙凤細缁熶竴搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
+ apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
+ }
return apiData;
}
if (Constant.API_CODE_1206.equals(inteId)) {
+ Api1206 api1206 = (Api1206) data;
SX2024Api1206 apiData = new SX2024Api1206();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1206, apiData);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(api1206.getKqdm().substring(0, 18));
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getCkjsdh().startsWith(api1206.getKqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1206.getKqdm());
+ apiData.setCkjsdh(apiData.getCkjsdh().replace(api1206.getKqdm(), tykqbm));
+ }
return apiData;
}
if (Constant.API_CODE_1207.equals(inteId)) {
+ Api1207 api1207 = (Api1207) data;
SX2024Api1207 apiData = new SX2024Api1207();
- BeanUtils.copyProperties(data, apiData);
- String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0,21));
- apiData.setDckqtybm(dckqtybm);
- String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0,21));
- apiData.setDrkqtybm(drkqtybm);
- String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
- apiData.setDchwtybm(dchwtybm);
- String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
- apiData.setDrhwtybm(drhwtybm);
+ BeanUtils.copyProperties(api1207, apiData);
+ //璁剧疆鍊掑嚭搴撳尯缁熶竴缂栫爜
+ if (StringUtils.isEmpty(apiData.getDckqtybm())) {
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0, 21));
+ apiData.setDckqtybm(dckqtybm);
+ }
+ //璁剧疆鍊掑叆搴撳尯缁熶竴缂栫爜
+ if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0, 21));
+ apiData.setDrkqtybm(drkqtybm);
+ }
+ //璁剧疆鍊掑嚭璐т綅缁熶竴缂栫爜
+ if (StringUtils.isEmpty(apiData.getDchwtybm())) {
+ String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
+ apiData.setDchwtybm(dchwtybm);
+ }
+ //璁剧疆鍊掑叆璐т綅缁熶竴缂栫爜
+ if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
+ String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+ apiData.setDrhwtybm(drhwtybm);
+ }
+ //璁剧疆鍊掍粨鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (apiData.getDcdh().startsWith(api1207.getKqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1207.getKqdm());
+ apiData.setDcdh(apiData.getDcdh().replace(api1207.getKqdm(), tykqbm));
+ }
return apiData;
}
if (Constant.API_CODE_1208.equals(inteId)) {
SX2024Api1208 apiData = new SX2024Api1208();
BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
- String lqgstydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
- apiData.setLqgstydwbm(lqgstydwbm);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆绮潈鍗曚綅绲变竴缂栫爜
+ if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
+ apiData.setLqgstydwbm(tydwbm);
+ }
return apiData;
}
if (Constant.API_CODE_1209.equals(inteId)) {
+ Api1209 api1209 = (Api1209) data;
SX2024Api1209 apiData = new SX2024Api1209();
- BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
+ BeanUtils.copyProperties(api1209, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鎹熺泭鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (apiData.getSydh().startsWith(apiData.getHwdm())) {
+ apiData.setSydh(apiData.getSydh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
+ //瀹為檯鎹熻�楁暟閲忚祴鍊�
+ apiData.setSjsysl(api1209.getJzsysl());
return apiData;
}
if (Constant.API_CODE_1210.equals(inteId)) {
SX2024Api1210 apiData = new SX2024Api1210();
BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鎬ц川鍙樻洿鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (apiData.getLsxzzbdh().startsWith(apiData.getHwdm())) {
+ apiData.setLsxzzbdh(apiData.getLsxzzbdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1211.equals(inteId)) {
SX2024Api1211 apiData = new SX2024Api1211();
BeanUtils.copyProperties(data, apiData);
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
return apiData;
}
if (Constant.API_CODE_1212.equals(inteId)) {
SX2024Api1212 apiData = new SX2024Api1212();
BeanUtils.copyProperties(data, apiData);
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ return apiData;
+ }
+ if (Constant.API_CODE_1213.equals(inteId)) {
+ SX2024Api1213 apiData = new SX2024Api1213();
+ BeanUtils.copyProperties(data, apiData);
+ apiData.setCfdm(apiData.getHwdm().substring(0, 25));
+ apiData.setAjdm(apiData.getHwdm().substring(0, 28));
+ //璁剧疆绲变竴浠撴埧缂栫爜
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
+ apiData.setTyajbm(tyajbm);
+ }
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
return apiData;
}
if (Constant.API_CODE_1301.equals(inteId)) {
SX2024Api1301 apiData = new SX2024Api1301();
BeanUtils.copyProperties(data, apiData);
- String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
- apiData.setTydwbm(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ apiData.setTydwbm(tydwbm);
+ }
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
return apiData;
}
if (Constant.API_CODE_1302.equals(inteId)) {
SX2024Api1302 apiData = new SX2024Api1302();
BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆鍗曞彿锛氱粺涓�璐т綅缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (apiData.getWsdjcdh().startsWith(apiData.getHwdm())) {
+ apiData.setWsdjcdh(apiData.getWsdjcdh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1303.equals(inteId)) {
SX2024Api1303 apiData = new SX2024Api1303();
BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
- apiData.setTyajbm(tyajbm);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
+ apiData.setTyajbm(tyajbm);
+ }
+ //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (apiData.getHcjcdh().startsWith(apiData.getHwdm())) {
+ apiData.setHcjcdh(apiData.getHcjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1304.equals(inteId)) {
SX2024Api1304 apiData = new SX2024Api1304();
BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
- apiData.setTyajbm(tyajbm);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
+ apiData.setTyajbm(tyajbm);
+ }
+ //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (apiData.getQtndjcdh().startsWith(apiData.getHwdm())) {
+ apiData.setQtndjcdh(apiData.getQtndjcdh().replace(apiData.getHwdm(), apiData.getTyajbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1305.equals(inteId)) {
+ Api1305 api1305 = (Api1305) data;
SX2024Api1305 apiData = new SX2024Api1305();
- BeanUtils.copyProperties(data, apiData);
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- //todo 缁熶竴璐т綅缂栫爜
-
+ BeanUtils.copyProperties(api1305, apiData);
+ //璁剧疆绲变竴浠撴埧缂栫爜
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(api1305.getHwdm().substring(0, 28));
+ apiData.setTyajbm(tyajbm);
+ }
+ //璁剧疆閫氶浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (apiData.getTfzydh().startsWith(api1305.getHwdm())) {
+ apiData.setTfzydh(apiData.getTfzydh().replace(api1305.getHwdm(), apiData.getTyajbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1306.equals(inteId)) {
+ Api1306 api1306 = (Api1306) data;
SX2024Api1306 apiData = new SX2024Api1306();
- BeanUtils.copyProperties(data, apiData);
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- //todo 缁熶竴璐т綅缂栫爜
+ BeanUtils.copyProperties(api1306, apiData);
+ //璁剧疆绲变竴浠撴埧缂栫爜
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //璁剧疆绲变竴寤掗棿缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(api1306.getHwdm().substring(0, 28));
+ apiData.setTyajbm(tyajbm);
+ }
+ //璁剧疆鐔忚捀浣滀笟鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (apiData.getXzzydh().startsWith(apiData.getCfdm())) {
+ apiData.setXzzydh(apiData.getXzzydh().replace(apiData.getCfdm(), apiData.getTyajbm()));
+ }
+ //璁剧疆鍗曞彿锛氱粺涓�寤掗棿缂栫爜+yyyyMMdd+4浣嶉『搴忓彿
+ if (apiData.getHcjcdh().startsWith(api1306.getHwdm())) {
+ apiData.setHcjcdh(apiData.getHcjcdh().replace(api1306.getHwdm(), apiData.getTyajbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1307.equals(inteId)) {
Api1307 api1307 = (Api1307) data;
SX2024Api1307 apiData = new SX2024Api1307();
BeanUtils.copyProperties(api1307, apiData);
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
- apiData.setTyhwbm(tyhwbm);
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //璁剧疆绲变竴浠撴埧缂栫爜
+ if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ String tycfbm = apiCommonService.getTykqbm(apiData.getCfdm());
+ apiData.setTycfbm(tycfbm);
+ }
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
//璁剧疆鏂囦欢娴�
apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
-
- //todo 浠撳唴鍥惧儚鏂囦欢璺緞 CNTXWJLJ
+ //棰勭疆浣�
+ if (apiData.getYzwbh().startsWith(apiData.getHwdm())) {
+ apiData.setYzwbh(apiData.getYzwbh().replace(apiData.getHwdm(), apiData.getTyhwbm()));
+ }
return apiData;
}
if (Constant.API_CODE_1308.equals(inteId)) {
SX2024Api1308 apiData = new SX2024Api1308();
BeanUtils.copyProperties(data, apiData);
- String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
- apiData.setTykqbm(tykqbm);
-
- //todo 瑙嗛鏂囦欢璺緞 SPWJLJ
+ //璁剧疆绲变竴搴撳尯缂栫爜
+ if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
+ //缁熶竴搴撳尯鍚嶇О
+ apiData.setTykqmc(apiData.getKqmc());
return apiData;
}
if (Constant.API_CODE_1309.equals(inteId)) {
+ Api1309 api1309 = (Api1309) data;
SX2024Api1309 apiData = new SX2024Api1309();
- BeanUtils.copyProperties(data, apiData);
- String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
- apiData.setWgdwtybm(tydwbm);
+ BeanUtils.copyProperties(api1309, apiData);
+ //璁剧疆杩濊鍗曚綅绲变竴缂栫爜
+ if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
+ apiData.setWgdwtybm(tydwbm);
+ }
+ //璁剧疆棰勮淇℃伅浠ｇ爜锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+3浣嶉『搴忓彿
+ if (apiData.getYjxxdm().startsWith(api1309.getKqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1309.getKqdm());
+ apiData.setYjxxdm(apiData.getYjxxdm().replace(api1309.getKqdm(), tykqbm));
+ }
return apiData;
}
if (Constant.API_CODE_1310.equals(inteId)) {
SX2024Api1310 apiData = new SX2024Api1310();
BeanUtils.copyProperties(data, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
return apiData;
}
if (Constant.API_CODE_1401.equals(inteId)) {
SX2024Api1401 apiData = new SX2024Api1401();
BeanUtils.copyProperties(data, apiData);
- String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
- apiData.setTydwbm(tydwbm);
- apiData.setCcqytydm(tydwbm);
+ //璁剧疆鎵垮偍浼佷笟缁熶竴缂栫爜銆佺粺涓�鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getCcqytydm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
+ apiData.setCcqytydm(tydwbm);
+ apiData.setTydwbm(tydwbm);
+ }
return apiData;
}
if (Constant.API_CODE_1403.equals(inteId)) {
SX2024Api1403 apiData = new SX2024Api1403();
BeanUtils.copyProperties(data, apiData);
- String tydwbm = apiCommonService.getTydwbm(apiData.getJhxddw());
- apiData.setJHXDDWTYBM(tydwbm);
+ //璁剧疆绲变竴鍗曚綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getJhxddwtybm())) {
+ String tydwbm = apiCommonService.getTydwbm(apiData.getJhxddw());
+ apiData.setJhxddwtybm(tydwbm);
+ }
return apiData;
}
if (Constant.API_CODE_1404.equals(inteId)) {
+ Api1404 api1404 = (Api1404) data;
SX2024Api1404 apiData = new SX2024Api1404();
- BeanUtils.copyProperties(data, apiData);
- String tyhwbm = apiCommonService.getTyhwbm(apiData.getLhhwdm());
- apiData.setLhhwtybm(tyhwbm);
+ BeanUtils.copyProperties(api1404, apiData);
+ //璁剧疆绲变竴璐т綅缂栫爜
+ if (StringUtils.isEmpty(apiData.getLhhwtybm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getLhhwdm());
+ apiData.setLhhwtybm(tyhwbm);
+ }
+ //璁″垝鏄庣粏鍙凤細鏇存崲涓鸿疆鎹㈣鍒掑崟鍙�+缁熶竴搴撳尯缂栫爜+4涓洪『搴忓彿
+ if (apiData.getJhmxdh().startsWith(apiData.getLhjhdh() + api1404.getKqdm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1404.getKqdm());
+ apiData.setJhmxdh(apiData.getJhmxdh().replace(apiData.getLhjhdh() + api1404.getKqdm(), apiData.getLhjhdh() + tykqbm));
+ }
return apiData;
+ }
+ if (Constant.API_CODE_1504.equals(inteId)) {
+ 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 data;
+ }
+ if (Constant.API_CODE_1505.equals(inteId)) {
+ SX2024Api1505 apiData = new SX2024Api1505();
+ BeanUtils.copyProperties(data, apiData);
+ return data;
+ }
+ if (Constant.API_CODE_1506.equals(inteId)) {
+ SX2024Api1506 apiData = new SX2024Api1506();
+ BeanUtils.copyProperties(data, apiData);
+ return data;
+ }
+ if (Constant.API_CODE_1507.equals(inteId)) {
+ SX2024Api1507 apiData = new SX2024Api1507();
+ BeanUtils.copyProperties(data, apiData);
+ return data;
+ }
+ if (Constant.API_CODE_1508.equals(inteId)) {
+ SX2024Api1508 apiData = new SX2024Api1508();
+ BeanUtils.copyProperties(data, apiData);
+ return data;
+ }
+ if (Constant.API_CODE_1509.equals(inteId)) {
+ SX2024Api1509 apiData = new SX2024Api1509();
+ BeanUtils.copyProperties(data, apiData);
+ return data;
+ }
+ if (Constant.API_CODE_1510.equals(inteId)) {
+ SX2024Api1510 apiData = new SX2024Api1510();
+ BeanUtils.copyProperties(data, apiData);
+ return data;
}
return data;
}
@@ -554,255 +905,6 @@
e.printStackTrace();
}
return object;
- }
-
- /**
- * 鑾峰彇璐㈠姟灏佽鏁版嵁
- *
- * @param inteId
- * @param data
- * @return
- */
- private List<SXFinanceDto> getFinanceData(String inteId, Object data) {
- //璐㈠姟鎶ヨ〃鏁版嵁灏佽
- if (Constant.API_CODE_1114_1501.equals(inteId)) {
- return copyApi1501((Api1501) data);
- } else if (Constant.API_CODE_1114_1502.equals(inteId)) {
- return copyApi1502((Api1502) data);
- } else {
- return copyApi1503((Api1503) data);
- }
- }
-
- /**
- * 灏佽1501-璧勪骇璐熷�烘暟鎹�
- *
- * @param api1503
- * @return
- */
- private List<SXFinanceDto> copyApi1503(Api1503 api1503) {
- List<SXFinanceDto> list = new ArrayList<>();
- SXFinanceDto SXFinanceDto = new SXFinanceDto();
- SXFinanceDto.setDWDM(api1503.getDwdm());
- SXFinanceDto.setKQDM(api1503.getKqdm());
- SXFinanceDto.setBBSJ(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
- SXFinanceDto.setBBM("03");
- SXFinanceDto.setCZBZ(api1503.getCzbz());
- SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
- paddingData(SXFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
- paddingData(SXFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
- paddingData(SXFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
- paddingData(SXFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
- paddingData(SXFinanceDto, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
- paddingData(SXFinanceDto, list, "5", "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
- paddingData(SXFinanceDto, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
- paddingData(SXFinanceDto, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
- paddingData(SXFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
- paddingData(SXFinanceDto, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
- paddingData(SXFinanceDto, list, "10", "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
- paddingData(SXFinanceDto, list, "11", "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
- paddingData(SXFinanceDto, list, "12", "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
- paddingData(SXFinanceDto, list, "13", "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
- paddingData(SXFinanceDto, list, "14", "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
- paddingData(SXFinanceDto, list, "15", "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
- paddingData(SXFinanceDto, list, "16", "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
- paddingData(SXFinanceDto, list, "17", "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
- paddingData(SXFinanceDto, list, "18", "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
- paddingData(SXFinanceDto, list, "19", "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
- paddingData(SXFinanceDto, list, "20", "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
- paddingData(SXFinanceDto, list, "21", "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
- paddingData(SXFinanceDto, list, "22", "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
- paddingData(SXFinanceDto, list, "23", "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
- paddingData(SXFinanceDto, list, "24", "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
- paddingData(SXFinanceDto, list, "25", "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
- paddingData(SXFinanceDto, list, "26", "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
- paddingData(SXFinanceDto, list, "27", "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
- paddingData(SXFinanceDto, list, "28", "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
- paddingData(SXFinanceDto, list, "29", "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(SXFinanceDto, list, "30", "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
- paddingData(SXFinanceDto, list, "31", "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
- paddingData(SXFinanceDto, list, "32", "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
- paddingData(SXFinanceDto, list, "33", "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
- paddingData(SXFinanceDto, list, "34", "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
- paddingData(SXFinanceDto, list, "35", "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
- paddingData(SXFinanceDto, list, "36", "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
-
- return list;
- }
-
- /**
- * 灏佽1502-鐜伴噾娴佹暟鎹�
- *
- * @param api1502
- * @return
- */
- private List<SXFinanceDto> copyApi1502(Api1502 api1502) {
- List<SXFinanceDto> list = new ArrayList<>();
- SXFinanceDto SXFinanceDto = new SXFinanceDto();
- SXFinanceDto.setDWDM(api1502.getDwdm());
- SXFinanceDto.setKQDM(api1502.getKqdm());
- SXFinanceDto.setBBSJ(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
- SXFinanceDto.setBBM("02");
- SXFinanceDto.setCZBZ(api1502.getCzbz());
- SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
- paddingData(SXFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
- paddingData(SXFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
- paddingData(SXFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
- paddingData(SXFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
- paddingData(SXFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
- paddingData(SXFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
- paddingData(SXFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
- paddingData(SXFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
- paddingData(SXFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
- paddingData(SXFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
- paddingData(SXFinanceDto, list, "10", "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
- paddingData(SXFinanceDto, list, "11", "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
- paddingData(SXFinanceDto, list, "12", "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
- paddingData(SXFinanceDto, list, "13", "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
- paddingData(SXFinanceDto, list, "14", "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
- paddingData(SXFinanceDto, list, "15", "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
- paddingData(SXFinanceDto, list, "16", "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
- paddingData(SXFinanceDto, list, "17", "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(SXFinanceDto, list, "18", "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
- paddingData(SXFinanceDto, list, "19", "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
- paddingData(SXFinanceDto, list, "20", "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
- paddingData(SXFinanceDto, list, "21", "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
- paddingData(SXFinanceDto, list, "22", "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
- paddingData(SXFinanceDto, list, "23", "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
- paddingData(SXFinanceDto, list, "24", "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
- paddingData(SXFinanceDto, list, "25", "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
- paddingData(SXFinanceDto, list, "26", "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
- paddingData(SXFinanceDto, list, "27", "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
- paddingData(SXFinanceDto, list, "28", "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
- paddingData(SXFinanceDto, list, "29", "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
- paddingData(SXFinanceDto, list, "30", "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
- paddingData(SXFinanceDto, list, "31", "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
- paddingData(SXFinanceDto, list, "32", "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
- paddingData(SXFinanceDto, list, "33", "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
- paddingData(SXFinanceDto, list, "34", "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
- paddingData(SXFinanceDto, list, "35", "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
- paddingData(SXFinanceDto, list, "36", "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
- paddingData(SXFinanceDto, list, "37", "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
- paddingData(SXFinanceDto, list, "38", "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
-
- return list;
- }
-
- /**
- * 灏佽1503-鍒╂鼎琛ㄦ暟鎹�
- *
- * @param api1501
- * @return
- */
- private List<SXFinanceDto> copyApi1501(Api1501 api1501) {
- List<SXFinanceDto> list = new ArrayList<>();
- SXFinanceDto SXFinanceDto = new SXFinanceDto();
- SXFinanceDto.setDWDM(api1501.getDwdm());
- SXFinanceDto.setKQDM(api1501.getKqdm());
- SXFinanceDto.setBBSJ(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
- SXFinanceDto.setBBM("01");
- SXFinanceDto.setCZBZ(api1501.getCzbz());
- SXFinanceDto.setZHGXSJ(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
-
- paddingData(SXFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(SXFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(SXFinanceDto, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
- paddingData(SXFinanceDto, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
- paddingData(SXFinanceDto, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
- paddingData(SXFinanceDto, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
- paddingData(SXFinanceDto, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
- paddingData(SXFinanceDto, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
- paddingData(SXFinanceDto, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
- paddingData(SXFinanceDto, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
- paddingData(SXFinanceDto, list, "10", "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
- paddingData(SXFinanceDto, list, "11", "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
- paddingData(SXFinanceDto, list, "12", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
- paddingData(SXFinanceDto, list, "13", "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
- paddingData(SXFinanceDto, list, "14", "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(SXFinanceDto, list, "15", "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(SXFinanceDto, list, "16", "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
- paddingData(SXFinanceDto, list, "17", "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
- paddingData(SXFinanceDto, list, "18", "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
- paddingData(SXFinanceDto, list, "19", "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
- paddingData(SXFinanceDto, list, "20", "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
- paddingData(SXFinanceDto, list, "21", "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
- paddingData(SXFinanceDto, list, "22", "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
- paddingData(SXFinanceDto, list, "23", "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
- paddingData(SXFinanceDto, list, "24", "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
- paddingData(SXFinanceDto, list, "25", "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
- paddingData(SXFinanceDto, list, "26", "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
- paddingData(SXFinanceDto, list, "27", "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
- paddingData(SXFinanceDto, list, "28", "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
- paddingData(SXFinanceDto, list, "29", "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
- paddingData(SXFinanceDto, list, "30", "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
- paddingData(SXFinanceDto, list, "31", "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
- paddingData(SXFinanceDto, list, "32", "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
- paddingData(SXFinanceDto, list, "33", "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
- paddingData(SXFinanceDto, list, "34", "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
- paddingData(SXFinanceDto, list, "35", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
- paddingData(SXFinanceDto, list, "36", "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(SXFinanceDto, list, "37", "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
- paddingData(SXFinanceDto, list, "38", "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
- paddingData(SXFinanceDto, list, "39", "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
- paddingData(SXFinanceDto, list, "40", "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
- paddingData(SXFinanceDto, list, "41", "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(SXFinanceDto, list, "42", "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
- paddingData(SXFinanceDto, list, "43", "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
- paddingData(SXFinanceDto, list, "44", "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
- paddingData(SXFinanceDto, list, "45", "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(SXFinanceDto, list, "46", "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
- paddingData(SXFinanceDto, list, "47", "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
- paddingData(SXFinanceDto, list, "48", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
- paddingData(SXFinanceDto, list, "49", "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
- paddingData(SXFinanceDto, list, "50", "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
- paddingData(SXFinanceDto, list, "51", "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(SXFinanceDto, list, "52", "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
- paddingData(SXFinanceDto, list, "53", "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
- paddingData(SXFinanceDto, list, "54", "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
- paddingData(SXFinanceDto, list, "55", "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
- paddingData(SXFinanceDto, list, "56", "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
- paddingData(SXFinanceDto, list, "57", "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
- paddingData(SXFinanceDto, list, "58", "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
- paddingData(SXFinanceDto, list, "59", "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
- paddingData(SXFinanceDto, list, "60", "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
- paddingData(SXFinanceDto, list, "61", "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
- paddingData(SXFinanceDto, list, "62", "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
- paddingData(SXFinanceDto, list, "63", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(SXFinanceDto, list, "64", "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
- paddingData(SXFinanceDto, list, "65", "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
- paddingData(SXFinanceDto, list, "66", "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
- paddingData(SXFinanceDto, list, "67", "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
- paddingData(SXFinanceDto, list, "68", "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
- paddingData(SXFinanceDto, list, "69", "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
- paddingData(SXFinanceDto, list, "70", "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
- paddingData(SXFinanceDto, list, "71", "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
- paddingData(SXFinanceDto, list, "72", "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
- paddingData(SXFinanceDto, list, "73", "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
- paddingData(SXFinanceDto, list, "74", "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
- paddingData(SXFinanceDto, list, "75", "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
- return list;
- }
-
- /**
- * 璐㈠姟鏁版嵁灏佽
- *
- * @param common
- * @param list
- * @param zbxh
- * @param zbmc
- * @param zbz1
- * @param zbz2
- */
- private void paddingData(SXFinanceDto common, List<SXFinanceDto> list, String zbxh, String zbmc, String zbz1, String zbz2) {
- SXFinanceDto SXFinanceDto = new SXFinanceDto();
- BeanUtils.copyProperties(common, SXFinanceDto);
- SXFinanceDto.setZBXH(zbxh);
- SXFinanceDto.setZBMC(zbmc);
- SXFinanceDto.setZBZ1(zbz1);
- SXFinanceDto.setZBZ2(zbz2);
- list.add(SXFinanceDto);
}
/**
@@ -861,6 +963,8 @@
return SX2024Constant.SX_2024_API_ODS_UP_ZMKCXXJK;
case "1212":
return SX2024Constant.SX_2024_API_ODS_UP_KHXXJK;
+ case "1213":
+ return SX2024Constant.SX_2024_API_ODS_UP_FCQRDXXJK;
case "1301":
return SX2024Constant.SX_2024_API_ODS_UP_AQGLXXJK;
case "1302":
@@ -887,12 +991,20 @@
return SX2024Constant.SX_2024_API_ODS_UP_LHJHXXJK;
case "1404":
return SX2024Constant.SX_2024_API_ODS_UP_LHJHMXXXJK;
- case "1501":
- return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
- case "1502":
- return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
- case "1503":
- return SX2024Constant.SX_2024_API_ODS_UP_CWBBXXJK;
+ case "1504":
+ return SX2024Constant.SX_2024_API_ODS_UP_ZTXXJK;
+ case "1505":
+ return SX2024Constant.SX_2024_API_ODS_UP_KMXXJK;
+ case "1506":
+ return SX2024Constant.SX_2024_API_ODS_UP_KMYEXXJK;
+ case "1507":
+ return SX2024Constant.SX_2024_API_ODS_UP_HJPZXXJK;
+ case "1508":
+ return SX2024Constant.SX_2024_API_ODS_UP_XJLLFPXXJK;
+ case "1509":
+ return SX2024Constant.SX_2024_API_ODS_UP_GDZCKPXXJK;
+ case "1510":
+ return SX2024Constant.SX_2024_API_ODS_UP_ZCZJXXJK;
default:
return inteId;
}
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024Constant.java b/src/main/java/com/fzzy/push/sx2024/SX2024Constant.java
index 39a5d22..eee6708 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024Constant.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024Constant.java
@@ -110,6 +110,11 @@
public static String SX_2024_API_ODS_UP_KHXXJK = "ODS_UP_KHXXJK";
/**
+ * ODS_UP_KHXXJK 灏佷粨纭鍗曟帴鍙�
+ */
+ public static String SX_2024_API_ODS_UP_FCQRDXXJK = "ODS_UP_FCQRDXXJK";
+
+ /**
* ODS_UP_AQGLXXJK 瀹夊叏绠＄悊鏁版嵁鎺ュ彛
*/
public static String SX_2024_API_ODS_UP_AQGLXXJK = "ODS_UP_AQGLXXJK";
@@ -161,4 +166,32 @@
* ODS_UP_LHJHMXXXJK 杞崲璁″垝鏄庣粏淇℃伅鏁版嵁鎺ュ彛
*/
public static String SX_2024_API_ODS_UP_LHJHMXXXJK = "ODS_UP_LHJHMXXXJK";
+ /**
+ * ODS_UP_LHJHMXXXJK 璐﹀淇℃伅
+ */
+ public static String SX_2024_API_ODS_UP_ZTXXJK = "ODS_UP_ZTXXJK";
+ /**
+ * ODS_UP_LHJHMXXXJK 绉戠洰淇℃伅
+ */
+ public static String SX_2024_API_ODS_UP_KMXXJK = "ODS_UP_KMXXJK";
+ /**
+ * ODS_UP_LHJHMXXXJK 绉戠洰浣欓淇℃伅
+ */
+ public static String SX_2024_API_ODS_UP_KMYEXXJK = "ODS_UP_KMYEXXJK";
+ /**
+ * ODS_UP_LHJHMXXXJK 浼氳鍑瘉淇℃伅
+ */
+ public static String SX_2024_API_ODS_UP_HJPZXXJK = "ODS_UP_HJPZXXJK";
+ /**
+ * ODS_UP_LHJHMXXXJK 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ */
+ public static String SX_2024_API_ODS_UP_XJLLFPXXJK = "ODS_UP_XJLLFPXXJK";
+ /**
+ * ODS_UP_LHJHMXXXJK 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ */
+ public static String SX_2024_API_ODS_UP_GDZCKPXXJK = "ODS_UP_GDZCKPXXJK";
+ /**
+ * ODS_UP_LHJHMXXXJK 璧勪骇鎶樻棫淇℃伅
+ */
+ public static String SX_2024_API_ODS_UP_ZCZJXXJK = "ODS_UP_ZCZJXXJK";
}
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024OrderServiceImpl.java b/src/main/java/com/fzzy/push/sx2024/SX2024OrderServiceImpl.java
index a2ad449..246f11b 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024OrderServiceImpl.java
@@ -8,10 +8,7 @@
import com.fzzy.order.ordersx2023.OrderSxService;
import com.fzzy.order.ordersx2023.data.OrderSxConstant;
import com.fzzy.order.ordersx2023.data.OrderSxReq;
-import com.fzzy.push.impl.ComPushService11;
-import com.fzzy.push.impl.ComPushService12;
-import com.fzzy.push.impl.ComPushService13;
-import com.fzzy.push.impl.ComPushService14;
+import com.fzzy.push.impl.*;
import com.fzzy.push.sx2023.SX2023ApiRemoteService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -42,6 +39,8 @@
private ComPushService13 pushService13;
@Autowired
private ComPushService14 pushService14;
+ @Autowired
+ private ComPushService15 pushService15;
@Override
public String getProtocol() {
@@ -120,9 +119,6 @@
case "ODS_UP_RYXXJK":
pushService11.pushData1112(apiRemoteService, param);
break;
- case "ODS_UP_CWBBXXJK":
- pushService11.pushData1114(apiRemoteService, param);
- break;
case "ODS_UP_HTXXJK":
pushService12.pushData1201(apiRemoteService, param);
break;
@@ -198,6 +194,27 @@
case "ODS_UP_LHJHMXXXJK":
pushService14.pushData1404(apiRemoteService, param);
break;
+ case "ODS_UP_ZTXXJK":
+ pushService15.pushData1504(apiRemoteService, param);
+ break;
+ case "ODS_UP_KMXXJK":
+ pushService15.pushData1505(apiRemoteService, param);
+ break;
+ case "ODS_UP_KMYEXXJK":
+ pushService15.pushData1506(apiRemoteService, param);
+ break;
+ case "ODS_UP_HJPZXXJK":
+ pushService15.pushData1507(apiRemoteService, param);
+ break;
+ case "ODS_UP_XJLLFPXXJK":
+ pushService15.pushData1508(apiRemoteService, param);
+ break;
+ case "ODS_UP_GDZCKPXXJK":
+ pushService15.pushData1509(apiRemoteService, param);
+ break;
+ case "ODS_UP_ZCZJXXJK":
+ pushService15.pushData1510(apiRemoteService, param);
+ break;
default:
log.error("-----闄曡タ鐪佸钩鍙帮細鏈尮閰嶅埌鎺ュ彛缂栫爜锛屼笉鎺ㄩ��-----");
break;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1101.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1101.java
index 66b18c1..8f1f4d6 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1101.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1101.java
@@ -25,12 +25,17 @@
private String dwdm;
@PropertyDef(label = "鍗曚綅缂栫爜--11浣�")
+ @JsonProperty("DWBM")
private String dwbm;
@PropertyDef(label = "涓婄骇鍗曚綅缁熶竴缂栫爜")
@JsonProperty("SJDWTYBM")
private String sjdwtybm;
+ @PropertyDef(label = "缁熶竴鍗曚綅鍚嶇О")
+ @JsonProperty("TYDWMC")
+ private String tydwmc;
+
@PropertyDef(label = "鍗曚綅鍚嶇О")
@JsonProperty("DWMC")
private String dwmc;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1108.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1108.java
index f2e1146..b759c2b 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1108.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1108.java
@@ -58,7 +58,7 @@
private String bzw;
@PropertyDef(label = "鍨嬪彿瑙勬牸")
- @JsonProperty("BZW")
+ @JsonProperty("GGXH")
private String ggxh;
@PropertyDef(label = "瀹夊叏浣跨敤璇存槑涔�")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1110.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1110.java
index 989a6e7..b4ab34d 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1110.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1110.java
@@ -35,6 +35,10 @@
@JsonProperty("HWDM")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ @JsonProperty("TYHWBM")
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅鐩稿浣嶇疆")
@JsonProperty("HWXDWZ")
private String hwxdwz;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1111.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1111.java
index 483ac15..2a28f31 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1111.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1111.java
@@ -40,10 +40,6 @@
@JsonProperty("SPJKSBID")
private String spjksbid;
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- @JsonProperty("DWDM")
- private String dwmc;
-
@PropertyDef(label = "瑙嗛鐩戞帶璁惧鐩稿浣嶇疆")
@JsonProperty("SPJKSBXDWZ")
private String spjksbxdwz;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1201.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1201.java
index a2e582f..1ffd746 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1201.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1201.java
@@ -130,7 +130,7 @@
@PropertyDef(label = "浠樻鏂瑰紡")
@JsonProperty("FKFS")
- private BigDecimal FKFS;
+ private String FKFS;
@PropertyDef(label = "缁撶畻鎬婚噾棰�")
@JsonProperty("JSZJE")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1204.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1204.java
index 8a6713e..69794fb 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1204.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1204.java
@@ -37,7 +37,7 @@
private double jssl;
@PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
- @JsonProperty("JSSL")
+ @JsonProperty("JSDJ")
private double jsdj;
@PropertyDef(label = "缁撶畻閲戦(鍏�)")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1206.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1206.java
index 6bc371c..7df19c2 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1206.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1206.java
@@ -33,7 +33,7 @@
private double jssl;
@PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
- @JsonProperty("JSSL")
+ @JsonProperty("JSDJ")
private double jsdj;
@PropertyDef(label = "缁撶畻閲戦(鍏�)")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1207.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1207.java
index d1da483..dc2c721 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1207.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1207.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -73,6 +74,16 @@
@JsonProperty("DCRQ")
private Date dcrq;
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掍粨寮�濮嬫棩鏈�" )
+ @JsonProperty("DCKSRQ")
+ private Date dcksrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掍粨缁撴潫鏃ユ湡" )
+ @JsonProperty("DCJSRQ")
+ private Date dcjsrq;
+
@PropertyDef(label = "鍊掍粨鏁伴噺(鍏枻)")
@JsonProperty("DCSL")
private double dcsl;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java
index f12aef7..bd1c118 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java
@@ -76,32 +76,28 @@
private Double cksf;
@PropertyDef(label = "鍑哄簱鏉傝川(%)")
- @JsonProperty("CKSF")
+ @JsonProperty("CKZZ")
private Double ckzz;
@PropertyDef(label = "鍌ㄥ瓨鏃堕暱")
@JsonProperty("CCSC")
- private Double ccsc;
-
- @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)")
- @JsonProperty("JZSYSL")
- private Double jzsysl;
+ private Integer ccsc;
@PropertyDef(label = "瀹為檯鎹熸孩鏁伴噺(鍏枻)")
@JsonProperty("SJSYSL")
private Double sjsysl;
- @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)")
+ @PropertyDef(label = "姘存潅鍑忛噺(鍏枻)")
@JsonProperty("QZSZKL")
private Double qzszkl;
- @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)")
+ @PropertyDef(label = "鑷劧鎹熻�楀畾棰�(鍏枻)")
@JsonProperty("QZZRSHDE")
private Double qzzrshde;
@PropertyDef(label = "鏄惁瓒呰��")
@JsonProperty("SFCH")
- private String sfch;
+ private Integer sfch;
@PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)")
@JsonProperty("CHSL")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1210.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1210.java
index 5e4e1bb..93a0b9b 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1210.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1210.java
@@ -54,7 +54,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍒掕浆鏃ユ湡")
- @JsonProperty("HZHLSXZDM")
+ @JsonProperty("HZRQ")
private Date hzrq;
@PropertyDef(label = "浠撳偍瀹℃牳浜�")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1213.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1213.java
new file mode 100644
index 0000000..fb8aa35
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1213.java
@@ -0,0 +1,107 @@
+package com.fzzy.push.sx2024.data;
+
+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 1212-灏佷粨纭鍗�
+ * @Author CZT
+ * @Date 2024/11/6 14:27
+ */
+@Data
+public class SX2024Api1213 implements Serializable {
+
+ @PropertyDef(label = "灏佷粨纭鍗曞彿", description = "2浣嶄笟鍔＄紪鐮�(21浠ｈ〃灏佷粨)+yyMMdd+4浣嶉『搴忕爜锛�212405040001")
+ @JsonProperty("FCQRDH")
+ private String fcqrdh;
+
+ @PropertyDef(label = "浠撴埧浠ｇ爜" )
+ @JsonProperty("CFDM")
+ private String cfdm;
+
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜" )
+ @JsonProperty("TYCFBM")
+ private String tycfbm;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ @JsonProperty("AJDM")
+ private String ajdm;
+
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ @JsonProperty("TYAJBM")
+ private String tyajbm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @JsonProperty("HWDM")
+ private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ @JsonProperty("TYHWBM")
+ private String tyhwbm;
+
+ @PropertyDef(label = "灏佷粨鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ @JsonProperty("FCRQ")
+ private Date fcrq;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ @JsonProperty("LSPZDM")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ @JsonProperty("LSXZDM")
+ private String lsxzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ @JsonProperty("LSDJDM")
+ private String lsdjdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ @JsonProperty("SHND")
+ private String shnd;
+
+ @PropertyDef(label = "鍥藉埆")
+ @JsonProperty("GB")
+ private String gb;
+
+ @PropertyDef(label = "浜у湴")
+ @JsonProperty("CD")
+ private String cd;
+
+ @PropertyDef(label = "淇濈鍛�")
+ @JsonProperty("BGY")
+ private String bgy;
+
+ @PropertyDef(label = "灏佷粨鏁伴噺")
+ @JsonProperty("FCSL")
+ private Double fcsl;
+
+ @PropertyDef(label = "灏佷粨鐢宠浜�")
+ @JsonProperty("FCSQR")
+ private String fcsqr;
+
+ @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
+ @JsonProperty("BMSHR")
+ private String bmshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ @JsonProperty("LDSHR")
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ @JsonProperty("BZ")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @JsonProperty("CZBZ")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @JsonProperty("ZHGXSJ")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1301.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1301.java
index e66c076..9bbf869 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1301.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1301.java
@@ -28,6 +28,10 @@
@JsonProperty("KQDM")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ @JsonProperty("TYKQBM")
+ private String tykqbm;
+
@PropertyDef(label = "鍦扮偣")
@JsonProperty("DD")
private String dd;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1306.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1306.java
index 48da30b..6aaf901 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1306.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1306.java
@@ -22,7 +22,7 @@
private String tyajbm;
@PropertyDef(label = "浠撴埧浠ｇ爜")
- @JsonProperty("ZHGXSJ")
+ @JsonProperty("CFDM")
private String cfdm;
@PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
@@ -209,7 +209,7 @@
private Date sqrq;
@PropertyDef(label = "鏁ｆ皵鏂规硶")
- @JsonProperty("SQRQ")
+ @JsonProperty("SQFF")
private String sqff;
@PropertyDef(label = "鏁ｆ皵鎵瑰噯浜�")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1308.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1308.java
index bc074b7..84df249 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1308.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1308.java
@@ -58,7 +58,7 @@
private String ycgjsm;
@PropertyDef(label = "瑙嗛鏂囦欢娴�")
- @JsonProperty("YCGJSM")
+ @JsonProperty("SPWJL")
private String spwjl;
@PropertyDef(label = "瑙嗛鏂囦欢鍚庣紑鍚�")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1310.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1310.java
index c1f94b3..7ec59b1 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1310.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1310.java
@@ -20,6 +20,10 @@
@JsonProperty("HWDM")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅浠ｇ爜")
+ @JsonProperty("TYHWBM")
+ private String tyhwbm;
+
@PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
@JsonProperty("ZJBGDH")
private String zjbgdh;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1403.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1403.java
index 32e913c..463ecc3 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1403.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1403.java
@@ -48,7 +48,7 @@
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅缁熶竴缂栫爜")
@JsonProperty("JHXDDWTYBM")
- private String JHXDDWTYBM;
+ private String jhxddwtybm;
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О")
@JsonProperty("JHXDDWMC")
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
new file mode 100644
index 0000000..dfac64d
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
@@ -0,0 +1,68 @@
+package com.fzzy.push.sx2024.data;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 璐﹀淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:15
+ */
+@Data
+public class SX2024Api1504 implements Serializable {
+
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "璐﹀鍚嶇О")
+ private String cAcctName;
+
+ @PropertyDef(label = "鏈綅甯�")
+ private String cCurrency;
+
+ @PropertyDef(label = "浼氳涓荤")
+ private String cAcctChief;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏈熼棿")
+ private String cPeriodStart;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏃ユ湡")
+ private String cYearBmd;
+
+ @PropertyDef(label = "鏈熼棿鏁�")
+ private Double nAcctPeriodNum;
+
+ @PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
+ private String cAccClassCode;
+
+ @PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
+ private Double nAccGrade;
+
+ @PropertyDef(label = "绉戠洰缂栫爜瑙勫垯", description = "4222XXXX:榛樿鍓嶅洓绾х骇闀胯鍒欎负4222")
+ private String cAccCodeStr;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ private String cCropName;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String cOrgCode;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String xqydm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String xkqdm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
new file mode 100644
index 0000000..b77788e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1505.java
@@ -0,0 +1,78 @@
+package com.fzzy.push.sx2024.data;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绉戠洰淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:20
+ */
+@Data
+public class SX2024Api1505 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "骞村害")
+ private String cYear;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ private String cCode;
+
+ @PropertyDef(label = "绉戠洰鍚嶇О")
+ private String cName;
+
+ @PropertyDef(label = "绉戠洰鍏ㄧО")
+ private String cAllName;
+
+ /**
+ * 1:璧勪骇绫�
+ * 2:璐熷�虹被
+ * 3:鍏卞悓绫�
+ * 4:鎵�鏈夎�呮潈鐩婄被
+ * 5:鎴愭湰璐圭敤绫�
+ * 6:鎹熺泭绫�
+ */
+ @PropertyDef(label = "绉戠洰绫诲埆")
+ private String nClass;
+ /**
+ * (-1)-璐锋柟锛�1-鍊熸柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ private String cDc;
+
+ @PropertyDef(label = "鏈骇绉戠洰")
+ private String bL;
+
+ @PropertyDef(label = "绉戠洰绾ф")
+ private Double nGrade;
+
+ @PropertyDef(label = "鏁伴噺绉戠洰")
+ private String bQ;
+
+ @PropertyDef(label = "鏁伴噺鍗曚綅")
+ private String cQUnit;
+
+ @PropertyDef(label = "鐜伴噾绫荤鐩�")
+ private String bCash;
+
+ @PropertyDef(label = "閾惰绫荤鐩�")
+ private String bBank;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
+ private String bXjll;
+
+ @PropertyDef(label = "鍐荤粨")
+ private String bF;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java
new file mode 100644
index 0000000..fc2125e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1506.java
@@ -0,0 +1,74 @@
+package com.fzzy.push.sx2024.data;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绉戠洰浣欓淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:25
+ */
+@Data
+public class SX2024Api1506 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鏈熼棿")
+ private String cYear;
+
+ @PropertyDef(label = "骞村害")
+ private String nNo;
+
+ @PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
+ private Double bM;
+
+ @PropertyDef(label = "鏈熸湯鏈綅甯佷綑棰�")
+ private Double eM;
+
+ @PropertyDef(label = "鏈熷垵鏁伴噺")
+ private Double bQty;
+
+ @PropertyDef(label = "鏈熸湯鏁伴噺")
+ private Double eQty;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ private String cDc;
+
+ @PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
+ private Double dM;
+
+ @PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
+ private Double cM;
+
+ @PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
+ private Double dQ;
+
+ @PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
+ private Double cQ;
+
+ @PropertyDef(label = "鏈熷垵澶栧竵浣欓")
+ private Double bFm;
+
+ @PropertyDef(label = "鏈熸湯澶栧竵浣欓")
+ private Double eFm;
+
+ @PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
+ private Double dFm;
+
+ @PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
+ private Double cFm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java
new file mode 100644
index 0000000..d729a28
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1507.java
@@ -0,0 +1,102 @@
+package com.fzzy.push.sx2024.data;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 浼氳鍑瘉淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:30
+ */
+@Data
+public class SX2024Api1507 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ private String cVKind;
+
+ @PropertyDef(label = "鏈熼棿")
+ private Double cMon;
+
+ @PropertyDef(label = "骞村害")
+ private Double cYear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ private Double nVNo;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ private Double nNo;
+
+ @PropertyDef(label = "鍑瘉鍒嗙被")
+ private Double bTmp;
+
+ @PropertyDef(label = "鎽樿")
+ private String Digest;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ private Double cCode;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍑瘉鏃ユ湡")
+ private String cVSmallDatetime;
+
+ @PropertyDef(label = "鍒跺崟浜�")
+ private String cMaker;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ private String cDc;
+
+ @PropertyDef(label = "瀹℃牳浜�")
+ private String cCkEr;
+
+ @PropertyDef(label = "璁拌处浜�")
+ private String cPtEr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "璁拌处鏍囧織")
+ private Double bPt;
+
+ @PropertyDef(label = "闄勪欢寮犳暟")
+ private Double nANum;
+
+ @PropertyDef(label = "閲戦")
+ private Double nM;
+
+ @PropertyDef(label = "鏁伴噺")
+ private Double nQty;
+
+ @PropertyDef(label = "鍗曚环")
+ private Double nPrice;
+
+ @PropertyDef(label = "缁撶畻鍙�")
+ private String cSettleNo;
+
+ @PropertyDef(label = "鍑虹撼")
+ private String cCashier;
+
+ @PropertyDef(label = "姹囩巼")
+ private Double rate;
+
+ @PropertyDef(label = "澶栧竵閲戦")
+ private Double nFm;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅",description = "璁￠噺鍗曚綅姹夊瓧")
+ private String meterUnitId;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java
new file mode 100644
index 0000000..184b480
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1508.java
@@ -0,0 +1,62 @@
+package com.fzzy.push.sx2024.data;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:35
+ */
+@Data
+public class SX2024Api1508 implements Serializable {
+
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ private String cVKind;
+
+ @PropertyDef(label = "鏈熼棿")
+ private Double cMon;
+
+ @PropertyDef(label = "骞村害")
+ private Double cYear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ private Double nVNo;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ private String cCode;
+
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ private String cDFCode;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺椤圭洰浠ｇ爜")
+ private String cCashCode;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ private Double nNo;
+
+ @PropertyDef(label = "閲戦")
+ private Double nM;
+
+ /**
+ * 1:娴佸叆
+ * -1:娴佸嚭
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ private String cDc;
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java
new file mode 100644
index 0000000..2615a76
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1509.java
@@ -0,0 +1,138 @@
+package com.fzzy.push.sx2024.data;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:35
+ */
+@Data
+public class SX2024Api1509 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ private String fixAssetCode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
+ private String origFixAssetCode;
+
+ @PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
+ private String groupCode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
+ private String fixAssetName;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
+ private String unitName;
+
+ @PropertyDef(label = "鍘熷��")
+ private Double valueOrg;
+
+ @PropertyDef(label = "褰撳墠鍘熷��")
+ private Double dresentValueOrg;
+ /**
+ * 1:涓嶆彁鎶樻棫娉�
+ * 2:骞冲潎骞撮檺娉�
+ * 3:鍔ㄦ�佸钩鍧囧勾闄愭硶
+ * 4:宸ヤ綔閲忔硶
+ * 5:骞存暟鎬诲拰娉�
+ * 6:鍙屽�嶄綑棰濋�掑噺娉�
+ */
+ @PropertyDef(label = "鎶樻棫鏂规硶")
+ private Double deprMethodId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ private Double sourceid;
+ /**
+ * 1:鎶曡祫
+ * 2:鑷缓
+ * 3:璐拱
+ * 4:铻嶈祫绉熻祦
+ * 5:缁忚惀绉熷叆
+ * 6:鏃犲伩璋冨叆
+ * 7:鎹愯禒
+ * 8:鎹㈠叆
+ */
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ private String cDFCode;
+
+ @PropertyDef(label = "鍨嬪彿")
+ private String model;
+
+ @PropertyDef(label = "瑙勬牸")
+ private String specs;
+
+ @PropertyDef(label = "鍒堕�犲晢")
+ private String manufacturer;
+
+ @PropertyDef(label = "浜у湴")
+ private String makingPlace;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "杩涘崟浣嶆棩鏈�")
+ private String enterDay;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
+ private String beginUseDay;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤哄崱鏃ユ湡")
+ private String makinDay;
+
+ @PropertyDef(label = "绠＄悊浜�")
+ private String keeper;
+
+ @PropertyDef(label = "寤哄崱浜�")
+ private String maker;
+
+ @PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
+ private Double usingPeriods;
+
+ @PropertyDef(label = "棰勮鍑�娈嬪��")
+ private Double expecRemain;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
+ private String assetAcctCode;
+
+ @PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
+ private String deprAcctCode;
+
+
+ @PropertyDef(label = "绱鎶樻棫")
+ private Double accumulateDepr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
+ private String abadoned;
+
+ /**
+ * 1:鍦ㄤ娇鐢�
+ * 2:鏈娇鐢�
+ * 3:鍋滅敤
+ * 4:鍑哄敭
+ * 5:鎶ユ崯
+ * 6:鐩樹簭
+ */
+ @PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
+ private String presentStatus;
+
+ @PropertyDef(label = "澶囨敞")
+ private String notes;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
new file mode 100644
index 0000000..ef080cc
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1510.java
@@ -0,0 +1,83 @@
+package com.fzzy.push.sx2024.data;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 璧勪骇鎶樻棫淇℃伅
+ * @Author CZT
+ * @Date 2024/11/6 16:40
+ */
+@Data
+public class SX2024Api1510 implements Serializable {
+
+ @PropertyDef(label = "璐﹀鍙�")
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ private String fixAssetCode;
+
+ @PropertyDef(label = "鏈熼棿")
+ private Double period;
+
+ @PropertyDef(label = "骞村害")
+ private Double AcctYear;
+
+ @PropertyDef(label = "鏈熷垵鍘熷��")
+ private Double bValueOrg;
+
+ @PropertyDef(label = "绱鎶樻棫")
+ private Double bAccumDepr;
+
+ @PropertyDef(label = "鏈湡璁℃彁鎶樻棫")
+ private Double deprAmmount;
+
+ @PropertyDef(label = "鏈勾绱璁℃彁鎶樻棫")
+ private Double yAccumDepr;
+
+ @PropertyDef(label = "鏈湡鏁伴噺澧炲姞")
+ private Double qtyAdd;
+
+ @PropertyDef(label = "鏈湡鏁伴噺鍑忓皯")
+ private Double qtyDecrease;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎鍔�")
+ private Double valueOrgAdd;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎噺灏�")
+ private Double valueOrgDerease;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨")
+ private Double accuDeprAdjustAdd;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨噺")
+ private Double accuDeprAdjustDec;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺澧炲姞")
+ private Double yQtyIncrease;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺鍑忓皯")
+ private Double yQtyDecrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″鍔�")
+ private Double yValueIncrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″噺灏�")
+ private Double yValueDecrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨")
+ private Double yAccuDeprIncrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
+ private Double YAccuDeprDecrease;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SXFinanceDto.java b/src/main/java/com/fzzy/push/sx2024/data/SXFinanceDto.java
deleted file mode 100644
index b52c67d..0000000
--- a/src/main/java/com/fzzy/push/sx2024/data/SXFinanceDto.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.fzzy.push.sx2024.data;
-
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-
-/**
- * @Description 鎶ヨ〃鏁版嵁灏佽
- * @Author CZT
- * @Date 2024/4/23 17:30
- */
-@Data
-public class SXFinanceDto {
-
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String DWDM;
-
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String KQDM;
-
- @PropertyDef(label = "鎶ヨ〃鏈熷彿")
- private String BBSJ;
-
- @PropertyDef(label = "鎶ヨ〃鍚�")
- private String BBM;
-
- @PropertyDef(label = "鎸囨爣搴忓彿")
- private String ZBXH;
-
- @PropertyDef(label = "鎸囨爣鍚嶇О")
- private String ZBMC;
-
- @PropertyDef(label = "鎸囨爣鍊� 1")
- private String ZBZ1;
-
- @PropertyDef(label = "鎸囨爣鍊� 2")
- private String ZBZ2;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String CZBZ;
-
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
- private String ZHGXSJ;
-
- public SXFinanceDto() {
- }
-
- public SXFinanceDto(String zbmc, String zbz1, String zbz2){
- this.ZBMC = zbmc;
- this.ZBZ1 = zbz1;
- this.ZBZ2 = zbz2;
- }
-}
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index 3d215f2..8cfd161 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -153,15 +153,6 @@
<dd>
<a lay-href="com.fzzy.api.view.Api1113.d">浼佷笟淇＄敤淇℃伅</a>
</dd>
- <dd>
- <a lay-href="com.fzzy.api.view.Api1501.d">璐㈠姟鎶ヨ〃-璧勪骇璐熷��</a>
- </dd>
- <dd>
- <a lay-href="com.fzzy.api.view.Api1502.d">璐㈠姟鎶ヨ〃-鐜伴噾娴侀噺淇℃伅</a>
- </dd>
- <dd>
- <a lay-href="com.fzzy.api.view.Api1503.d">璐㈠姟鎶ヨ〃-鍒╂鼎淇℃伅</a>
- </dd>
</dl>
</li>
@@ -289,6 +280,48 @@
</dl>
</li>
+ <li data-name="template" class="layui-nav-item">
+ <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
+ <!-- <i class="layui-icon layui-icon-template"></i>-->
+ <div class="g-icon">
+ <img th:src="@{/static/lib/layuiadmin/style/images/icon5.png}">
+ </div>
+ <cite>璐㈢◣绠＄悊</cite>
+ <span class="layui-nav-more"></span>
+ </a>
+ <dl class="layui-nav-child">
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1501.d">璐㈠姟鎶ヨ〃-璧勪骇璐熷��</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1502.d">璐㈠姟鎶ヨ〃-鐜伴噾娴侀噺淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1503.d">璐㈠姟鎶ヨ〃-鍒╂鼎淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1504.d">璐﹀淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1505.d">绉戠洰淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1506.d">绉戠洰浣欓淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1507.d">浼氳鍑瘉淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1508.d">鐜伴噾娴侀噺鍒嗛厤淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1509.d">鍥哄畾璧勪骇鍗＄墖淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1510.d">璧勪骇鎶樻棫淇℃伅</a>
+ </dd>
+ </dl>
+ </li>
<li data-name="template" class="layui-nav-item">
<a class="one" href="javascript:;" lay-tips="" lay-direction="2">
--
Gitblit v1.9.3