From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/entity/Api1505.java | 115 ++++
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java | 8
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java | 9
src/main/java/com/fzzy/api/entity/Api1202.java | 4
src/main/java/com/fzzy/api/entity/Api1510.java | 124 ++++
src/main/resources/application-pro5354.yml | 2
src/main/java/com/fzzy/api/entity/Api1108.java | 4
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 20
src/main/resources/application-pro.yml | 24
src/main/java/com/fzzy/api/entity/Api1205.java | 12
src/main/java/com/fzzy/api/entity/Api1508.java | 93 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 13
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java | 8
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java | 30
src/main/java/com/fzzy/api/entity/Api1507.java | 147 +++++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java | 71 ++
src/main/resources/application-pro5317-2.yml | 2
src/main/resources/application-pro5329.yml | 8
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java | 4
src/main/java/com/fzzy/api/entity/Api1201.java | 18
src/main/java/com/fzzy/api/entity/Api1301.java | 1
src/main/java/com/fzzy/api/entity/Api1504.java | 102 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 8
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 1
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 4
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java | 2
src/main/java/com/fzzy/api/view/repository/Api1310Rep.java | 3
src/main/java/com/fzzy/api/entity/Api1206.java | 45
src/main/java/com/fzzy/api/view/Api1209.view.xml | 29 +
src/main/java/com/fzzy/api/entity/Api1106.java | 4
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java | 3
src/main/java/com/fzzy/api/entity/Api1103.java | 4
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 227 ++++---
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java | 6
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java | 7
src/main/java/com/fzzy/api/entity/Api1509.java | 187 ++++++
src/main/resources/application-pro2.yml | 28
src/main/java/com/fzzy/api/entity/Api1506.java | 111 +++
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java | 6
src/main/java/com/fzzy/api/entity/Api1209.java | 81 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 14
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java | 34
42 files changed, 1,359 insertions(+), 264 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1103.java b/src/main/java/com/fzzy/api/entity/Api1103.java
index c1879be..c4e44e4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1103.java
+++ b/src/main/java/com/fzzy/api/entity/Api1103.java
@@ -40,6 +40,10 @@
@Column(name = "kqdm", length = 21)
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯浠ｇ爜")
+ @Column(name = "tykqdm", length = 22)
+ private String tykqdm;
+
@PropertyDef(label = "浠撴埧绫诲瀷浠ｇ爜" )
@Column(name = "cflxdm", length = 8)
private String cflxdm;
diff --git a/src/main/java/com/fzzy/api/entity/Api1106.java b/src/main/java/com/fzzy/api/entity/Api1106.java
index 97801eb..f5428c8 100644
--- a/src/main/java/com/fzzy/api/entity/Api1106.java
+++ b/src/main/java/com/fzzy/api/entity/Api1106.java
@@ -46,6 +46,10 @@
@Column(name = "kqdm", length = 21)
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯" )
+ @Column(name = "tykqbm", length = 22)
+ private String tykqbm;
+
@PropertyDef(label = "缃愬" )
@Column(name = "gr", precision = 20, scale = 6)
private double gr;
diff --git a/src/main/java/com/fzzy/api/entity/Api1108.java b/src/main/java/com/fzzy/api/entity/Api1108.java
index 594f71a..2a9fb26 100644
--- a/src/main/java/com/fzzy/api/entity/Api1108.java
+++ b/src/main/java/com/fzzy/api/entity/Api1108.java
@@ -43,6 +43,10 @@
@Column(name = "dwdm", length = 18)
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅浠ｇ爜")
+ @Column(name = "tydwbm", length = 20)
+ private String tydwbm;
+
@PropertyDef(label = "搴撳尯鍚嶇О")
@Column(name = "kqmc", length = 256)
private String kqmc;
diff --git a/src/main/java/com/fzzy/api/entity/Api1201.java b/src/main/java/com/fzzy/api/entity/Api1201.java
index cbdece2..38ceccc 100644
--- a/src/main/java/com/fzzy/api/entity/Api1201.java
+++ b/src/main/java/com/fzzy/api/entity/Api1201.java
@@ -54,6 +54,10 @@
@Column(name = "ywlx", length = 1)
private String ywlx;
+ @PropertyDef(label = "鍚堝悓绉嶇被")
+ @Column(name = "htzl", length = 1)
+ private String htzl;
+
@PropertyDef(label = "瀹㈡埛绫诲瀷")
@Column(name = "khlx", length = 1)
private String khlx;
@@ -104,6 +108,10 @@
@Column(name = "ydwcsj")
private Date ydwcsj;
+ @PropertyDef(label = "楠屾敹鏂瑰紡")
+ @Column(name = "ysfs", length = 64)
+ private String ysfs;
+
@PropertyDef(label = "绛捐鍦扮偣")
@Column(name = "qddd", length = 512)
private String qddd;
@@ -129,6 +137,16 @@
@Column(name = "htzje", precision = 20, scale = 6)
private BigDecimal htzje;
+ /**
+ * 1锛氬叏棰濆厛娆惧悗璐�
+ * 2锛氭寜鍒版杩涘害閫愭壒鍙戣揣
+ * 3锛氳揣鍒板苟纭鍚庝竴娆℃�т粯娆�
+ * 4锛氭寜鍒拌揣鎵规閫愭壒纭銆侀�愭壒浠樻
+ */
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ @Column(name = "fkfs", length = 1)
+ private String fkfs;
+
@PropertyDef(label = "灞ョ害淇濊瘉閲�")
@Column(name = "lybzj", precision = 20, scale = 6)
private double lybzj;
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index ad0053c..e51a1fd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -61,6 +61,10 @@
@Column(name = "lqgsdwdm", length = 18)
private String lqgsdwdm;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ @Column(name = "lqgsdwtybm", length = 18)
+ private String lqgsdwtybm;
+
@PropertyDef(label = "鎵胯繍浜�")
@Column(name = "cyr", length = 64)
private String cyr;
diff --git a/src/main/java/com/fzzy/api/entity/Api1205.java b/src/main/java/com/fzzy/api/entity/Api1205.java
index a97399c..fb8eee6 100644
--- a/src/main/java/com/fzzy/api/entity/Api1205.java
+++ b/src/main/java/com/fzzy/api/entity/Api1205.java
@@ -207,6 +207,18 @@
@Column(name = "ckjsdh", length = 33)
private String ckjsdh;
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
+ @Column(name = "zjbgdh", length = 14)
+ private String zjbgdh;
+
+ @PropertyDef(label = "鐢熸垚鏂瑰紡")
+ @Column(name = "scfs", length = 1)
+ private String scfs;
+
+ @PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
+ @Column(name = "sdblyy", length = 400)
+ private String sdblyy;
+
@PropertyDef(label = "澶囨敞")
@Column(name = "bz", length = 400)
private String bz;
diff --git a/src/main/java/com/fzzy/api/entity/Api1206.java b/src/main/java/com/fzzy/api/entity/Api1206.java
index e69e220..b8704c4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1206.java
+++ b/src/main/java/com/fzzy/api/entity/Api1206.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -19,16 +20,16 @@
@Table(name = "API_1206")
@EqualsAndHashCode(callSuper = false)
public class Api1206 implements Serializable {
-
- public static String SORT_PROP = "ckjsdh";
+
+ public static String SORT_PROP = "ckjsdh";
/**
- *
- */
- private static final long serialVersionUID = -8778664614878279565L;
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
- @Id
- @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿" )
+ @Id
+ @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
@Column(name = "ckjsdh", length = 33)
private String ckjsdh;
@@ -36,56 +37,60 @@
@Column(name = "tydwbm", length = 20)
private String tydwbm;
- @PropertyDef(label = "鍚堝悓鍙�" )
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ @Column(name = "tykqbm", length = 22)
+ private String tykqbm;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
@Column(name = "hth", length = 64)
private String hth;
- @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)" )
+ @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)")
@Column(name = "jssl", precision = 20, scale = 6)
private double jssl;
- @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)" )
+ @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
@Column(name = "jsdj", precision = 20, scale = 6)
private double jsdj;
- @PropertyDef(label = "缁撶畻閲戦(鍏�)" )
+ @PropertyDef(label = "缁撶畻閲戦(鍏�)")
@Column(name = "jsje", precision = 20, scale = 6)
private double jsje;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "缁撶畻鏃堕棿" )
+ @PropertyDef(label = "缁撶畻鏃堕棿")
@Column(name = "jssj")
private Date jssj;
- @PropertyDef(label = "缁撶畻鏂瑰紡" )
+ @PropertyDef(label = "缁撶畻鏂瑰紡")
@Column(name = "jsfs", length = 1)
private String jsfs;
- @PropertyDef(label = "浠樻浜�" )
+ @PropertyDef(label = "浠樻浜�")
@Column(name = "fkr", length = 256)
private String fkr;
- @PropertyDef(label = "閾惰琛屽埆浠ｇ爜" )
+ @PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
@Column(name = "yhhbdm", length = 3)
private String yhhbdm;
- @PropertyDef(label = "寮�鎴疯鍙�" )
+ @PropertyDef(label = "寮�鎴疯鍙�")
@Column(name = "khhh", length = 32)
private String khhh;
- @PropertyDef(label = "寮�鎴疯鍚嶇О" )
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
@Column(name = "khhmc", length = 128)
private String khhmc;
- @PropertyDef(label = "閾惰璐﹀彿" )
+ @PropertyDef(label = "閾惰璐﹀彿")
@Column(name = "yhzh", length = 32)
private String yhzh;
- @PropertyDef(label = "鍙戠エ鍙风爜" )
+ @PropertyDef(label = "鍙戠エ鍙风爜")
@Column(name = "fphm", length = 10)
private String fphm;
- @PropertyDef(label = "鍙戠エ鐘舵��" )
+ @PropertyDef(label = "鍙戠エ鐘舵��")
@Column(name = "fpzt", length = 1)
private String fpzt;
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 7583de5..23859e4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -12,6 +12,7 @@
import javax.persistence.Table;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -24,67 +25,67 @@
public class Api1209 extends ApiParent implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -8920645721282111145L;
-
-
- public static String SORT_PROP = "sydh";
-
+ *
+ */
+ private static final long serialVersionUID = -8920645721282111145L;
- @Id
- @PropertyDef(label = "鎹熸孩鍗曞彿" )
+
+ public static String SORT_PROP = "sydh";
+
+
+ @Id
+ @PropertyDef(label = "鎹熸孩鍗曞彿")
@Column(name = "sydh", length = 60)
private String sydh;
- @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @PropertyDef(label = "璐т綅浠ｇ爜")
@Column(name = "hwdm", length = 30)
private String hwdm;
- @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
@Column(name = "tyhwbm", length = 28)
private String tyhwbm;
@JSONField(format = "yyyy-MM-dd")
- @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
@Column(name = "ywrq")
private Date ywrq;
- @PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)" )
+ @PropertyDef(label = "鍏ュ簱鍑�閲�(鍏枻)")
@Column(name = "rkjz", precision = 20, scale = 6)
private double rkjz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鍏ュ簱鏃堕棿" )
+ @PropertyDef(label = "鍏ュ簱鏃堕棿")
@Column(name = "rksj")
private Date rksj;
- @PropertyDef(label = "鍏ュ簱姘村垎(%)" )
+ @PropertyDef(label = "鍏ュ簱姘村垎(%)")
@Column(name = "rksf", precision = 20, scale = 6)
private double rksf;
- @PropertyDef(label = "鍏ュ簱鏉傝川(%)" )
+ @PropertyDef(label = "鍏ュ簱鏉傝川(%)")
@Column(name = "rkzz", precision = 20, scale = 6)
private double rkzz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鍑哄簱鏃堕棿" )
+ @PropertyDef(label = "鍑哄簱鏃堕棿")
@Column(name = "cksj")
private Date cksj;
- @PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)" )
+ @PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)")
@Column(name = "ckjz", precision = 20, scale = 6)
private double ckjz;
- @PropertyDef(label = "鍑哄簱姘村垎(%)" )
+ @PropertyDef(label = "鍑哄簱姘村垎(%)")
@Column(name = "cksf", precision = 20, scale = 6)
private double cksf;
- @PropertyDef(label = "鍑哄簱鏉傝川(%)" )
+ @PropertyDef(label = "鍑哄簱鏉傝川(%)")
@Column(name = "ckzz", precision = 20, scale = 6)
private double ckzz;
- @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)" )
+ @PropertyDef(label = "鍑�閲嶆崯婧㈡暟閲�(鍏枻)")
@Column(name = "jzsysl", precision = 20, scale = 6)
private double jzsysl;
@@ -92,55 +93,63 @@
@Column(name = "qzchwqsh", precision = 20, scale = 6)
private double qzchwqsh;
- @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
+ @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)")
@Column(name = "qzszkl", precision = 20, scale = 6)
private double qzszkl;
- @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)" )
+ @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)")
@Column(name = "qzzrshde", precision = 20, scale = 6)
private double qzzrshde;
- @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
+ @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)")
@Column(name = "chsl", precision = 20, scale = 6)
private double chsl;
- @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父" )
+ @PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
@Column(name = "sysfzc", length = 1)
private String sysfzc;
- @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
- @Column(name = "sylx",length = 1)
+ @PropertyDef(label = "鎹熸孩绫诲瀷", description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
+ @Column(name = "sylx", length = 1)
private String sylx;
- @PropertyDef(label = "鎹熸孩鐜妭",description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
- @Column(name = "syhj",length = 1)
+ @PropertyDef(label = "鍌ㄥ鏃堕暱")
+ @Column(name = "ccsc",precision = 3)
+ private BigDecimal ccsc;
+
+ @PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
+ @Column(name = "sfch", length = 1)
+ private String sfch;
+
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
+ @Column(name = "syhj", length = 1)
private String syhj;
- @PropertyDef(label = "鎹熸孩鍘熷洜" )
+ @PropertyDef(label = "鎹熸孩鍘熷洜")
@Column(name = "syyy", length = 400)
private String syyy;
- @PropertyDef(label = "浠撳偍瀹℃牳浜�" )
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
@Column(name = "ccshr", length = 64)
private String ccshr;
- @PropertyDef(label = "璐ㄦ瀹℃牳浜�" )
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
@Column(name = "zjshr", length = 64)
private String zjshr;
- @PropertyDef(label = "缁熻瀹℃牳浜�" )
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
@Column(name = "tjshr", length = 64)
private String tjshr;
- @PropertyDef(label = "浼氳瀹℃牳浜�" )
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
@Column(name = "kjshr", length = 64)
private String kjshr;
- @PropertyDef(label = "棰嗗瀹℃牳浜�" )
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
@Column(name = "ldshr", length = 64)
private String ldshr;
- @PropertyDef(label = "澶囨敞" )
+ @PropertyDef(label = "澶囨敞")
@Column(name = "bz", length = 400)
private String bz;
diff --git a/src/main/java/com/fzzy/api/entity/Api1301.java b/src/main/java/com/fzzy/api/entity/Api1301.java
index e1bbbb8..aa949ef 100644
--- a/src/main/java/com/fzzy/api/entity/Api1301.java
+++ b/src/main/java/com/fzzy/api/entity/Api1301.java
@@ -82,7 +82,6 @@
@Column(name = "fxglcs", length = 1000)
private String fxglcs;
- @JSONField(name = "Yhxx")
@PropertyDef(label = "闅愭偅淇℃伅" )
@Column(name = "yhxx", length = 256)
private String yhxx;
diff --git a/src/main/java/com/fzzy/api/entity/Api1504.java b/src/main/java/com/fzzy/api/entity/Api1504.java
new file mode 100644
index 0000000..b1311e0
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1504.java
@@ -0,0 +1,102 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璐﹀淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1504")
+@EqualsAndHashCode(callSuper = false)
+public class Api1504 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nAcctId", precision = 9)
+ private Double nAcctId;
+
+ @PropertyDef(label = "璐﹀鍚嶇О")
+ @Column(name = "cAcctName", length = 256)
+ private String cAcctName;
+
+ @PropertyDef(label = "鏈綅甯�")
+ @Column(name = "cCurrency", length = 3)
+ private String cCurrency;
+
+ @PropertyDef(label = "浼氳涓荤")
+ @Column(name = "cAcctChief", length = 20)
+ private String cAcctChief;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏈熼棿")
+ @Column(name = "cPeriodStart", length = 10)
+ private String cPeriodStart;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏃ユ湡")
+ @Column(name = "cYearBmd", length = 10)
+ private String cYearBmd;
+
+ @PropertyDef(label = "鏈熼棿鏁�")
+ @Column(name = "nAcctPeriodNum")
+ private Double nAcctPeriodNum;
+
+ @PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
+ @Column(name = "cAccClassCode", length = 8)
+ private String cAccClassCode;
+
+ @PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
+ @Column(name = "nAccGrade")
+ private Double nAccGrade;
+
+ @PropertyDef(label = "绉戠洰缂栫爜瑙勫垯", description = "4222XXXX:榛樿鍓嶅洓绾х骇闀胯鍒欎负4222")
+ @Column(name = "cAccCodeStr", length = 40)
+ private String cAccCodeStr;
+
+ @PropertyDef(label = "鍗曚綅鍚嶇О")
+ @Column(name = "cCropName", length = 256)
+ private String cCropName;
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ @Column(name = "cOrgCode", length = 18)
+ private String cOrgCode;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ @Column(name = "xqydm", length = 20)
+ private String xqydm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ @Column(name = "xkqdm",length = 22)
+ private String xkqdm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/api/entity/Api1505.java b/src/main/java/com/fzzy/api/entity/Api1505.java
new file mode 100644
index 0000000..cad095d
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1505.java
@@ -0,0 +1,115 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 绉戠洰淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1505")
+@EqualsAndHashCode(callSuper = false)
+public class Api1505 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nAcctId", length = 9)
+ private Double nAcctId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cYear", length = 4)
+ private String cYear;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "cCode", length = 80)
+ private String cCode;
+
+ @PropertyDef(label = "绉戠洰鍚嶇О")
+ @Column(name = "cName", length = 256)
+ private String cName;
+
+ @PropertyDef(label = "绉戠洰鍏ㄧО")
+ @Column(name = "cAllName", length = 65536)
+ private String cAllName;
+
+ /**
+ * 1:璧勪骇绫�
+ * 2:璐熷�虹被
+ * 3:鍏卞悓绫�
+ * 4:鎵�鏈夎�呮潈鐩婄被
+ * 5:鎴愭湰璐圭敤绫�
+ * 6:鎹熺泭绫�
+ */
+ @PropertyDef(label = "绉戠洰绫诲埆")
+ @Column(name = "nClass", length = 9)
+ private String nClass;
+ /**
+ * (-1)-璐锋柟锛�1-鍊熸柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ @Column(name = "cDc", length = 3)
+ private String cDc;
+
+ @PropertyDef(label = "鏈骇绉戠洰")
+ @Column(name = "bL")
+ private String bL;
+
+ @PropertyDef(label = "绉戠洰绾ф")
+ @Column(name = "nGrade", length = 8)
+ private Double nGrade;
+
+ @PropertyDef(label = "鏁伴噺绉戠洰")
+ @Column(name = "bQ")
+ private String bQ;
+
+ @PropertyDef(label = "鏁伴噺鍗曚綅")
+ @Column(name = "cQUnit")
+ private String cQUnit;
+
+ @PropertyDef(label = "鐜伴噾绫荤鐩�")
+ @Column(name = "bCash")
+ private String bCash;
+
+ @PropertyDef(label = "閾惰绫荤鐩�")
+ @Column(name = "bBank")
+ private String bBank;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
+ @Column(name = "bXjll")
+ private String bXjll;
+
+ @PropertyDef(label = "鍐荤粨")
+ @Column(name = "bF")
+ private String bF;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/api/entity/Api1506.java b/src/main/java/com/fzzy/api/entity/Api1506.java
new file mode 100644
index 0000000..2c0e13a
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1506.java
@@ -0,0 +1,111 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 绉戠洰浣欓琛�
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1506")
+@EqualsAndHashCode(callSuper = false)
+public class Api1506 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nAcctId", length = 9)
+ private Double nAcctId;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cYear", length = 3)
+ private String cYear;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "nNo", length = 4)
+ private String nNo;
+
+ @PropertyDef(label = "鏈熷垵鏈綅甯佷綑棰�")
+ @Column(name = "bM", precision = 20, scale = 4)
+ private Double bM;
+
+ @PropertyDef(label = "鏈熸湯鏈綅甯佷綑棰�")
+ @Column(name = "eM", precision = 20, scale = 4)
+ private Double eM;
+
+ @PropertyDef(label = "鏈熷垵鏁伴噺")
+ @Column(name = "bQty", precision = 20, scale = 4)
+ private Double bQty;
+
+ @PropertyDef(label = "鏈熸湯鏁伴噺")
+ @Column(name = "eQty", precision = 20, scale = 4)
+ private Double eQty;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "浣欓鏂瑰悜")
+ @Column(name = "cDc", length = 3)
+ private String cDc;
+
+ @PropertyDef(label = "鍊熸柟鏈綅甯佸彂鐢熼")
+ @Column(name = "dM", precision = 20, scale = 4)
+ private Double dM;
+
+ @PropertyDef(label = "璐锋柟鏈綅甯佸彂鐢熼")
+ @Column(name = "cM", precision = 20, scale = 4)
+ private Double cM;
+
+ @PropertyDef(label = "鍊熸柟鍙戠敓鏁伴噺")
+ @Column(name = "dQ", precision = 20, scale = 4)
+ private Double dQ;
+
+ @PropertyDef(label = "璐锋柟鍙戠敓鏁伴噺")
+ @Column(name = "cQ", precision = 20, scale = 4)
+ private Double cQ;
+
+ @PropertyDef(label = "鏈熷垵澶栧竵浣欓")
+ @Column(name = "bFm", precision = 20, scale = 4)
+ private Double bFm;
+
+ @PropertyDef(label = "鏈熸湯澶栧竵浣欓")
+ @Column(name = "eFm", precision = 20, scale = 4)
+ private Double eFm;
+
+ @PropertyDef(label = "鍊熸柟澶栧竵鍙戠敓棰�")
+ @Column(name = "dFm", precision = 20, scale = 4)
+ private Double dFm;
+
+ @PropertyDef(label = "璐锋柟澶栧竵鍙戠敓棰�")
+ @Column(name = "cFm", precision = 20, scale = 4)
+ private Double cFm;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/api/entity/Api1507.java b/src/main/java/com/fzzy/api/entity/Api1507.java
new file mode 100644
index 0000000..03b166e
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1507.java
@@ -0,0 +1,147 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 浼氳鍑瘉淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1507")
+@EqualsAndHashCode(callSuper = false)
+public class Api1507 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nAcctId", length = 9)
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @Column(name = "cVKind", length = 9)
+ private String cVKind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cMon", length = 3)
+ private Double cMon;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cYear", length = 4)
+ private Double cYear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @Column(name = "nVNo", length = 9)
+ private Double nVNo;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ @Column(name = "nNo", precision = 9)
+ private Double nNo;
+
+ @PropertyDef(label = "鍑瘉鍒嗙被")
+ @Column(name = "bTmp", precision = 3)
+ private Double bTmp;
+
+ @PropertyDef(label = "鎽樿")
+ @Column(name = "Digest", length = 256)
+ private String Digest;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "cCode", length = 80)
+ private Double cCode;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍑瘉鏃ユ湡")
+ @Column(name = "cVSmallDatetime", length = 10)
+ private String cVSmallDatetime;
+
+ @PropertyDef(label = "鍒跺崟浜�")
+ @Column(name = "cMaker", length = 32)
+ private String cMaker;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @Column(name = "cDc", precision = 3)
+ private String cDc;
+
+ @PropertyDef(label = "瀹℃牳浜�")
+ @Column(name = "cCkEr", length = 32)
+ private String cCkEr;
+
+ @PropertyDef(label = "璁拌处浜�")
+ @Column(name = "cPtEr", length = 32)
+ private String cPtEr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "璁拌处鏍囧織")
+ @Column(name = "bPt", precision = 3)
+ private Double bPt;
+
+ @PropertyDef(label = "闄勪欢寮犳暟")
+ @Column(name = "nANum", precision = 9)
+ private Double nANum;
+
+ @PropertyDef(label = "閲戦")
+ @Column(name = "nM", precision = 20, scale = 4)
+ private Double nM;
+
+ @PropertyDef(label = "鏁伴噺")
+ @Column(name = "nQty", precision = 20, scale = 4)
+ private Double nQty;
+
+ @PropertyDef(label = "鍗曚环")
+ @Column(name = "nPrice", precision = 20, scale = 4)
+ private Double nPrice;
+
+ @PropertyDef(label = "缁撶畻鍙�")
+ @Column(name = "cSettleNo", length = 40)
+ private String cSettleNo;
+
+ @PropertyDef(label = "鍑虹撼")
+ @Column(name = "cCashier", length = 32)
+ private String cCashier;
+
+ @PropertyDef(label = "姹囩巼")
+ @Column(name = "rate", precision = 20, scale = 4)
+ private Double rate;
+
+ @PropertyDef(label = "澶栧竵閲戦")
+ @Column(name = "nFm", precision = 20, scale = 4)
+ private Double nFm;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅",description = "璁￠噺鍗曚綅姹夊瓧")
+ @Column(name = "meterUnitId", length = 32)
+ private String meterUnitId;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/api/entity/Api1508.java b/src/main/java/com/fzzy/api/entity/Api1508.java
new file mode 100644
index 0000000..a181c7d
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1508.java
@@ -0,0 +1,93 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1508")
+@EqualsAndHashCode(callSuper = false)
+public class Api1508 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nAcctId", length = 9)
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @Column(name = "cVKind", length = 10)
+ private String cVKind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cMon", length = 3)
+ private Double cMon;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cYear", length = 4)
+ private Double cYear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @Column(name = "nVNo", length = 9)
+ private Double nVNo;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "cCode", length = 80)
+ private String cCode;
+
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ @Column(name = "cDFCode", length = 80)
+ private String cDFCode;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺椤圭洰浠ｇ爜")
+ @Column(name = "cCashCode", length = 80)
+ private String cCashCode;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ @Column(name = "nNo", precision = 9)
+ private Double nNo;
+
+ @PropertyDef(label = "閲戦")
+ @Column(name = "nM", precision = 20,scale = 4)
+ private Double nM;
+
+ /**
+ * 1:娴佸叆
+ * -1:娴佸嚭
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @Column(name = "cDc", length = 3)
+ private String cDc;
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/api/entity/Api1509.java b/src/main/java/com/fzzy/api/entity/Api1509.java
new file mode 100644
index 0000000..7105e4a
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1509.java
@@ -0,0 +1,187 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍥哄畾璧勪骇鍗＄墖淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1509")
+@EqualsAndHashCode(callSuper = false)
+public class Api1509 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nAcctId", length = 9)
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ @Column(name = "fixAssetCode", length = 20)
+ private String fixAssetCode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鑷紪鐮�")
+ @Column(name = "origFixAssetCode", length = 20)
+ private String origFixAssetCode;
+
+ @PropertyDef(label = "璧勪骇绫诲埆缂栫爜")
+ @Column(name = "groupCode", length = 20)
+ private String groupCode;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鍚嶇О")
+ @Column(name = "fixAssetName", length = 80)
+ private String fixAssetName;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
+ @Column(name = "unitName", length = 20)
+ private String unitName;
+
+ @PropertyDef(label = "鍘熷��")
+ @Column(name = "valueOrg", length = 20, scale = 4)
+ private Double valueOrg;
+
+ @PropertyDef(label = "褰撳墠鍘熷��")
+ @Column(name = "dresentValueOrg", length = 20, scale = 4)
+ private Double dresentValueOrg;
+ /**
+ * 1:涓嶆彁鎶樻棫娉�
+ * 2:骞冲潎骞撮檺娉�
+ * 3:鍔ㄦ�佸钩鍧囧勾闄愭硶
+ * 4:宸ヤ綔閲忔硶
+ * 5:骞存暟鎬诲拰娉�
+ * 6:鍙屽�嶄綑棰濋�掑噺娉�
+ */
+ @PropertyDef(label = "鎶樻棫鏂规硶")
+ @Column(name = "deprMethodId", length = 20, scale = 4)
+ private Double deprMethodId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ @Column(name = "sourceid", length = 12)
+ private Double sourceid;
+ /**
+ * 1:鎶曡祫
+ * 2:鑷缓
+ * 3:璐拱
+ * 4:铻嶈祫绉熻祦
+ * 5:缁忚惀绉熷叆
+ * 6:鏃犲伩璋冨叆
+ * 7:鎹愯禒
+ * 8:鎹㈠叆
+ */
+ @PropertyDef(label = "瀵规柟绉戠洰缂栫爜")
+ @Column(name = "cDFCode", length = 80)
+ private String cDFCode;
+
+ @PropertyDef(label = "鍨嬪彿")
+ @Column(name = "model", length = 40)
+ private String model;
+
+ @PropertyDef(label = "瑙勬牸")
+ @Column(name = "specs", length = 40)
+ private String specs;
+
+ @PropertyDef(label = "鍒堕�犲晢")
+ @Column(name = "manufacturer", length = 60)
+ private String manufacturer;
+
+ @PropertyDef(label = "浜у湴")
+ @Column(name = "makingPlace", length = 40)
+ private String makingPlace;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "杩涘崟浣嶆棩鏈�")
+ @Column(name = "enterDay", length = 10)
+ private String enterDay;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
+ @Column(name = "beginUseDay", length = 10)
+ private String beginUseDay;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤哄崱鏃ユ湡")
+ @Column(name = "makinDay", length = 10)
+ private String makinDay;
+
+ @PropertyDef(label = "绠＄悊浜�")
+ @Column(name = "keeper", length = 20)
+ private String keeper;
+
+ @PropertyDef(label = "寤哄崱浜�")
+ @Column(name = "maker", length = 20)
+ private String maker;
+
+ @PropertyDef(label = "棰勮浣跨敤鏈熼棿鏁�")
+ @Column(name = "usingPeriods", precision = 12)
+ private Double usingPeriods;
+
+ @PropertyDef(label = "棰勮鍑�娈嬪��")
+ @Column(name = "expecRemain", precision = 20, scale = 4)
+ private Double expecRemain;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇瀵瑰簲绉戠洰缂栫爜")
+ @Column(name = "assetAcctCode", length = 20)
+ private String assetAcctCode;
+
+ @PropertyDef(label = "绱鎶樻棫瀵瑰簲绉戠洰缂栫爜")
+ @Column(name = "deprAcctCode", length = 20)
+ private String deprAcctCode;
+
+
+ @PropertyDef(label = "绱鎶樻棫")
+ @Column(name = "accumulateDepr", precision = 20, scale = 4)
+ private Double accumulateDepr;
+ /**
+ * 0:鍚�
+ * 1:鏄�
+ */
+ @PropertyDef(label = "鏄惁鎶ュ簾娓呯悊")
+ @Column(name = "abadoned", length = 20)
+ private String abadoned;
+
+ /**
+ * 1:鍦ㄤ娇鐢�
+ * 2:鏈娇鐢�
+ * 3:鍋滅敤
+ * 4:鍑哄敭
+ * 5:鎶ユ崯
+ * 6:鐩樹簭
+ */
+ @PropertyDef(label = "褰撳墠浣跨敤鐘舵�佸悕绉�")
+ @Column(name = "presentStatus", length = 20)
+ private String presentStatus;
+
+ @PropertyDef(label = "澶囨敞")
+ @Column(name = "notes", length = 512)
+ private String notes;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/api/entity/Api1510.java b/src/main/java/com/fzzy/api/entity/Api1510.java
new file mode 100644
index 0000000..0e4f3ee
--- /dev/null
+++ b/src/main/java/com/fzzy/api/entity/Api1510.java
@@ -0,0 +1,124 @@
+package com.fzzy.api.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璧勪骇鎶樻棫淇℃伅
+ *
+ * @author czt
+ */
+@Data
+@Entity
+@Table(name = "API_1510")
+@EqualsAndHashCode(callSuper = false)
+public class Api1510 extends ApiParent implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nAcctId", length = 9)
+ private Double nAcctId;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ @Column(name = "fixAssetCode", length = 20)
+ private String fixAssetCode;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "period", precision = 4)
+ private Double period;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "AcctYear", precision = 4)
+ private Double AcctYear;
+
+ @PropertyDef(label = "鏈熷垵鍘熷��")
+ @Column(name = "bValueOrg", precision = 20, scale = 4)
+ private Double bValueOrg;
+
+ @PropertyDef(label = "绱鎶樻棫")
+ @Column(name = "bAccumDepr", precision = 20, scale = 4)
+ private Double bAccumDepr;
+
+ @PropertyDef(label = "鏈湡璁℃彁鎶樻棫")
+ @Column(name = "deprAmmount", precision = 20, scale = 4)
+ private Double deprAmmount;
+
+ @PropertyDef(label = "鏈勾绱璁℃彁鎶樻棫")
+ @Column(name = "yAccumDepr", precision = 20, scale = 4)
+ private Double yAccumDepr;
+
+ @PropertyDef(label = "鏈湡鏁伴噺澧炲姞")
+ @Column(name = "qtyAdd", precision = 20, scale = 4)
+ private Double qtyAdd;
+
+ @PropertyDef(label = "鏈湡鏁伴噺鍑忓皯")
+ @Column(name = "qtyDecrease", precision = 20, scale = 4)
+ private Double qtyDecrease;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎鍔�")
+ @Column(name = "valueOrgAdd", precision = 20, scale = 4)
+ private Double valueOrgAdd;
+
+ @PropertyDef(label = "鏈湡鍘熷�煎噺灏�")
+ @Column(name = "valueOrgDerease", precision = 20, scale = 4)
+ private Double valueOrgDerease;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨")
+ @Column(name = "accuDeprAdjustAdd", precision = 20, scale = 4)
+ private Double accuDeprAdjustAdd;
+
+ @PropertyDef(label = "鏈湡绱鎶樻棫璋冨噺")
+ @Column(name = "accuDeprAdjustDec", precision = 20, scale = 4)
+ private Double accuDeprAdjustDec;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺澧炲姞")
+ @Column(name = "yQtyIncrease", precision = 20, scale = 4)
+ private Double yQtyIncrease;
+
+ @PropertyDef(label = "鏈勾绱鏁伴噺鍑忓皯")
+ @Column(name = "yQtyDecrease", precision = 20, scale = 4)
+ private Double yQtyDecrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″鍔�")
+ @Column(name = "yValueIncrease", precision = 20, scale = 4)
+ private Double yValueIncrease;
+
+ @PropertyDef(label = "鏈勾鍘熷�肩疮璁″噺灏�")
+ @Column(name = "yValueDecrease", precision = 20, scale = 4)
+ private Double yValueDecrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨")
+ @Column(name = "yAccuDeprIncrease", precision = 20, scale = 4)
+ private Double yAccuDeprIncrease;
+
+ @PropertyDef(label = "鏈勾绱鎶樻棫璋冨噺")
+ @Column(name = "YAccuDeprDecrease", precision = 20, scale = 4)
+ private Double YAccuDeprDecrease;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ @Column(name = "czbz", length = 1)
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index 1ac7857..6dc7075 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -183,6 +183,7 @@
list.add(new ApiTrigger(PushProtocol.SB_SH_2021.getCode(), PushProtocol.SB_SH_2021.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SC_2021.getCode(), PushProtocol.SB_SC_2021.getName()));
list.add(new ApiTrigger(PushProtocol.SB_GD_2022.getCode(), PushProtocol.SB_GD_2022.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_GD_2023.getCode(), PushProtocol.SB_GD_2023.getName()));
list.add(new ApiTrigger(PushProtocol.SB_GD_2020.getCode(), PushProtocol.SB_GD_2020.getName()));
list.add(new ApiTrigger(PushProtocol.SB_HN_2022.getCode(), PushProtocol.SB_HN_2022.getName()));
list.add(new ApiTrigger(PushProtocol.SB_WHJL_2023.getCode(), PushProtocol.SB_WHJL_2023.getName()));
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 cd959b4..d13d5bf 100644
--- a/src/main/java/com/fzzy/api/view/Api1209.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1209.view.xml
@@ -151,7 +151,7 @@
</Entity>
<Entity>
<Property name="key">3</Property>
- <Property name="value">3:鍏朵粬</Property>
+ <Property name="value">3:婧綑</Property>
</Entity>
</Collection>
</Property>
@@ -180,6 +180,18 @@
</Collection>
</Property>
</Property>
+ </PropertyDef>
+ <PropertyDef name="syncTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍚屾鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="ccsc">
+ <Property/>
+ <Property name="label">鍌ㄥ鏃堕暱</Property>
+ </PropertyDef>
+ <PropertyDef name="sfch">
+ <Property/>
+ <Property name="label">鏄惁瓒呰��</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -575,6 +587,21 @@
<Property name="property">bizId</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ccsc</Property>
+ <Property name="property">ccsc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfch</Property>
+ <Property name="property">sfch</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
index 6e72bea..c5eb56c 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
@@ -29,4 +29,7 @@
@Query("from Api1310 where bizId=:bizId ")
List<Api1310> getDataByBizId(@Param("bizId") String bizId);
+
+ @Query("from Api1310 where hwdm=:hwdm and jylb=:jylb order by zhgxsj")
+ List<Api1310> getDataByHwdm(@Param("hwdm") String hwdm,@Param("jylb") String jylb);
}
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 4fff6b5..c07d3d1 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
@@ -9,6 +9,7 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -28,7 +29,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鎹熺泭鍗曞彿", description = "鐢辫揣浣嶄唬鐮�+涓氬姟鏃ユ湡(yyyyMMdd)+3浣嶉『搴忓彿缁勬垚")
+ @PropertyDef(label = "鎹熺泭鍗曞彿", description = "涓氬姟鏃ユ湡(yyyyMMdd)+3浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -43,18 +44,43 @@
@PropertyDef(label = "鎵�灞炰粨搴�")
private String depotId;
-
- @Column(name = "TYPE_", length = 10)
- @PropertyDef(label = "绫诲瀷", description = "鎹熻��/婧㈠嚭")
- private String type;
-
@Column(name = "SUBMIT_TIME_")
@PropertyDef(label = "涓氬姟鏃ユ湡", description = "yyyy-MM-dd")
private Date submitTime;
+ @Column(name = "TYPE_", length = 1)
+ @PropertyDef(label = "绫诲瀷", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
+ private String type;
+ /**
+ *
+ */
+ @Column(name = "syhj", length = 1)
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
+ private String syhj;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "QUANTITY_ID1", length = 40)
+ @PropertyDef(label = "鍏ュ簱璐ㄦ", description = "鏁版嵁浠嶮Quantity涓幏鍙栵紝涓婁釜璐ㄦ鎵规")
+ private String quantity1;
+
@PropertyDef(label = "鍏ュ簱鍑�閲�", description = "鍗曚綅锛欿G")
@Column(name = "rkjz", precision = 20, scale = 6)
- private double rkjz;
+ private Double rkjz;
+
+ @Column(name = "ccsc")
+ @PropertyDef(label = "鍌ㄥ瓨鏃堕暱")
+ private BigDecimal ccsc;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍏ュ簱鏃堕棿")
@@ -63,11 +89,15 @@
@PropertyDef(label = "鍏ュ簱姘村垎(%)")
@Column(name = "rksf", precision = 20, scale = 6)
- private double rksf;
+ private Double rksf;
@PropertyDef(label = "鍏ュ簱鏉傝川(%)")
@Column(name = "rkzz", precision = 20, scale = 6)
- private double rkzz;
+ private Double rkzz;
+
+ @Column(name = "QUANTITY_ID2", length = 40)
+ @PropertyDef(label = "鍑哄簱璐ㄦ", description = "鏁版嵁浠嶮Quantity涓幏鍙栵紝涓婁釜璐ㄦ鎵规")
+ private String quantity2;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍑哄簱鏃堕棿")
@@ -76,20 +106,35 @@
@PropertyDef(label = "鍑哄簱鍑�閲�", description = "鍗曚綅锛欿G")
@Column(name = "ckjz", precision = 20, scale = 6)
- private double ckjz;
+ private Double ckjz;
@PropertyDef(label = "鍑哄簱姘村垎(%)")
@Column(name = "cksf", precision = 16, scale = 6)
- private double cksf;
+ private Double cksf;
@PropertyDef(label = "鍑哄簱鏉傝川(%)")
@Column(name = "ckzz", precision = 16, scale = 6)
- private double ckzz;
+ private Double ckzz;
+
+ @Column(name = "qzszkl")
+ @PropertyDef(label = "姘存潅鎬诲噺閲�")
+ private Double qzszkl;
+
+ @Column(name = "qzzrshde")
+ @PropertyDef(label = "淇濈鑷劧鎹熻��")
+ private Double qzzrshde;
+
+ @Column(name = "chsl")
+ @PropertyDef(label = "瓒呰�楁暟閲�")
+ private Double chsl;
@Column(name = "AMOUNT_")
- @PropertyDef(label = "閲嶉噺", description = "鎹熸孩鏁伴噺KG锛涙崯鑰椾负姝ｆ暟锛屾孩浣欎负璐熸暟")
+ @PropertyDef(label = "鎹熻�楅噺", description = "鎹熸孩鏁伴噺KG锛涙崯鑰椾负姝ｆ暟锛屾孩浣欎负璐熸暟")
private Double amount;
+ @Column(name = "LOSS_PER_")
+ @PropertyDef(label = "鎹熻�楃巼")
+ private Double lossPer;
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父", description = "0锛氭甯� 1锛氫笉姝ｅ父")
@Column(name = "sysfzc", length = 1)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index 16e1abd..ca3f1a4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -92,6 +92,7 @@
//涓氬姟绫诲瀷
apiData.setYwlx(sysData.getType());
+ apiData.setHtzl(sysData.getType());
//瀹㈡埛绫诲瀷
apiData.setKhlx(sysData.getCustomerType());
@@ -123,6 +124,11 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
+ //todo 楠屾敹鏂瑰紡鏁版嵁鏉ユ簮
+ apiData.setYsfs("浠ュ叆浠撴暟閲忎负鏍囧噯");
+
+ //todo 浠樻鏂瑰紡
+
//鍗曚环锛氬厓/鍚�
apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
@@ -153,7 +159,7 @@
apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
apiData.setSswcsj(sysData.getRelEndTime());
apiData.setYdwcsj(sysData.getEndTime());
- apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser())?"鏈柟绛剧害浜�":sysData.getSignUser());
+ apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser()) ? "鏈柟绛剧害浜�" : sysData.getSignUser());
apiData.setSyncTime(new Date());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 58f2391..ff4b9d5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -48,6 +48,8 @@
@Autowired
private Api1204Rep api1204Rep;
@Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -144,6 +146,10 @@
}
}
+ //绮潈鍗曚綅褰掑睘浠ｇ爜
+ List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getHwdm().substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
+
apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃" : sysData.getUserAddress());
//杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
@@ -207,17 +213,17 @@
apiData.setBzbjs(sysData.getBzbjs());
apiData.setCmsj(sysData.getCompleteTime());
//缁撶畻鍗曞彿
- if(StringUtils.isNotEmpty(sysData.getSettleId())){
+ if (StringUtils.isNotEmpty(sysData.getSettleId())) {
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
- if(StringUtils.isNotEmpty(apiData.getHth())){
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
- if(null == api1204List || api1204List.isEmpty()){
+ if (null == api1204List || api1204List.isEmpty()) {
api1204List = api1204Rep.getDataByHth(apiData.getHth());
- if(null != api1204List && api1204List.size() > 0){
+ if (null != api1204List && api1204List.size() > 0) {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
- }else {
+ } else {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
}
@@ -242,8 +248,8 @@
apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks());
apiData.setKlyy("鎵ｉ噺鍘熷洜");
- apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
- apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
//01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱
//04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
apiData.setCchlx("01");
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 0c5814c..eb98ad2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -47,6 +47,8 @@
@Autowired
private Api1206Rep api1206Rep;
@Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -157,6 +159,17 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
apiData.setLsdjdm(mappingCode);
+ //璐ㄦ鎶ュ憡鍗曞彿
+ List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02");
+ apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
+
+ //鐢熸垚鏂瑰紡
+ apiData.setScfs(sysData.getRecordStatus().equals("ADD") ? "2" : "1");
+
+ //鎵嬪姩琛ュ綍鍘熷洜
+ apiData.setSdblyy("搴撳尯鍋滅數锛屾棤娉曚笂浼�");
+
+
//绮鎬ц川
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
index 2462093..0607edb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -62,11 +62,11 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ //鑾峰彇绮鍑哄簱缁撶畻淇℃伅
List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(deptId, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
- log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷嚭搴撶粨绠椾俊鎭�------------------");
return;
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
index c548f80..a58a370 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -104,6 +104,7 @@
apiData.setCkjz(sysData.getCkjz());
apiData.setRksj(sysData.getRksj());
apiData.setCksj(sysData.getCksj());
+ apiData.setCcsc(sysData.getCcsc());
apiData.setRksf(sysData.getRksf());
apiData.setRkzz(sysData.getRkzz());
@@ -114,13 +115,14 @@
apiData.setQzzrshde(0);
apiData.setChsl(0);
apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
+ apiData.setSfch("0".equals(apiData.getSysfzc()) ? "2" : "1");
apiData.setSyyy(sysData.getSyyy());
- apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr())?"瀹℃牳浜�":sysData.getCcshr());
- apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr())?"瀹℃牳浜�":sysData.getZjshr());
- apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr())?"瀹℃牳浜�":sysData.getTjshr());
- apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr())?"瀹℃牳浜�":sysData.getKjshr());
- apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr())?"瀹℃牳浜�":sysData.getLdshr());
- apiData.setBz(StringUtils.isEmpty(sysData.getRemark())?"澶囨敞淇℃伅":sysData.getRemark());
+ apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃牳浜�" : sysData.getCcshr());
+ apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃牳浜�" : sysData.getZjshr());
+ apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃牳浜�" : sysData.getTjshr());
+ apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃牳浜�" : sysData.getKjshr());
+ apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃牳浜�" : sysData.getLdshr());
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemark()) ? "澶囨敞淇℃伅" : sysData.getRemark());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 8bbe665..bf9945d 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -315,7 +315,7 @@
BeanUtils.copyProperties(data, api1102);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1102.getTydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(api1102.getTydwbm());
+ String tydwbm = apiCommonService.getTydwbm(api1102.getDwdm());
api1102.setTydwbm(tydwbm);
}
api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -326,8 +326,8 @@
BeanUtils.copyProperties(data, api1103);
changeObject(api1103);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1103.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1103.getTykqbm());
+ if ("0".equals(api1103.getTykqbm()) || StringUtils.isEmpty(api1103.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(api1103.getKqdm());
api1103.setTykqbm(tykqbm);
}
api1103.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -338,8 +338,8 @@
BeanUtils.copyProperties(data, api1104);
changeObject(api1104);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1104.getTycfbm())) {
- String tydfbm = apiCommonService.getTycfbm(api1104.getTycfbm());
+ if ("0".equals(api1104.getTycfbm()) || StringUtils.isEmpty(api1104.getTycfbm())) {
+ String tydfbm = apiCommonService.getTycfbm(api1104.getCfbh());
api1104.setTycfbm(tydfbm);
}
api1104.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -350,7 +350,7 @@
BeanUtils.copyProperties(data, api1105);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1105.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(api1105.getTyajbm());
+ String tyajbm = apiCommonService.getTyajbm(api1105.getAjdm());
api1105.setTyajbm(tyajbm);
}
api1105.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -361,13 +361,14 @@
api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1106.getTykqbm())) {
- String tykqbm = apiCommonService.getTykqbm(api1106.getTykqbm());
+ String tykqbm = apiCommonService.getTykqbm(api1106.getKqdm());
api1106.setTykqbm(tykqbm);
}
return JSON.toJSONString(api1106);
}
if (Constant.API_CODE_1107.equals(inteId)) {
- Gd2023Api1107 api1107 = (Gd2023Api1107) data;
+ Gd2023Api1107 api1107 = new Gd2023Api1107();
+ BeanUtils.copyProperties(data, api1107);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1107.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
@@ -381,7 +382,8 @@
return JSON.toJSONString(api1107);
}
if (Constant.API_CODE_1108.equals(inteId)) {
- Gd2023Api1108 api1108 = (Gd2023Api1108) data;
+ Gd2023Api1108 api1108 = new Gd2023Api1108();
+ BeanUtils.copyProperties(data, api1108);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
if (StringUtils.isEmpty(api1108.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
@@ -408,7 +410,7 @@
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1109.getTykqbm())) {
+ if ("0".equals(api1109.getTykqbm()) || StringUtils.isEmpty(api1109.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
api1109.setTykqbm(tykqbm);
}
@@ -416,13 +418,18 @@
return JSON.toJSONString(api1109);
}
if (Constant.API_CODE_1110.equals(inteId)) {
- Gd2023Api1110 api1110 = (Gd2023Api1110) data;
+ Gd2023Api1110 api1110 = new Gd2023Api1110();
+ BeanUtils.copyProperties(data, api1110);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1110.getTyhwbm())) {
+ if ("0".equals(api1110.getTyhwbm()) || StringUtils.isEmpty(api1110.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
api1110.setTyhwbm(tyhwbm);
}
- if (StringUtils.isEmpty(api1110.getTydwbm())) {
+ if ("0".equals(api1110.getTykqbm()) || StringUtils.isEmpty(api1110.getTykqbm())) {
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
+ api1110.setTykqbm(tyhwbm.substring(0, 22));
+ }
+ if ("0".equals(api1110.getTydwbm()) || StringUtils.isEmpty(api1110.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1110.getDwdm());
api1110.setTydwbm(tydwbm);
}
@@ -435,11 +442,11 @@
Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
if (null != api1102List) {
api1111.setKqmc(api1102List.getKqmc());
- if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ if ("0".equals(api1111.getTykqbm()) || StringUtils.isEmpty(api1111.getTykqbm())) {
api1111.setTykqbm(api1102List.getTykqbm());
}
- if (StringUtils.isEmpty(api1111.getTydwbm())) {
- api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getTydwbm()));
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
+ api1111.setTydwbm(apiCommonService.getTydwbm(api1111.getDwdm()));
}
}
Api1101 api1101List = api1101Rep.findData(api1111.getDwdm());
@@ -447,11 +454,11 @@
api1111.setDwmc(api1101List.getDwmc());
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1111.getTykqbm())) {
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1111.getKqdm());
api1111.setTykqbm(tykqbm);
}
- if (StringUtils.isEmpty(api1111.getTydwbm())) {
+ if ("0".equals(api1111.getTydwbm()) || StringUtils.isEmpty(api1111.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1111.getDwdm());
api1111.setTydwbm(tydwbm);
}
@@ -459,14 +466,15 @@
return JSON.toJSONString(api1111);
}
if (Constant.API_CODE_1112.equals(inteId)) {
- Gd2023Api1112 api1112 = (Gd2023Api1112) data;
+ Gd2023Api1112 api1112 = new Gd2023Api1112();
+ BeanUtils.copyProperties(data, api1112);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1112.getTydwbm())) {
+ if ("0".equals(api1112.getTydwbm()) || StringUtils.isEmpty(api1112.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
api1112.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1112.getTykqbm())) {
+ if ("0".equals(api1112.getTykqbm()) || StringUtils.isEmpty(api1112.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
api1112.setTykqbm(tykqbm);
}
@@ -474,9 +482,10 @@
return JSON.toJSONString(api1112);
}
if (Constant.API_CODE_1113.equals(inteId)) {
- Gd2023Api1113 api1113 = (Gd2023Api1113) data;
+ Gd2023Api1113 api1113 = new Gd2023Api1113();
+ BeanUtils.copyProperties(data, api1113);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1113.getTydwbm())) {
+ if ("0".equals(api1113.getTydwbm()) || StringUtils.isEmpty(api1113.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
api1113.setTydwbm(tydwbm);
}
@@ -484,9 +493,10 @@
return JSON.toJSONString(api1113);
}
if (Constant.API_CODE_1201.equals(inteId)) {
- Gd2023Api1201 apiData = (Gd2023Api1201) data;
+ Gd2023Api1201 apiData = new Gd2023Api1201();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
@@ -494,13 +504,14 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1202.equals(inteId)) {
- Gd2023Api1202 apiData = (Gd2023Api1202) data;
+ Gd2023Api1202 apiData = new Gd2023Api1202();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
- if (StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
+ if ("0".equals(apiData.getLqgsdwtybm()) || StringUtils.isEmpty(apiData.getLqgsdwtybm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgsdwtybm(tydwbm);
}
@@ -508,9 +519,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1203.equals(inteId)) {
- Gd2023Api1203 apiData = (Gd2023Api1203) data;
+ Gd2023Api1203 apiData = new Gd2023Api1203();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -518,9 +530,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1204.equals(inteId)) {
- Gd2023Api1204 apiData = (Gd2023Api1204) data;
+ Gd2023Api1204 apiData = new Gd2023Api1204();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -528,9 +541,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1205.equals(inteId)) {
- Gd2023Api1205 apiData = (Gd2023Api1205) data;
+ Gd2023Api1205 apiData = new Gd2023Api1205();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -538,32 +552,38 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1206.equals(inteId)) {
- Gd2023Api1206 apiData = (Gd2023Api1206) data;
+ Gd2023Api1206 apiData = new Gd2023Api1206();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
apiData.setTydwbm(tydwbm);
+ }
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1207.equals(inteId)) {
- Gd2023Api1207 apiData = (Gd2023Api1207) data;
+ Gd2023Api1207 apiData = new Gd2023Api1207();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getDckqtybm())) {
+ if ("0".equals(apiData.getDckqtybm()) || StringUtils.isEmpty(apiData.getDckqtybm())) {
String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
- if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
+ if ("0".equals(apiData.getDrkqtybm()) || StringUtils.isEmpty(apiData.getDrkqtybm())) {
String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getDchwtybm())) {
+ if ("0".equals(apiData.getDchwtybm()) || StringUtils.isEmpty(apiData.getDchwtybm())) {
String dchwtybm = apiCommonService.getTyhwbm(apiData.getDchwdm());
apiData.setDchwtybm(dchwtybm);
}
- if (StringUtils.isEmpty(apiData.getDrhwtybm())) {
+ if ("0".equals(apiData.getDrhwtybm()) || StringUtils.isEmpty(apiData.getDrhwtybm())) {
String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
apiData.setDrhwtybm(drhwtybm);
}
@@ -581,21 +601,23 @@
api1208.setBclbs((int) (api1208.getSjsl() / 25));
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1208.getLqgstydwbm())) {
+ if ("0".equals(api1208.getLqgstydwbm()) || StringUtils.isEmpty(api1208.getLqgstydwbm())) {
String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
api1208.setLqgstydwbm(lqgstydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1208.getTyhwbm())) {
+ if ("0".equals(api1208.getTyhwbm()) || StringUtils.isEmpty(api1208.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
api1208.setTyhwbm(tyhwbm);
}
return JSON.toJSONString(api1208);
}
if (Constant.API_CODE_1209.equals(inteId)) {
- Gd2023Api1209 apiData = (Gd2023Api1209) data;
+ Gd2023Api1209 apiData = new Gd2023Api1209();
+ BeanUtils.copyProperties(data, apiData);
+ apiData.setRksl(apiData.getRkjz());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -606,7 +628,7 @@
Gd2023Api1210 api1210 = new Gd2023Api1210();
BeanUtils.copyProperties(data, api1210);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1210.getTyhwbm())) {
+ if ("0".equals(api1210.getTyhwbm()) || StringUtils.isEmpty(api1210.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
api1210.setTyhwbm(tyhwbm);
}
@@ -614,9 +636,10 @@
return JSON.toJSONString(api1210);
}
if (Constant.API_CODE_1211.equals(inteId)) {
- Gd2023Api1211 apiData = (Gd2023Api1211) data;
+ Gd2023Api1211 apiData = new Gd2023Api1211();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -624,14 +647,15 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1212.equals(inteId)) {
- Gd2023Api1212 apiData = (Gd2023Api1212) data;
+ Gd2023Api1212 apiData = new Gd2023Api1212();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -639,14 +663,15 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1301.equals(inteId)) {
- Gd2023Api1301 apiData = (Gd2023Api1301) data;
+ Gd2023Api1301 apiData = new Gd2023Api1301();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
apiData.setTydwbm(tydwbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTykqbm())) {
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
apiData.setTykqbm(tykqbm);
}
@@ -654,9 +679,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1302.equals(inteId)) {
- Gd2023Api1302 apiData = (Gd2023Api1302) data;
+ Gd2023Api1302 apiData = new Gd2023Api1302();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || StringUtils.isEmpty(apiData.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
@@ -664,66 +690,68 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1303.equals(inteId)) {
- Gd2023Api1303 apiData = (Gd2023Api1303) data;
+ Gd2023Api1303 apiData = new Gd2023Api1303();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || 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,26));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1304.equals(inteId)) {
- Gd2023Api1304 apiData = (Gd2023Api1304) data;
+ Gd2023Api1304 apiData = new Gd2023Api1304();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyhwbm())) {
+ if ("0".equals(apiData.getTyhwbm()) || 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));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1305.equals(inteId)) {
- Gd2023Api1305 apiData = (Gd2023Api1305) data;
+ Gd2023Api1305 apiData = new Gd2023Api1305();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0,28));
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(apiData.getTfzydh().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1306.equals(inteId)) {
- Api1306 apiData = (Api1306) data;
Gd2023Api1306 api1306 = new Gd2023Api1306();
- BeanUtils.copyProperties(apiData, api1306);
+ BeanUtils.copyProperties(data, api1306);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
- apiData.setTycfbm(tycfbm);
+ if ("0".equals(api1306.getTycfbm()) || StringUtils.isEmpty(api1306.getTycfbm())) {
+ String tycfbm = apiCommonService.getTycfbm(api1306.getCfdm());
+ api1306.setTycfbm(tycfbm);
}
// 鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1306.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0,28));
+ if ("0".equals(api1306.getTyajbm()) || StringUtils.isEmpty(api1306.getTyajbm())) {
+ String tyajbm = apiCommonService.getTyajbm(api1306.getHwdm().substring(0, 28));
api1306.setTyajbm(tyajbm);
}
- apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
- return JSON.toJSONString(apiData);
+ api1306.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
+ return JSON.toJSONString(api1306);
}
if (Constant.API_CODE_1307.equals(inteId)) {
//灏佽鏁版嵁
@@ -738,17 +766,17 @@
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTykqbm())) {
+ if ("0".equals(api1307.getTykqbm()) || StringUtils.isEmpty(api1307.getTykqbm())) {
String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
api1307.setTykqbm(tykqbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTycfbm())) {
+ if ("0".equals(api1307.getTycfbm()) || StringUtils.isEmpty(api1307.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
api1307.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1307.getTyhwbm())) {
+ if ("0".equals(api1307.getTyhwbm()) || StringUtils.isEmpty(api1307.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
api1307.setTyhwbm(tyhwbm);
}
@@ -776,11 +804,16 @@
return JSON.toJSONString(api1308);
}
if (Constant.API_CODE_1309.equals(inteId)) {
- Gd2023Api1309 apiData = (Gd2023Api1309) data;
+ Gd2023Api1309 apiData = new Gd2023Api1309();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getWgdwtybm())) {
+ if ("0".equals(apiData.getWgdwtybm()) || StringUtils.isEmpty(apiData.getWgdwtybm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
apiData.setWgdwtybm(tydwbm);
+ }
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
@@ -789,7 +822,7 @@
Gd2023Api1310 api1310 = new Gd2023Api1310();
BeanUtils.copyProperties(data, api1310);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1310.getTyhwbm())) {
+ if ("0".equals(api1310.getTyhwbm()) || StringUtils.isEmpty(api1310.getTyhwbm())) {
String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
api1310.setTyhwbm(tyhwbm);
}
@@ -797,9 +830,10 @@
return JSON.toJSONString(api1310);
}
if (Constant.API_CODE_1401.equals(inteId)) {
- Gd2023Api1401 apiData = (Gd2023Api1401) data;
+ Gd2023Api1401 apiData = new Gd2023Api1401();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTydwbm())) {
+ if ("0".equals(apiData.getTydwbm()) || StringUtils.isEmpty(apiData.getTydwbm())) {
String tydwbm = apiCommonService.getTydwbm(apiData.getCcqy());
apiData.setTydwbm(tydwbm);
}
@@ -807,7 +841,8 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1402.equals(inteId)) {
- Gd2023Api1402 apiData = (Gd2023Api1402) data;
+ Gd2023Api1402 apiData = new Gd2023Api1402();
+ BeanUtils.copyProperties(data, apiData);
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -847,7 +882,7 @@
//璁剧疆涓婁紶鏂囦欢id
api1403.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(api1403.getJhxddwtybm())) {
+ if ("0".equals(api1403.getJhxddwtybm()) || StringUtils.isEmpty(api1403.getJhxddwtybm())) {
String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
api1403.setJhxddwtybm(tydwbm);
}
@@ -868,30 +903,32 @@
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
- if (com.fzzy.push.gd2023.ApiCodeConstant.API_2001.equals(inteId)) {
- Gd2023Api2001 apiData = (Gd2023Api2001) data;
+ if (ApiCodeConstant.API_2001.equals(inteId)) {
+ Gd2023Api2001 apiData = new Gd2023Api2001();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
- if (com.fzzy.push.gd2023.ApiCodeConstant.API_2002.equals(inteId)) {
- Gd2023Api2002 apiData = (Gd2023Api2002) data;
+ if (ApiCodeConstant.API_2002.equals(inteId)) {
+ Gd2023Api2002 apiData = new Gd2023Api2002();
+ BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTycfbm())) {
+ if ("0".equals(apiData.getTycfbm()) || StringUtils.isEmpty(apiData.getTycfbm())) {
String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
apiData.setTycfbm(tycfbm);
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if (StringUtils.isEmpty(apiData.getTyajbm())) {
+ if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
String tyajbm = apiCommonService.getTyajbm(apiData.getAjdm());
apiData.setTyajbm(tyajbm);
}
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java
index faea1d1..a8f5717 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1102.java
@@ -43,7 +43,7 @@
private String xzqhdm;
@PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
- private Integer kqcq;
+ private String kqcq;
@PropertyDef(label = "鏈夋晥浠撳")
private Double yxcr;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java
index b32cdf4..e14bbf3 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1103.java
@@ -119,58 +119,58 @@
private String cfsfwh;
@PropertyDef(label = "鍌ㄧ伯鍔熸晥")
- private Integer clgx;
+ private String clgx;
@PropertyDef(label = "鑳藉惁闅旂儹淇濇俯")
- private Integer nfgrbw;
+ private String nfgrbw;
@PropertyDef(label = "闅旂儹淇濇俯鎺柦")
private String grbwcs;
@PropertyDef(label = "闅旂儹鎬ц兘")
- private Integer grxn;
+ private String grxn;
@PropertyDef(label = "缁撴瀯鏉愭枡")
- private Integer jgcl;
+ private String jgcl;
@PropertyDef(label = "姘斿瘑鎬�")
- private Integer qmx;
+ private String qmx;
@PropertyDef(label = "鏄惁宸茶繘琛屼俊鎭寲鏀归��")
- private Integer sfyjxxxhgz;
+ private String sfyjxxxhgz;
@PropertyDef(label = "绮儏鎶�鏈�")
- private Integer lqjs;
+ private String lqjs;
@PropertyDef(label = "鑳藉惁鏁ｈ鍌ㄥ瓨")
- private Integer nfszcc;
+ private String nfszcc;
@PropertyDef(label = "鏈夋棤闃查紶闃查泙闃茶櫕瑁呯疆鍙婅鏂�")
- private Integer ywfsfqfczz;
+ private String ywfsfqfczz;
@PropertyDef(label = "鏈夋棤闃茬伀闃茬垎闃茬洍璁炬柦")
- private Integer ywfhfbfdss;
+ private String ywfhfbfdss;
@PropertyDef(label = "鏈夋棤鏈烘閫氶璁炬柦")
- private Integer ywjxtfss;
+ private String ywjxtfss;
@PropertyDef(label = "閫氶绯荤粺鍨嬪紡")
- private Integer tfxtxs;
+ private String tfxtxs;
@PropertyDef(label = "閫氶鎶�鏈�")
- private Integer tfjs;
+ private String tfjs;
@PropertyDef(label = "鑳藉惁鐜祦鐔忚捀鏉�铏�")
- private Integer nfhlxzsc;
+ private String nfhlxzsc;
@PropertyDef(label = "鏉�铏妧鏈�")
- private Integer scjs;
+ private String scjs;
@PropertyDef(label = "鑳藉惁瀵屾爱浣庢哀姘旇皟鍌ㄧ伯")
- private Integer nffddyqtcl;
+ private String nffddyqtcl;
@PropertyDef(label = "鎺ф俯鎶�鏈�")
- private Integer kwjs;
+ private String kwjs;
@PropertyDef(label = "瀹宠櫕妫�娴嬫柟寮�")
private String hcjcfs;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java
index 7a13367..beddfa3 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1104.java
@@ -47,13 +47,13 @@
@PropertyDef(label = "寤掗棿璁捐浠撳")
private Double ajsjcr;
-
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
private Date ajqyrq;
-
+
@PropertyDef(label = "寤掗棿鐘舵��")
- private Integer ajzt;
+ private String ajzt;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
@@ -61,5 +61,5 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
-
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java
index cc8e764..9b8c9d6 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1107.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -34,7 +35,7 @@
private String kqmc;
@PropertyDef(label = "璁惧缂栧彿")
- private Double sbbh;
+ private String sbbh;
@PropertyDef(label = "璁惧浠櫒鍚嶇О")
private String sbyqmc;
@@ -45,6 +46,11 @@
@PropertyDef(label = "鐢熶骇鍘傚")
private String sccj;
+ @PropertyDef(label = "璁惧浠櫒浠ｇ爜" )
+ @Column(name = "sbyqdm", length = 8)
+ private String sbyqdm;
+
+
@PropertyDef(label = "鐢熶骇鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
private Date scrq;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java
index 70e4e1d..cb0a92f 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1108.java
@@ -34,7 +34,7 @@
private String kqmc;
@PropertyDef(label = "鑽墏缂栧彿")
- private Double yjbh;
+ private String yjbh;
@PropertyDef(label = "鑽墏鍚嶇О")
private String yjmc;
@@ -74,7 +74,7 @@
private String bzq;
@PropertyDef(label = "搴撳瓨鏁伴噺")
- private String kcsl;
+ private Double kcsl;
@PropertyDef(label = "搴撳瓨鏁伴噺鍗曚綅")
private String kcsldw;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java
index 976af90..4a721e0 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1110.java
@@ -10,46 +10,48 @@
/**
* 鎺ュ彛琛�-搴撳尯鍥句粨鎴跨偣浣嶆爣娉ㄦ帴鍙�
- *
*/
@Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
public class Gd2023Api1110 implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -2000199652473542869L;
+ *
+ */
+ private static final long serialVersionUID = -2000199652473542869L;
- @PropertyDef(label = "鍗曚綅浠ｇ爜" )
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜" )
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
private String tydwbm;
- @PropertyDef(label = "搴撳尯浠ｇ爜" )
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
- @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @PropertyDef(label = "缁熶竴搴撳尯浠ｇ爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
@PropertyDef(label = "缁熶竴璐т綅缂栫爜")
private String tyhwbm;
- @PropertyDef(label = "璐т綅鐩稿浣嶇疆" )
+ @PropertyDef(label = "璐т綅鐩稿浣嶇疆")
private String hwxdwz;
- @PropertyDef(label = "璐т綅浣嶇疆鏍峰紡" )
+ @PropertyDef(label = "璐т綅浣嶇疆鏍峰紡")
private String hwwzys;
- @PropertyDef(label = "澶囨敞" )
+ @PropertyDef(label = "澶囨敞")
private String bz;
- @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java
index b63cad5..a37af83 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java
@@ -22,9 +22,9 @@
@EqualsAndHashCode(callSuper = false)
public class Gd2023Api1201 extends ApiParent implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -5548540780391804729L;
+ *
+ */
+ private static final long serialVersionUID = -5548540780391804729L;
@PropertyDef(label = "鍚堝悓鍙�")
@@ -131,6 +131,9 @@
@PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��")
private String jsyhtyzx;
+ @PropertyDef(label = "绛捐鍦扮偣")
+ private String qddd;
+
@PropertyDef(label = "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�")
private String jsyhtbyzyy;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java
index de219cd..b92890c 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java
@@ -26,6 +26,9 @@
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
private String tydwbm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍚堝悓鍙�" )
private String hth;
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 6013fca..5b34020 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
@@ -7,10 +7,11 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
- * 鎺ュ彛琛�-绮搴撳瓨
+ * 鎺ュ彛琛�-鎹熺泭鍗�
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -72,10 +73,10 @@
private Double ckzz;
@PropertyDef(label = "鍌ㄥ瓨鏃堕暱" )
- private Double ccsc;
+ private BigDecimal ccsc;
@PropertyDef(label = "瀹為檯鎹熺泭鏁伴噺" )
- private Double sjsysl;
+ private Double jzsysl;
@PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
private Double qzszkl;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
index 533431d..e17389f 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1306.java
@@ -5,6 +5,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -228,6 +229,9 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
private Date zhgxsj;
-
+ @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/push/gd2023/dto/Gd2023Api1309.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java
index 10f5da1..825c237 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java
@@ -39,6 +39,9 @@
@PropertyDef(label = "杩濊鍗曚綅缁熶竴缂栫爜")
private String wgdwtybm;
+ @PropertyDef(label = "搴撳尯缁熶竴缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "杩濊琛屼负浜�" )
private String wgxwr;
@@ -71,4 +74,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
private Date zhgxsj;
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
}
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index eb88f33..2c51c37 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 涓婃捣鍢夊畾 -C鐩� pro ##########################
+########################## 骞夸笢娼槼 ##########################
server:
port: 8090
jetty:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
- driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
username: root
password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
- driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
username: root
password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
@@ -39,7 +39,7 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 1
- host: 192.168.200.3
+ host: 127.0.0.1
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,11 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5303
- file-path: C:/IGDS-API/FILE/
- img-path: C:/IGDS/FILE/
- # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
- # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
- #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
+ companyId: 5317
+
+ file-path: D:/IGDS-API/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-pro2.yml b/src/main/resources/application-pro2.yml
index 3002e73..d0608d0 100644
--- a/src/main/resources/application-pro2.yml
+++ b/src/main/resources/application-pro2.yml
@@ -1,6 +1,6 @@
-########################## 涓婃捣鍢夊畾-绾 ##########################
+########################## 骞夸笢娼槼 - 澶х背浠ｅ偍搴� - pro2 ##########################
server:
- port: 8091
+ port: 8095
jetty:
max-http-post-size: 209715200
tomcat:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://192.168.200.3:3306/igds_api_jw?useUnicode=true&characterEncoding=utf-8&useSSL=false
- driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_2?useUnicode=true&characterEncoding=utf-8
username: root
password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
- driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
username: root
password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
@@ -38,8 +38,8 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 10
- host: 192.168.200.3
+ database: 5
+ host: 127.0.0.1
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,11 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5303
- file-path: C:/IGDS-API-jw/FILE/
- img-path: C:/IGDS/FILE/
- # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
- # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
- #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
+ companyId: 5317
+
+ file-path: D:/IGDS-API/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-pro5317-2.yml b/src/main/resources/application-pro5317-2.yml
index c9f82f8..d0608d0 100644
--- a/src/main/resources/application-pro5317-2.yml
+++ b/src/main/resources/application-pro5317-2.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢娼槼 - 澶х背浠ｅ偍搴� ##########################
+########################## 骞夸笢娼槼 - 澶х背浠ｅ偍搴� - pro2 ##########################
server:
port: 8095
jetty:
diff --git a/src/main/resources/application-pro5329.yml b/src/main/resources/application-pro5329.yml
index 40a7227..ebddec2 100644
--- a/src/main/resources/application-pro5329.yml
+++ b/src/main/resources/application-pro5329.yml
@@ -1,6 +1,6 @@
########################## 骞夸笢浣涘北绂呭煄鍖� ##########################
server:
- port: 8095
+ port: 8208
jetty:
max-http-post-size: 209715200
tomcat:
@@ -51,7 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5317
+ companyId: 5329
- file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ file-path: C:/IGDS-API/FILE/
+ img-path: C:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-pro5354.yml b/src/main/resources/application-pro5354.yml
index 238e04d..9e94d39 100644
--- a/src/main/resources/application-pro5354.yml
+++ b/src/main/resources/application-pro5354.yml
@@ -51,7 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5352
+ companyId: 5354
file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3