From c2c0f4f51117d2400b084e062d6f9e440d002ed8 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期二, 19 九月 2023 19:31:07 +0800
Subject: [PATCH] 优化上海接口上报
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java | 11 +++++++----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java | 3 ---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java | 10 ++++++++--
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java | 11 +++++++----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java | 2 +-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java | 4 ++--
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java | 3 +++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java | 1 +
src/main/java/com/fzzy/api/entity/Api1301.java | 1 +
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java | 2 +-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java | 8 ++++----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java | 2 +-
12 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1301.java b/src/main/java/com/fzzy/api/entity/Api1301.java
index 52c407c..079ba93 100644
--- a/src/main/java/com/fzzy/api/entity/Api1301.java
+++ b/src/main/java/com/fzzy/api/entity/Api1301.java
@@ -99,6 +99,7 @@
@Column(name = "sgjbxx", length = 1000, nullable = false)
private String sgjbxx;
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鏁存敼鏃堕檺" )
@Column(name = "zgsx", length = 10)
private String zgsx;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
index ef7a2dd..f1f1c74 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
@@ -45,7 +45,7 @@
private Date dcrq;
@PropertyDef(label = "鍊掑嚭鏁伴噺")
- private Double dcsl;
+ private double dcsl;
@PropertyDef(label = "鍖呰鐗�")
private String bzw;
@@ -63,9 +63,12 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
- @PropertyDef(label = "搴撹皟鍗曞彿")
- private String kddh;
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-}
+
+ @PropertyDef(label = "搴撹皟鍗曞彿")
+ private String kddh;
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
index eb3f8e6..7a5fbcd 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
@@ -26,10 +26,10 @@
private String hwdm;
@PropertyDef(label = "绮鏁伴噺")
- private Double lssl;
+ private double lssl;
@PropertyDef(label = "鍒掕浆鏁伴噺")
- private Double hzsl;
+ private double hzsl;
@PropertyDef(label = "鎵瑰噯鏂囧彿")
private String bzwh;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
index 77489a6..44cda82 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
@@ -35,16 +35,16 @@
private String yf;
@PropertyDef(label = "鏈熷垵鏁伴噺")
- private Double qcsl;
+ private double qcsl;
@PropertyDef(label = "鏈湡鏀跺叆鏁伴噺")
- private Double bqsrsl;
+ private double bqsrsl;
@PropertyDef(label = "鏈湡鏀嚭鏁伴噺")
- private Double bqzcsl;
+ private double bqzcsl;
@PropertyDef(label = "鏈熸湯鏁伴噺")
- private Double qmye;
+ private double qmye;
@PropertyDef(label = "鏈堢粨鏍囧織")
private Integer yjbz;
@@ -65,6 +65,9 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "鎵规鍙�")
+ private String pch;
+
@PropertyDef(label = "鏉ョ伯浠ｇ爜")
private String lldm;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
index a14e336..ff2b68f 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
@@ -74,6 +74,7 @@
@PropertyDef(label = "浜嬫晠鍩烘湰淇℃伅")
private String sgjbxx;
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鏁存敼鏃堕檺")
private String zgsx;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
index 7e85197..73c8082 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
@@ -183,7 +183,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
- @PropertyDef(label = "寤掗棿鏁�")
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
@PropertyDef(label = "鏍囪浣�")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
index f8831dc..d20b3e8 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
@@ -33,9 +33,6 @@
@PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
private String spjksbid;
- @PropertyDef(label = "浠撴埧浠ｇ爜")
- private String cfdm;
-
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
index 9f98c54..96d7a02 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
@@ -43,6 +43,10 @@
@PropertyDef(label = "妫�楠岀被鍒�")
private String jylb;
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "妫�楠屾棩鏈�")
+ private String jyrq;
+
@PropertyDef(label = "妫�楠屽崟浣�")
private String jydw;
@@ -115,10 +119,6 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
-
- @JSONField(format = "yyyy-MM-dd")
- @PropertyDef(label = "妫�楠屾棩鏈�")
- private Date jyrq;
@PropertyDef(label = "鏍囪浣�")
private String bjw;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
index beb7b97..77e06fc 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
@@ -23,8 +23,8 @@
*/
private static final long serialVersionUID = 1L;
- @PropertyDef(label = "鐩戞帶缂栧彿")
- private String sxtbh;
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
+ private String spjksbid;
@PropertyDef(label = "閫氶亾缂栧彿")
private int tdbh;
@@ -117,6 +117,12 @@
@PropertyDef(label = "澶囨敞")
private String bz;
+ @PropertyDef(label = "鏍囧織浣�")
+ private String bjw;
+
+ @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/sh2023/dto/SH2023Api2102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
index e7ddad4..d41a7ac 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
@@ -27,7 +27,7 @@
private String drdw;
@PropertyDef(label = "鍊掑叆鏁伴噺")
- private Double drhwsl;
+ private double drhwsl;
@PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜")
private String drhwdm;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
index e2fef72..e183bf4 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
@@ -66,6 +66,9 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
index 9d9b785..f25d710 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
@@ -27,7 +27,7 @@
@JSONField(format = "yyyy-MM-dd")
private Date jzrq;
- @PropertyDef(label = "瀹㈡埛缂栧彿")
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
private String khmc;
@PropertyDef(label = "鏉ョ伯棰勬姤鍙�/鎻愯揣鍗曞彿")
--
Gitblit v1.9.3