From d7eda377a257a18bca0429d3fae2a71d4160565b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 03 一月 2025 14:07:56 +0800
Subject: [PATCH] 数据同步
---
src/main/java/com/fzzy/api/entity/Api1505.java | 2
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1509.java | 195 ++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1507.java | 83 ++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1510.java | 83 ++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1506.java | 127 ++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1508.java | 83 ++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1504Rep.java | 28
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1504.java | 106 +++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1507.java | 155 +++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1504.java | 83 ++
src/main/java/com/fzzy/otherview/gd2022/GdApi9201.view.xml | 4
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1508Rep.java | 28
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1507Rep.java | 28
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1505Rep.java | 28
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1505.java | 83 ++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1506Rep.java | 28
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java | 55 +
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1508.java | 103 +++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1510Rep.java | 28
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1509.java | 83 ++
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi9201PR.java | 5
src/main/java/com/fzzy/api/entity/Api1506.java | 2
src/main/java/com/fzzy/api/timer/PushDataScheduled.java | 2
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1506.java | 83 ++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1505.java | 127 ++++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1510.java | 136 ++++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1509Rep.java | 28
27 files changed, 1,770 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1505.java b/src/main/java/com/fzzy/api/entity/Api1505.java
index f8fcaa4..7852191 100644
--- a/src/main/java/com/fzzy/api/entity/Api1505.java
+++ b/src/main/java/com/fzzy/api/entity/Api1505.java
@@ -29,7 +29,7 @@
* 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
*/
@Id
- @Column(name = "ID_", precision = 18)
+ @Column(name = "ID_", precision = 110)
@JSONField(serialize = false)
private String id;
diff --git a/src/main/java/com/fzzy/api/entity/Api1506.java b/src/main/java/com/fzzy/api/entity/Api1506.java
index 26f2ee3..ea256a7 100644
--- a/src/main/java/com/fzzy/api/entity/Api1506.java
+++ b/src/main/java/com/fzzy/api/entity/Api1506.java
@@ -29,7 +29,7 @@
* 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
*/
@Id
- @Column(name = "ID_", precision = 18)
+ @Column(name = "ID_", precision = 110)
@JSONField(serialize = false)
private String id;
diff --git a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
index e907a1d..d6f5042 100644
--- a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
@@ -123,7 +123,7 @@
if (String.valueOf(minute).equals(conf.getPushMinute99())) {
isExecute = true;
if (!isUpdateStart) {
- start = DateUtils.addHours(start, -1);
+ start = DateUtils.addHours(start, -2);
}
} else {
isExecute = false;
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1504.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1504.java
new file mode 100644
index 0000000..9b83e35
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1504.java
@@ -0,0 +1,106 @@
+package com.fzzy.async.fzzy40.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+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")
+public class Fz40Api1504 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", precision = 23)
+ private String nacctid;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍚嶇О")
+ @Column(name = "cncctname", length = 256)
+ private String cncctname;
+
+ @PropertyDef(label = "鏈綅甯�")
+ @Column(name = "ccurrency", length = 3)
+ private String ccurrency;
+
+ @PropertyDef(label = "浼氳涓荤")
+ @Column(name = "cacctchief", length = 20)
+ private String cacctchief;
+
+ @JSONField(format = "yyyyMM")
+ @PropertyDef(label = "鍚敤鏈熼棿", description = "yyyyMM")
+ @Column(name = "cperiodstart", length = 10)
+ private Date cperiodstart;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍚敤鏃ユ湡")
+ @Column(name = "cyearbmd", length = 10)
+ private Date cyearbmd;
+
+ @PropertyDef(label = "鏈熼棿鏁�", description = "榛樿12")
+ @Column(name = "nacctperiodnum")
+ private Integer nacctperiodnum;
+
+ @PropertyDef(label = "浼氳鍒跺害浠ｇ爜", description = "11:浼佷笟浼氳鍑嗗垯鍒跺害(绮2013鐗�)(榛樿浠ｇ爜鍊�)")
+ @Column(name = "caccclasscode", length = 2)
+ private String caccclasscode;
+
+ @PropertyDef(label = "绉戠洰绾ф", description = "4-8:榛樿鏈�灏忓�间负4")
+ @Column(name = "naccgrade")
+ private Integer 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 = "nendday")
+ private Integer nendday;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1505.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1505.java
new file mode 100644
index 0000000..7664e6e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1505.java
@@ -0,0 +1,127 @@
+package com.fzzy.async.fzzy40.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+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")
+public class Fz40Api1505 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 110)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cyear")
+ private Integer 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")
+ private Integer cdc;
+
+ @PropertyDef(label = "鏈骇绉戠洰")
+ @Column(name = "bl")
+ private Integer bl;
+
+ @PropertyDef(label = "绉戠洰绾ф")
+ @Column(name = "ngrade")
+ private Integer ngrade;
+
+ @PropertyDef(label = "鏁伴噺绉戠洰")
+ @Column(name = "bq")
+ private Integer bq;
+
+ @PropertyDef(label = "鏁伴噺鍗曚綅")
+ @Column(name = "cqunit")
+ private Integer cqunit;
+
+ @PropertyDef(label = "鐜伴噾绫荤鐩�")
+ @Column(name = "bcash")
+ private Integer bcash;
+
+ @PropertyDef(label = "閾惰绫荤鐩�")
+ @Column(name = "bbank")
+ private Integer bbank;
+
+ @PropertyDef(label = "鐜伴噾娴侀噺绫荤鐩�")
+ @Column(name = "bxjll")
+ private Integer bxjll;
+
+ @PropertyDef(label = "鍐荤粨")
+ @Column(name = "bf")
+ private Integer bf;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1506.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1506.java
new file mode 100644
index 0000000..7d47af2
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1506.java
@@ -0,0 +1,127 @@
+package com.fzzy.async.fzzy40.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+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")
+public class Fz40Api1506 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 110)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cyear")
+ private Integer cyear;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "nno")
+ private Integer nno;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "ccode", length = 80)
+ private String ccode;
+
+ @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")
+ private Integer 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;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1507.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1507.java
new file mode 100644
index 0000000..265ee64
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1507.java
@@ -0,0 +1,155 @@
+package com.fzzy.async.fzzy40.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+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")
+public class Fz40Api1507 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", length = 40)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @Column(name = "cvkind", length = 9)
+ private String cvkind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cmon")
+ private Integer cmon;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cyear")
+ private Integer cyear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @Column(name = "nvno")
+ private Integer nvno;
+
+ @PropertyDef(label = "鍒嗗綍搴忓彿")
+ @Column(name = "nno")
+ private Integer nno;
+
+ @PropertyDef(label = "鍑瘉鍒嗙被")
+ @Column(name = "btmp")
+ private Integer btmp;
+
+ @PropertyDef(label = "鎽樿")
+ @Column(name = "digest", length = 512)
+ private String digest;
+
+ @PropertyDef(label = "绉戠洰缂栫爜")
+ @Column(name = "ccode", length = 80)
+ private String ccode;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍑瘉鏃ユ湡")
+ @Column(name = "ccsmalldatetime", length = 10)
+ private Date ccsmalldatetime;
+
+ @PropertyDef(label = "鍒跺崟浜�")
+ @Column(name = "cmaker", length = 32)
+ private String cmaker;
+ /**
+ * 1:鍊熸柟
+ * -1:璐锋柟
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @Column(name = "cdc")
+ private Integer 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")
+ private Integer bpt;
+
+ @PropertyDef(label = "闄勪欢寮犳暟")
+ @Column(name = "nanum")
+ private Integer 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 = "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;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1508.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1508.java
new file mode 100644
index 0000000..a5e7a0c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1508.java
@@ -0,0 +1,103 @@
+package com.fzzy.async.fzzy40.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+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")
+public class Fz40Api1508 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", length = 40)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鍑瘉绫诲瀷")
+ @Column(name = "cvkind", length = 10)
+ private String cvkind;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "cmon")
+ private Integer cmon;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "cyear")
+ private Integer cyear;
+
+ @PropertyDef(label = "鍑瘉鍙�")
+ @Column(name = "nvno")
+ private Integer 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 = "nrowno")
+ private Integer nrowno;
+
+ @PropertyDef(label = "閲戦")
+ @Column(name = "nm", precision = 20, scale = 4)
+ private Double nm;
+
+ /**
+ * 1:娴佸叆
+ * -1:娴佸嚭
+ */
+ @PropertyDef(label = "鏂瑰悜")
+ @Column(name = "cdc")
+ private Integer cdc;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1509.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1509.java
new file mode 100644
index 0000000..ff2fe13
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1509.java
@@ -0,0 +1,195 @@
+package com.fzzy.async.fzzy40.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+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")
+public class Fz40Api1509 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 18)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String 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")
+ private Integer deprmethodid;
+
+ /**
+ * 1:鎶曡祫
+ * 2:鑷缓
+ * 3:璐拱
+ * 4:铻嶈祫绉熻祦
+ * 5:缁忚惀绉熷叆
+ * 6:鏃犲伩璋冨叆
+ * 7:鎹愯禒
+ * 8:鎹㈠叆
+ */
+ @PropertyDef(label = "鍥哄畾璧勪骇鏉ユ簮")
+ @Column(name = "sourceid")
+ private Integer sourceid;
+
+ @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 Date enterday;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬩娇鐢ㄦ棩鏈�")
+ @Column(name = "beginuseday", length = 10)
+ private Date beginuseday;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤哄崱鏃ユ湡")
+ @Column(name = "makinday", length = 10)
+ private Date 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")
+ private Integer 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 = 1)
+ 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;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1510.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1510.java
new file mode 100644
index 0000000..c31dfcb
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Api1510.java
@@ -0,0 +1,136 @@
+package com.fzzy.async.fzzy40.entity;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2024-12-19 14:23
+ **/
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+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")
+public class Fz40Api1510 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閫氳繃鎺ュ彛鑾峰彇鐨勫崟浣嶈处濂楀悗锛屽湪灞�绔嚜鍔ㄤ骇鐢熻处濂楀彿
+ */
+ @Id
+ @Column(name = "ID_", precision = 18)
+ @JSONField(serialize = false)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 30)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐﹀鍙�")
+ @Column(name = "nacctid", length = 23)
+ private String nacctid;
+
+ @PropertyDef(label = "鍥哄畾璧勪骇缂栫爜")
+ @Column(name = "fixassetcode", length = 20)
+ private String fixassetcode;
+
+ @PropertyDef(label = "鏈熼棿")
+ @Column(name = "period")
+ private Integer period;
+
+ @PropertyDef(label = "骞村害")
+ @Column(name = "acctyear")
+ private Integer 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;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @Column(name = "zhgxsj")
+ private Date zhgxsj;
+
+}
+
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1504.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1504.java
new file mode 100644
index 0000000..8db6908
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1504.java
@@ -0,0 +1,83 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1504;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1504Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Api1504;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1504Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-璐﹀淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1504 {
+
+ @Autowired
+ private Fzzy40Sync1504Rep fzzy40Sync1504Rep;
+ @Autowired
+ private Api1504Rep api1504Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1504璐﹀淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1504);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Api1504> list = fzzy40Sync1504Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1504 api1504;
+ List<Api1504> api1504List;
+ for (Fz40Api1504 sysData : list) {
+ api1504 = new Api1504();
+ BeanUtils.copyProperties(sysData, api1504);
+ api1504.setKqdm(kqdm);
+
+ api1504List = api1504Rep.findDateById(api1504.getNacctid());
+ if (null == api1504List || api1504List.isEmpty()) {
+ api1504.setCzbz(Constant.CZBZ_I);
+ } else {
+ api1504.setCzbz(api1504List.get(0).getCzbz());
+ }
+ api1504Rep.save(api1504);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1505.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1505.java
new file mode 100644
index 0000000..6eb42fe
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1505.java
@@ -0,0 +1,83 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1505;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1505Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Api1504;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1505Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-绉戠洰淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1505 {
+
+ @Autowired
+ private Fzzy40Sync1505Rep fzzy40Sync1505Rep;
+ @Autowired
+ private Api1505Rep api1505Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1505鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1505);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Api1504> list = fzzy40Sync1505Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1505 api1505;
+ List<Api1505> api1505List;
+ for (Fz40Api1504 sysData : list) {
+ api1505 = new Api1505();
+ BeanUtils.copyProperties(sysData, api1505);
+ api1505.setKqdm(kqdm);
+
+ api1505List = api1505Rep.findDateById(api1505.getId());
+ if(null == api1505List || api1505List.isEmpty()){
+ api1505.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1505.setCzbz(api1505List.get(0).getCzbz());
+ }
+ api1505Rep.save(api1505);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1506.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1506.java
new file mode 100644
index 0000000..fce15a5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1506.java
@@ -0,0 +1,83 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1506;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1506Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Api1506;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1506Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-绉戠洰浣欓琛�
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1506 {
+
+ @Autowired
+ private Fzzy40Sync1506Rep fzzy40Sync1506Rep;
+ @Autowired
+ private Api1506Rep api1506Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1506鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1506);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Api1506> list = fzzy40Sync1506Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1506 api1506;
+ List<Api1506> api1506List;
+ for (Fz40Api1506 sysData : list) {
+ api1506 = new Api1506();
+ BeanUtils.copyProperties(sysData, api1506);
+ api1506.setKqdm(kqdm);
+
+ api1506List = api1506Rep.findDateById(api1506.getId());
+ if(null == api1506List || api1506List.isEmpty()){
+ api1506.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1506.setCzbz(api1506List.get(0).getCzbz());
+ }
+ api1506Rep.save(api1506);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1507.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1507.java
new file mode 100644
index 0000000..f05d531
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1507.java
@@ -0,0 +1,83 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1507;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1507Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Api1507;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1507Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-浼氳鍑瘉淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1507 {
+
+ @Autowired
+ private Fzzy40Sync1507Rep fzzy40Sync1507Rep;
+ @Autowired
+ private Api1507Rep api1507Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1507浼氳鍑瘉淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1507);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Api1507> list = fzzy40Sync1507Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1507 api1507;
+ List<Api1507> api1507List;
+ for (Fz40Api1507 sysData : list) {
+ api1507 = new Api1507();
+ BeanUtils.copyProperties(sysData, api1507);
+ api1507.setKqdm(kqdm);
+
+ api1507List = api1507Rep.findDateById(api1507.getId());
+ if(null == api1507List || api1507List.isEmpty()){
+ api1507.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1507.setCzbz(api1507List.get(0).getCzbz());
+ }
+ api1507Rep.save(api1507);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1508.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1508.java
new file mode 100644
index 0000000..672dac0
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1508.java
@@ -0,0 +1,83 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1508;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1508Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Api1508;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1508Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1508 {
+
+ @Autowired
+ private Fzzy40Sync1508Rep fzzy40Sync1508Rep;
+ @Autowired
+ private Api1508Rep api1508Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1508鐜伴噾娴侀噺鍒嗛厤淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1508);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Api1508> list = fzzy40Sync1508Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1508 api1508;
+ List<Api1508> api1508List;
+ for (Fz40Api1508 sysData : list) {
+ api1508 = new Api1508();
+ BeanUtils.copyProperties(sysData, api1508);
+ api1508.setKqdm(kqdm);
+
+ api1508List = api1508Rep.findDateById(api1508.getId());
+ if(null == api1508List || api1508List.isEmpty()){
+ api1508.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1508.setCzbz(api1508List.get(0).getCzbz());
+ }
+ api1508Rep.save(api1508);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1509.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1509.java
new file mode 100644
index 0000000..94c6d22
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1509.java
@@ -0,0 +1,83 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1509;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1509Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Api1508;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1509Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1509 {
+
+ @Autowired
+ private Fzzy40Sync1509Rep fzzy40Sync1509Rep;
+ @Autowired
+ private Api1509Rep api1509Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1509鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1509);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Api1508> list = fzzy40Sync1509Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1509 api1509;
+ List<Api1509> api1509List;
+ for (Fz40Api1508 sysData : list) {
+ api1509 = new Api1509();
+ BeanUtils.copyProperties(sysData, api1509);
+ api1509.setKqdm(kqdm);
+
+ api1509List = api1509Rep.findDateById(api1509.getId());
+ if(null == api1509List || api1509List.isEmpty()){
+ api1509.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1509.setCzbz(api1509List.get(0).getCzbz());
+ }
+ api1509Rep.save(api1509);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1510.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1510.java
new file mode 100644
index 0000000..9b79667
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1510.java
@@ -0,0 +1,83 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1510;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1510Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40Api1510;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1510Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-璧勪骇鎶樻棫淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 18:55
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1510 {
+
+ @Autowired
+ private Fzzy40Sync1510Rep fzzy40Sync1510Rep;
+ @Autowired
+ private Api1510Rep api1510Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾骞跺皝瑁呬繚瀛樿川妫�鏁版嵁
+ *
+ * @param deptId 绯荤粺瀵瑰簲搴撳尯缂栫爜
+ * @param start 璧峰鏃堕棿
+ * @param end 鎴鏃堕棿
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1510璧勪骇鎶樻棫淇℃伅鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1510);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40Api1510> list = fzzy40Sync1510Rep.findDateByTime(start, end);
+
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ Api1510 api1510;
+ List<Api1510> api1510List;
+ for (Fz40Api1510 sysData : list) {
+ api1510 = new Api1510();
+ BeanUtils.copyProperties(sysData, api1510);
+ api1510.setKqdm(kqdm);
+
+ api1510List = api1510Rep.findDateById(api1510.getId());
+ if(null == api1510List || api1510List.isEmpty()){
+ api1510.setCzbz(Constant.CZBZ_I);
+ }else {
+ api1510.setCzbz(api1510List.get(0).getCzbz());
+ }
+ api1510Rep.save(api1510);
+ }
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
index 2c46ab5..4dd24c4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
@@ -85,7 +85,7 @@
List<Api9201> api9201List;
-
+ Api1105 api1105;
Api9201 api9201;
Gd2022Api1023Dtl api9201Dtl;
Gd2022Api1023Way api9201Way;
@@ -119,27 +119,40 @@
//鍌ㄧ伯绮儏鏄庣粏琛�
List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
- Api1105 api1105 = commonService.getApi1105Cache(data.getDepotId());
- api9201Dtl = new Gd2022Api1023Dtl();
- BeanUtils.copyProperties(data, api9201Dtl);
- if (null != api1105) {
- api9201Dtl.setCfmc(api1105.getHwmc());
- api9201Dtl.setCfdm(api1105.getHwdm().substring(0, 25));
+
+ if (null != dtls && dtls.size() > 0) {
+ dtlList = new ArrayList<>();
+ for (Fz40DrugLogDtl dtl : dtls) {
+ api9201Dtl = new Gd2022Api1023Dtl();
+ BeanUtils.copyProperties(dtl, api9201Dtl);
+ api1105 = commonService.getApi1105Cache(data.getDepotId());
+ if (null != api1105) {
+ api9201Dtl.setCfmc(api1105.getHwmc());
+ api9201Dtl.setCfdm(api1105.getHwdm().substring(0, 25));
+ }
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety());
+ api9201Dtl.setLspzdm(mappingCode);
+ api9201Dtl.setLsxzdm(data.getFoodType());
+ api9201Dtl.setLsdjdm(data.getFoodLevel());
+ api9201Dtl.setLssl(data.getNumber());
+ api9201Dtl.setSf(data.getPerWet());
+ api9201Dtl.setZz(data.getPerImpurity());
+ dtlList.add(api9201Dtl);
+ }
+ api9201.setDtl(JSON.toJSONString(dtlList));
+ api9201List = api9201Rep.getDataByBizId(api9201.getBizId());
+ if (null == api9201List || api9201List.isEmpty()) {
+ api9201.setCzbz(Constant.CZBZ_I);
+ } else {
+ api9201.setCzbz(api9201List.get(0).getCzbz());
+ }
}
-
- //绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety());
- api9201Dtl.setLspzdm(mappingCode);
- api9201Dtl.setLsxzdm(data.getFoodType());
- api9201Dtl.setLsdjdm(data.getFoodLevel());
- api9201Dtl.setLssl(data.getNumber());
- api9201Dtl.setSf(data.getPerWet());
- api9201Dtl.setZz(data.getPerImpurity());
-
-
- dtlList = new ArrayList<>();
- dtlList.add(api9201Dtl);
- api9201.setDtl(JSON.toJSONString(dtlList));
+// BeanUtils.copyProperties(data, api9201Dtl);
+// dtlList = new ArrayList<>();
+// dtlList.add(api9201Dtl);
+// api9201.setDtl(JSON.toJSONString(dtlList));
api9201Way = new Gd2022Api1023Way();
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1504Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1504Rep.java
new file mode 100644
index 0000000..edfeb75
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1504Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Api1504;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy40Sync1504Rep extends JpaRepository<Fz40Api1504, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40Api1504 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz40Api1504> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1505Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1505Rep.java
new file mode 100644
index 0000000..162ed7a
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1505Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Api1504;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy40Sync1505Rep extends JpaRepository<Fz40Api1504, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40Api1504 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz40Api1504> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1506Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1506Rep.java
new file mode 100644
index 0000000..65f58fe
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1506Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Api1506;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍒╂鼎
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy40Sync1506Rep extends JpaRepository<Fz40Api1506, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40Api1506 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz40Api1506> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1507Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1507Rep.java
new file mode 100644
index 0000000..c07a2d5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1507Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Api1507;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-浼氳鍑瘉淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy40Sync1507Rep extends JpaRepository<Fz40Api1507, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40Api1507 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz40Api1507> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1508Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1508Rep.java
new file mode 100644
index 0000000..b67a4df
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1508Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Api1508;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy40Sync1508Rep extends JpaRepository<Fz40Api1508, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40Api1508 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz40Api1508> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1509Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1509Rep.java
new file mode 100644
index 0000000..7432521
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1509Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Api1508;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-鍥哄畾璧勪骇鍗＄墖淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy40Sync1509Rep extends JpaRepository<Fz40Api1508, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40Api1508 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz40Api1508> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1510Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1510Rep.java
new file mode 100644
index 0000000..db376c8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1510Rep.java
@@ -0,0 +1,28 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Api1510;
+import com.fzzy.async.fzzy40.entity.Fz40Profit;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊-璧勪骇鎶樻棫淇℃伅
+ *
+ * @author czt
+ * @date 2024-01-12 09:55
+ */
+public interface Fzzy40Sync1510Rep extends JpaRepository<Fz40Api1510, String> {
+
+ /**
+ *
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40Api1510 where zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Fz40Api1510> findDateByTime(@Param("start") Date start, @Param("end") Date end);
+}
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi9201.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi9201.view.xml
index 0337999..49fa941 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi9201.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi9201.view.xml
@@ -993,8 +993,8 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("dtlList");
-list.insert({});
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("dtls");
+list.insert();
view.get("#addDtl").show();</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-default</Property>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi9201PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi9201PR.java
index db47498..37504ed 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi9201PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi9201PR.java
@@ -110,6 +110,11 @@
org.springframework.data.domain.Page<Api9201> japPage = api9201Rep.findAll(specification, pageable);
page.setEntityCount((int) japPage.getTotalElements());
+ for (Api9201 api9201 : japPage.getContent()) {
+ api9201.setDtls(JSONArray.parseArray(api9201.getDtl(), Gd2022Api1023Dtl.class));
+ api9201.setPeoples(JSONArray.parseArray(api9201.getPeople(), Gd2022Api1023People.class));
+ api9201.setWays(JSONArray.parseArray(api9201.getWay(), Gd2022Api1023Way.class));
+ }
page.setEntities(japPage.getContent());
}
--
Gitblit v1.9.3